Import plainbox-provider-checkbox_0.46.0~rc2.orig.tar.gzupstream-0.46.0_rc2patched-0.46.0_rc2-1

7 files changed, 136 insertions, 13 deletions

diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
index a64757e..5cd80a0 100644
--- a/units/cpu/jobs.pxu
+++ b/units/cpu/jobs.pxu
@@ -152,6 +152,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::cpu
 estimated_duration: 0.5
 id: cpu/cstates_results.log
+after: cpu/cstates
 command:
 [ -e ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log ] && cat ${PLAINBOX_SESSION_SHARE}/fwts_cstates_results.log
 _summary:
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index 88efe86..40f7299 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -250,7 +250,7 @@ _description:
 1. Click "Test" to test display rotation. The display will be rotated every 4 seconds.
 2. Check if all rotations (normal right inverted left) took place without permanent screen corruption
 VERIFICATION:
- Did the display rotation take place without without permanent screen corruption?
+ Did the display rotation take place without permanent screen corruption?
 
 unit: template
 template-resource: graphics_card
@@ -456,7 +456,7 @@ plugin: manual
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_switch_card_{product_slug}_xenial
 requires:
- graphics_card.driver in ['nouveau', 'nvidia', 'amdgpu-pro']
+ graphics_card.driver in ['nouveau', 'nvidia', 'amdgpu-pro', 'pcieport']
 lsb.codename == 'xenial'
 _summary: Test GPU switching for {vendor} {product}
 _description:
diff --git a/units/networking/jobs.pxu b/units/networking/jobs.pxu
index 92eadd4..360aaf2 100644
--- a/units/networking/jobs.pxu
+++ b/units/networking/jobs.pxu
@@ -77,3 +77,10 @@ requires: package.name == 'cups-client'
 command: network_printer_test -s $CHECKBOX_SERVER
 _description: Try to enable a remote printer on the network and print a test page.
 
+plugin: shell
+category_id: com.canonical.plainbox::networking
+id: networking/predictable_names
+command: network_predictable_names
+_summary: Verify that all network interfaces have predictable names.
+_description: Verify that all network interfaces have predictable names.
+
diff --git a/units/socketcan/jobs.pxu b/units/socketcan/jobs.pxu
index 0bf22a1..74fd8ca 100644
--- a/units/socketcan/jobs.pxu
+++ b/units/socketcan/jobs.pxu
@@ -16,7 +16,6 @@ command:
 if ! ip link show vcan0 &> /dev/null ; then
 ip link add vcan0 type vcan
 fi
- ip link set vcan0 up
 
 
 id: socketcan/send_packet_local_sff_virtual
@@ -28,8 +27,15 @@ _description:
 the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set vcan0 down
+ ip link set dev vcan0 mtu 16
+ ip link set vcan0 up
 socketcan_test.py vcan0 111
 
 
@@ -42,8 +48,15 @@ _description:
 the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set vcan0 down
+ ip link set dev vcan0 mtu 16
+ ip link set vcan0 up
 socketcan_test.py vcan0 1F334455 --effid
 
 
@@ -56,8 +69,15 @@ _description:
 the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set vcan0 down
+ ip link set dev vcan0 mtu 72
+ ip link set vcan0 up
 socketcan_test.py vcan0 1A --fdmode
 
 
@@ -71,10 +91,17 @@ _description:
 local test as the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'False'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ ip link set dev {interface} mtu 16
+ ip link set {interface} up
 socketcan_test.py {interface} 111
 
 
@@ -88,10 +115,17 @@ _description:
 local test as the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'False'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ ip link set dev {interface} mtu 16
+ ip link set {interface} up
 socketcan_test.py {interface} FA123 --effid
 
 
@@ -105,10 +139,19 @@ _description:
 local test as the broadcast packet is received on the same device
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 2.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'False'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ # Following command is only supported configuration method when using the
+ # IXXAT driver from HMS
+ ip link set {interface} type can bitrate 1000000 dbitrate 2000000 fd on
+ ip link set {interface} up
 socketcan_test.py {interface} 1B --fdmode
 
 
@@ -123,10 +166,20 @@ _description:
 as to return the predicted packet.
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 5.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'True'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ # Following command is only supported configuration method when using the
+ # IXXAT driver from HMS
+ ip link set {interface} type can bitrate 1000000
+ ip link set dev {interface} mtu 16
+ ip link set {interface} up
 socketcan_test.py {interface} 111 --remote
 
 
@@ -141,10 +194,20 @@ _description:
 as to return the predicted packet.
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 5.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'True'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ # Following command is only supported configuration method when using the
+ # IXXAT driver from HMS
+ ip link set {interface} type can bitrate 1000000
+ ip link set dev {interface} mtu 16
+ ip link set {interface} up
 socketcan_test.py {interface} E407DB --remote --effid
 
 
@@ -159,8 +222,17 @@ _description:
 as to return the predicted packet.
 category_id: socketcan
 plugin: shell
+user: root
 estimated_duration: 5.0
+flags: also-after-suspend
 imports: from com.canonical.plainbox import manifest
 requires: manifest.socket_can_echo_server_running == 'True'
 command:
+ BASH_XTRACEFD=1
+ set -ex
+ ip link set {interface} down
+ # Following command is only supported configuration method when using the
+ # IXXAT driver from HMS
+ ip link set {interface} type can bitrate 1000000 dbitrate 2000000 fd on
+ ip link set {interface} up
 socketcan_test.py {interface} 19F --remote --fdmode
diff --git a/units/socketcan/test-plan.pxu b/units/socketcan/test-plan.pxu
index c4e343e..0e60f3b 100644
--- a/units/socketcan/test-plan.pxu
+++ b/units/socketcan/test-plan.pxu
@@ -8,15 +8,33 @@ include:
 socketcan/send_packet_remote_.*
 
 
+id: after-suspend-socketcan-auto-remote
+unit: test plan
+_name: SocketCAN Tests (Automated, Remote, After Suspend)
+_description:
+ SocketCAN Tests (Automated, Remote, After Suspend)
+include:
+ after-suspend-socketcan/send_packet_remote_.*
+
+
 id: socketcan-auto-local
 unit: test plan
-_name: SocketCAN Tests, (Automated, Local)
+_name: SocketCAN Tests (Automated, Local)
 _description:
- SocketCAN Tests, (Automated, Local)
+ SocketCAN Tests (Automated, Local)
 include:
 socketcan/send_packet_local_.*
 
 
+id: after-suspend-socketcan-auto-local
+unit: test plan
+_name: SocketCAN Tests (Automated, Local, After Suspend)
+_description:
+ SocketCAN Tests (Automated, Local, After Suspend)
+include:
+ after-suspend-socketcan/send_packet_local_.*
+
+
 id: socketcan-full
 unit: test plan
 _name: SocketCAN Tests
@@ -26,3 +44,14 @@ include:
 nested_part:
 socketcan-auto-remote
 socketcan-auto-local
+
+
+id: after-suspend-socketcan-full
+unit: test plan
+_name: SocketCAN Tests (After Suspend)
+_description:
+ SocketCAN Tests (After Suspend)
+include:
+nested_part:
+ after-suspend-socketcan-auto-remote
+ after-suspend-socketcan-auto-local
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index e0c2e0a..261a0a3 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -78,7 +78,7 @@ flags: noreturn
 user: root
 environ: PM_TEST_DRY_RUN
 command:
- pm_test reboot --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent
+ pm_test reboot --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox --fwts --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE --suspends-before-reboot=30 -r 3 --silent --check-hardware-list
 _description:
 This is an automated stress test that will run a sequence of '30 suspend/resume cycles and one reboot' 3 times.
 
@@ -94,7 +94,7 @@ user: root
 command:
 if type -P fwts >/dev/null; then
 echo "Calling fwts"
- set -o pipefail; checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=45 --s3-sleep-delay=30 --s3-multiple=30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
+ set -o pipefail; checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/suspend_30_cycles -f none -s s3 --s3-device-check --s3-device-check-delay=60 --s3-sleep-delay=60 --s3-multiple=30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles_times.log
 else
 echo "Calling sleep_test"
 set -o pipefail; sleep_test -p -s mem -i 30 | tee $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu
index 98a2d4f..225c168 100644
--- a/units/touchscreen/jobs.pxu
+++ b/units/touchscreen/jobs.pxu
@@ -135,19 +135,27 @@ _description:
 Validate that 3-touch tap is operating as expected
 STEPS:
 1. Commence the test
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
 2. Tap the screen within the test area with 3 fingers simultaneously.
 3. Once 3 fingers are on the screen you should see the indicator they are recognized.
 VERIFICATION:
 Did you see the green circles around the three fingers?
+ {%- else %}
+ 2. Tap the screen with 3 fingers simultaneously.
+ 3. If the tap is not detected the test will time out after 20 seconds.
+ VERIFICATION:
+ Was the tap detected?
+ {% endif %}
 command:
- {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
 manage_compiz_plugin unityshell disable
- {% endif %}
 qmlscene -qt5 3 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
 EXIT=$?
 sleep 5
- {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
 manage_compiz_plugin unityshell enable
+ {%- else %}
+ timeout 20 multitap_test.py 3 || (>&2 echo "FAILED TO DETECT TAP"; false)
+ EXIT=$?
 {% endif %}
 exit $EXIT
 
@@ -163,18 +171,24 @@ _description:
 Validate that 4-touch tap is operating as expected
 STEPS:
 1. Commence the test
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
 2. Tap the screen within the test area with 4 fingers simultaneously.
 3. Once 4 fingers are on the screen you should see the indicator they are recognized.
 VERIFICATION:
 Did you see the green circles around the four fingers?
+ {%- else %}
+ 2. Tap the screen with 4 fingers simultaneously.
+ 3. If the tap is not detected the test will time out after 20 seconds.
+ {% endif %}
 command:
- {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
 manage_compiz_plugin unityshell disable
- {% endif %}
 qmlscene -qt5 4 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
 EXIT=$?
 sleep 5
- {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %}
 manage_compiz_plugin unityshell enable
+ {%- else %}
+ timeout 20 multitap_test.py 4 || (>&2 echo "FAILED TO DETECT TAP"; false)
+ EXIT=$?
 {% endif %}
 exit $EXIT