Merge #400903 from ~jocave/plainbox-provider-checkbox:nested-plan-mods

6 files changed, 79 insertions, 48 deletions

diff --git a/units/i2c/category.pxu b/units/i2c/category.pxu
index b0020b1..16f0bfa 100644
--- a/units/i2c/category.pxu
+++ b/units/i2c/category.pxu
@@ -6,4 +6,4 @@
 
 unit: category
 id: i2c
-_name: I2C (Inter-Integrated Circuit)
+_name: I²C (Inter-Integrated Circuit)
diff --git a/units/i2c/jobs.pxu b/units/i2c/jobs.pxu
index b0ff9d7..fa3e0b5 100644
--- a/units/i2c/jobs.pxu
+++ b/units/i2c/jobs.pxu
@@ -6,20 +6,17 @@
 
 unit: job
 id: i2c/i2c-bus-detect
-_summary: Check number of detected I2C bus
-_purpose:
- Verify if number of detected I2C bus is as expected
-_steps:
- 1. This task is fully automatic, when expected i2c bus number($I2C_BUS_NUMBER)
- is set, this job will verify if detected number of i2c bus is as expected.
- 2. If expected i2c bus number is not set, this job will pass if system
- detected there's at least one i2c bus.
+_summary: Check presence of an I²C bus
+_description:
+ If an expected number of I²C buses is provided, the job will verify the
+ detected number is correct. If the expected number of buses is not provided
+ the job will pass if at least one I²C bus is detected.
 command:
- if [ -z "${I2C_BUS_NUMBER+x}" ]; then
- i2c_driver_test.py bus
- else
- i2c_driver_test.py bus -b "$I2C_BUS_NUMBER"
- fi
+ if [ -z "${I2C_BUS_NUMBER+x}" ]; then
+ i2c_driver_test.py bus
+ else
+ i2c_driver_test.py bus -b "$I2C_BUS_NUMBER"
+ fi
 user: root
 plugin: shell
 category_id: i2c
@@ -30,14 +27,11 @@ imports: from com.canonical.plainbox import manifest
 
 unit: job
 id: i2c/i2c-device-detect
-_summary: Check if any I2C device detected
-_purpose:
- Verify if there's any I2C device
-_steps:
- 1. This task is fully automatic, test will pass if there's at least one
- i2c device detected on any I2C bus.
+_summary: Check if any I²C devices can be detected
+_description:
+ The test will pass if there's at least one I²C device detected on any I²C bus.
 command:
- i2c_driver_test.py device
+ i2c_driver_test.py device
 user: root
 plugin: shell
 category_id: i2c
diff --git a/units/i2c/manifest.pxu b/units/i2c/manifest.pxu
index ac944f3..8e39de2 100644
--- a/units/i2c/manifest.pxu
+++ b/units/i2c/manifest.pxu
@@ -6,5 +6,5 @@
 
 unit: manifest entry
 id: has_i2c
-_name: An I2C bus
+_name: An I²C bus
 value-type: bool
diff --git a/units/i2c/test-plan.pxu b/units/i2c/test-plan.pxu
index 99e9aaf..fc626df 100644
--- a/units/i2c/test-plan.pxu
+++ b/units/i2c/test-plan.pxu
@@ -1,15 +1,22 @@
 id: i2c-full
 unit: test plan
-_name: I2c tests
-_description: QA i2c tests for Snappy Ubuntu Core devices
+_name: I²C tests
+_description: I²C tests for Ubuntu Core devices
 include:
 nested_part:
+ i2c-manual
 i2c-automated
 
+id: i2c-manual
+unit: test plan
+_name: Manual I²C tests
+_description: Manual I²C tests for Ubuntu Core devices
+include:
+
 id: i2c-automated
 unit: test plan
-_name: Automated i2c tests
-_description: Automated i2c tests for Snappy Ubuntu Core devices
+_name: Automated I²C tests
+_description: Automated I²C tests for Ubuntu Core devices
 include:
 i2c/i2c-bus-detect
 i2c/i2c-device-detect
diff --git a/units/usb/test-plan.pxu b/units/usb/test-plan.pxu
index 2f31963..e4a3df1 100644
--- a/units/usb/test-plan.pxu
+++ b/units/usb/test-plan.pxu
@@ -201,15 +201,16 @@ include:
 id: usb-full
 unit: test plan
 _name: USB tests
-_description: QA USB tests for Snappy Ubuntu Core devices
+_description: QA USB tests for Ubuntu Core devices
 include:
 nested_part:
 usb-manual
+ usb-automated
 
 id: usb-manual
 unit: test plan
 _name: Manual USB tests
-_description: Manual USB tests for Snappy Ubuntu Core devices
+_description: Manual USB tests for Ubuntu Core devices
 include:
 usb/hid
 usb/insert
@@ -219,7 +220,7 @@ include:
 id: usb-automated
 unit: test plan
 _name: Automated USB tests
-_description: Automated USB tests for Snappy Ubuntu Core devices
+_description: Automated USB tests for Ubuntu Core devices
 include:
 usb/storage-detect
 usb/storage-preinserted-.*
@@ -229,7 +230,7 @@ bootstrap_include:
 id: usb3-full
 unit: test plan
 _name: USB3 tests
-_description: QA USB3 tests for Snappy Ubuntu Core devices
+_description: QA USB3 tests for Ubuntu Core devices
 include:
 nested_part:
 usb3-manual
@@ -237,24 +238,45 @@ nested_part:
 id: usb3-manual
 unit: test plan
 _name: Manual USB3 tests
-_description: Manual USB3 tests for Snappy Ubuntu Core devices
+_description: Manual USB3 tests for Ubuntu Core devices
 include:
 usb3/insert
 usb3/storage-automated # depends on manual one, so not automated
 usb3/remove
 
+id: usb3-automated
+unit: test plan
+_name: Automated USB3 tests
+_description: Manual USB3 tests for Ubuntu Core devices
+include:
+
 id: usb-c-full
 unit: test plan
 _name: USB-C tests
-_description: QA USB-C tests for Snappy Ubuntu Core devices
+_description: QA USB-C tests for Ubuntu Core devices
 include:
 nested_part:
 usb-c-manual
+ usb-c-automated
 
 id: usb-c-manual
 unit: test plan
 _name: Manual USB-C tests
-_description: Manual USB-C tests for Snappy Ubuntu Core devices
+_description: Manual USB-C tests for Ubuntu Core devices
+include:
+ usb-c/c-to-a-adapter/hid
+ usb-c/c-to-a-adapter/insert
+ usb-c/c-to-a-adapter/storage-automated
+ usb-c/c-to-a-adapter/remove
+ usb-c/hid
+ usb-c/insert
+ usb-c/storage-automated
+ usb-c/remove
+
+id: usb-c-automated
+unit: test plan
+_name: Automated USB-C tests
+_description: Automated USB-C tests for Ubuntu Core devices
 include:
 usb-c/c-to-a-adapter/hid
 usb-c/c-to-a-adapter/insert
@@ -268,7 +290,7 @@ include:
 id: after-suspend-usb-full
 unit: test plan
 _name: USB tests (after suspend)
-_description: QA USB tests for Snappy Ubuntu Core devices
+_description: QA USB tests for Ubuntu Core devices
 include:
 nested_part:
 after-suspend-usb-manual
@@ -276,7 +298,7 @@ nested_part:
 id: after-suspend-usb-manual
 unit: test plan
 _name: Manual USB tests (after suspend)
-_description: Manual USB tests for Snappy Ubuntu Core devices
+_description: Manual USB tests for Ubuntu Core devices
 include:
 after-suspend-usb/hid
 after-suspend-usb/insert
@@ -286,7 +308,7 @@ include:
 id: after-suspend-usb3-full
 unit: test plan
 _name: USB3 tests (after suspend)
-_description: QA USB3 tests for Snappy Ubuntu Core devices
+_description: QA USB3 tests for Ubuntu Core devices
 include:
 nested_part:
 after-suspend-usb3-manual
@@ -294,16 +316,22 @@ nested_part:
 id: after-suspend-usb3-manual
 unit: test plan
 _name: Manual USB3 tests (after suspend)
-_description: Manual USB3 tests for Snappy Ubuntu Core devices
+_description: Manual USB3 tests for Ubuntu Core devices
 include:
 after-suspend-usb3/insert
 after-suspend-usb3/storage-automated # depends on manual one, so not automated
 after-suspend-usb3/remove
 
+id: after-suspend-usb3-automated
+unit: test plan
+_name: Automated USB3 tests (after suspend)
+_description: Automated USB3 tests for Ubuntu Core devices
+include:
+
 id: after-suspend-usb-c-full
 unit: test plan
 _name: USB-C tests (after suspend)
-_description: QA USB-C tests for Snappy Ubuntu Core devices
+_description: QA USB-C tests for Ubuntu Core devices
 include:
 nested_part:
 after-suspend-usb-c-manual
@@ -311,7 +339,7 @@ nested_part:
 id: after-suspend-usb-c-manual
 unit: test plan
 _name: Manual USB-C tests (after suspend)
-_description: Manual USB-C tests for Snappy Ubuntu Core devices
+_description: Manual USB-C tests for Ubuntu Core devices
 include:
 after-suspend-usb-c/c-to-a-adapter/hid
 after-suspend-usb-c/c-to-a-adapter/insert
@@ -322,10 +350,16 @@ include:
 after-suspend-usb-c/storage-automated
 after-suspend-usb-c/remove
 
+id: after-suspend-usb-c-automated
+unit: test plan
+_name: Automated USB-C tests (after suspend)
+_description: Automated USB-C tests for Ubuntu Core devices
+include:
+
 id: after-suspend-usb-automated
 unit: test plan
 _name: Automated USB tests
-_description: Automated USB tests for Snappy Ubuntu Core devices
+_description: Automated USB tests for Ubuntu Core devices
 include:
 after-suspend-usb/storage-detect
 after-suspend-usb/storage-preinserted-.*
diff --git a/units/watchdog/test-plan.pxu b/units/watchdog/test-plan.pxu
index 01057d0..417ef50 100644
--- a/units/watchdog/test-plan.pxu
+++ b/units/watchdog/test-plan.pxu
@@ -1,27 +1,23 @@
 id: watchdog-full
 unit: test plan
 _name: Watchdog tests
-_description:
- QA test plan that includes watchdog tests
-estimated_duration: 1m
+_description: Watchdog tests for Ubuntu Core devices
 include:
 nested_part:
 watchdog-manual
+ watchdog-automated
 
 id: watchdog-manual
 unit: test plan
 _name: Manual watchdog tests
-_description: Manual watchdog tests for Snappy Ubuntu Core devices
+_description: Manual watchdog tests for Ubuntu Core devices
 include:
- watchdog/systemd-config
 watchdog/trigger-system-reset
 
 id: watchdog-automated
 unit: test plan
 _name: Automated watchdog tests
-_description:
- QA test plan that includes automated watchdog tests
-estimated_duration: 1s
+_description: Automated watchdog tests for Ubuntu Core devices
 include:
 watchdog/detect
 watchdog/systemd-config