Import plainbox-provider-checkbox_0.47.0~rc1.orig.tar.gzupstream-0.47.0_rc1patched-0.47.0_rc1-1

2 files changed, 56 insertions, 1 deletions

diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu
index c6e679a..cf1c02b 100644
--- a/units/ethernet/jobs.pxu
+++ b/units/ethernet/jobs.pxu
@@ -347,6 +347,7 @@ unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK' and device.interface != 'UNKNOWN'
 id: ethernet/hotplug-{__index__}-end-cycle
+category_id: com.canonical.plainbox::ethernet
 after: ethernet/hotplug-{interface}-disconnect
 command: true
 flags: simple
@@ -364,7 +365,7 @@ user: root
 environ:
 TEST_TARGET_IPERF
 LD_LIBRARY_PATH
-command: checkbox-support-network test -i {interface} -t iperf --iperf3 --scan-timeout 3600 --fail-threshold 80 --cpu-load-fail-threshold 90 --runtime 90 --num_runs 4
+command: network test -i {interface} -t iperf --iperf3 --scan-timeout 3600 --fail-threshold 80 --cpu-load-fail-threshold 90 --runtime 90 --num_runs 4
 _description:
 This test uses iperf3 to ensure network devices pass data at an acceptable
 minimum percentage of advertized speed.
@@ -386,8 +387,12 @@ plugin: shell
 estimated_duration: 2s
 command: check_static {{ interface }}
 requires:
+ {%- if __on_ubuntucore__ %}
 snap.name == 'network-manager'
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {%- else %}
+ executable.name == 'nmcli'
+ {% endif -%}
 
 plugin: shell
 category_id: com.canonical.plainbox::ethernet
diff --git a/units/ethernet/test-plan.pxu b/units/ethernet/test-plan.pxu
new file mode 100644
index 0000000..6ad7620
--- /dev/null
+++ b/units/ethernet/test-plan.pxu
@@ -0,0 +1,50 @@
+id: ethernet-full
+unit: test plan
+_name: QA tests for ethernet
+_description: Ethernet tests for Ubuntu Core devices
+estimated_duration: 1m
+include:
+nested_part:
+ ethernet-manual
+ ethernet-automated
+
+id: ethernet-manual
+unit: test plan
+_name: Manual ethernet tests
+_description: Manual tests for ethernet connections
+include:
+ ethernet/wol_S5_.*
+ ethernet/wol_S4_.*
+ ethernet/wol_S3_.*
+ ethernet/hotplug-.*
+
+id: ethernet-automated
+unit: test plan
+_name: Automated ethernet tests
+_description: Automated ethernet tests for Ubuntu Core devices
+estimated_duration: 1m
+include:
+ ethernet/detect
+ ethernet/ping_.*
+bootstrap_include:
+ device
+
+id: after-suspend-ethernet-full
+unit: test plan
+_name: QA tests for ethernet (after suspend)
+_description: Ethernet tests for Ubuntu Core devices
+estimated_duration: 1m
+include:
+nested_part:
+ after-suspend-ethernet-automated
+
+id: after-suspend-ethernet-automated
+unit: test plan
+_name: Automated ethernet tests (after suspend)
+_description: Automated ethernet tests for Ubuntu Core devices
+estimated_duration: 1m
+include:
+ after-suspend-ethernet/detect
+ after-suspend-ethernet/ping_.*
+bootstrap_include:
+ device