Import plainbox-provider-checkbox_0.42.0~rc1.orig.tar.gzupstream-0.42.0_rc1patched-0.42.0_rc1-1

18 files changed, 343 insertions, 812 deletions

diff --git a/units/firmware/jobs.pxu b/units/firmware/jobs.pxu
index 7c777a2..3095273 100644
--- a/units/firmware/jobs.pxu
+++ b/units/firmware/jobs.pxu
@@ -18,7 +18,7 @@ id: firmware/fwts_{name}.log
 estimated_duration: 1.2
 requires: package.name == 'fwts'
 user: root
-command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log | base64
+command: [[ -e $PLAINBOX_SESSION_SHARE/fwts_{name}.log ]] && xz -c $PLAINBOX_SESSION_SHARE/fwts_{name}.log
 _description: Attach log for FWTS {name} test.
 _summary: Attach log for FWTS {name} test.
 
@@ -55,7 +55,7 @@ category_id: com.canonical.plainbox::firmware
 estimated_duration: 0.5
 id: firmware/fwts_desktop_diagnosis_results.log.gz
 command:
- [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log | base64
+ [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results.log
 _description: Attaches the FWTS desktop diagnosis results log to the submission
 _summary: Attach FWTS desktop diagnosis log to submission
 
@@ -64,7 +64,7 @@ category_id: com.canonical.plainbox::firmware
 estimated_duration: 0.5
 id: firmware/fwts_desktop_diagnosis_results_hwe.log.gz
 command:
- [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log | base64
+ [ -f $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_desktop_diagnosis_results_hwe.log
 _description: Attaches the FWTS desktop diagnosis results log to the submission (to HWE)
 _summary: Attach FWTS desktop diagnosis log to submission (to HWE)
 
diff --git a/units/graphics/jobs.pxu b/units/graphics/jobs.pxu
index a7af65a..261a527 100644
--- a/units/graphics/jobs.pxu
+++ b/units/graphics/jobs.pxu
@@ -126,7 +126,7 @@ category_id: com.canonical.plainbox::graphics
 requires:
 device.category == 'VIDEO'
 package.name == 'zenity'
-command: 
+command:
 source graphics_env {driver} {index}
 maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{{print $1}}')"
 now="$(python3 -c 'from gi.repository import Gdk; screen=Gdk.Screen.get_default(); geo = screen.get_monitor_geometry(screen.get_primary_monitor()); print(geo.width, "x", geo.height, sep="")')"
@@ -316,6 +316,27 @@ _description:
 
 unit: template
 template-resource: graphics_card
+plugin: user-interact-verify
+category_id: com.canonical.plainbox::graphics
+id: graphics/{index}_glxgears_fullscreen_{product_slug}
+requires: package.name == 'mesa-utils'
+command:
+ source graphics_env {driver} {index}
+ glxgears -fullscreen
+ true
+_summary: Test that glxgears works on fullscreen for {vendor} {product}
+_description:
+ PURPOSE:
+ This test tests the basic fullscreen 3D capabilities of your {vendor} {product} video card
+ STEPS:
+ 1. Click "Test" to execute an OpenGL demo. Press ESC at any time to close.
+ 2. Verify that the animation is not jerky or slow.
+ VERIFICATION:
+ 1. Did the 3d animation appear?
+ 2. Was the animation free from slowness/jerkiness?
+
+unit: template
+template-resource: graphics_card
 plugin: shell
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_3d_window_open_close_{product_slug}
@@ -382,7 +403,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screenshot_{product_slug}.jpg
 depends: graphics/{index}_screenshot_{product_slug}
-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
+command: cat $PLAINBOX_SESSION_SHARE/screenshot_{index}.jpg
 _description: Attaches the screenshot captured in graphics/screenshot for the {vendor} {product} graphics card.
 _summary: Attach results of screenshot test for {vendor} {product}
 
@@ -459,7 +480,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: graphics/{index}_screenshot_fullscreen_video_{product_slug}.jpg
 depends: graphics/{index}_screenshot_fullscreen_video_{product_slug}
-command: base64 $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
+command: cat $PLAINBOX_SESSION_SHARE/screenshot_fullscreen_video_{index}.jpg
 _summary: Attach results of FSV screenshot test for {vendor} {product}
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video for the {vendor} {product} graphics card
 
@@ -478,7 +499,7 @@ id: screen-capture-internal.png
 _summary: Attaches a simple screen capture
 estimated_duration: 1.0
 depends: graphics/screen-capture-internal
-command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && base64 ${PLAINBOX_SESSION_SHARE}/screen-capture.png
+command: [ -f ${PLAINBOX_SESSION_SHARE}/screen-capture.png ] && cat ${PLAINBOX_SESSION_SHARE}/screen-capture.png
 _description: Attaches the simple screen capture file
 
 unit: template
@@ -500,6 +521,21 @@ id: graphics/{index}_screen-capture-internal_{product_slug}.png
 depends: graphics/{index}_screen-capture-internal_{product_slug}
 _summary: Attaches a simple screen capture of {vendor} {product}
 estimated_duration: 1.0
-command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && base64 $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
+command: [ -f $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png ] && cat $PLAINBOX_SESSION_SHARE/screen-capture-{index}.png
 _description: Attaches the simple screen capture file of {vendor} {product}
 
+unit: template
+template-resource: graphics_card
+category_id: com.canonical.plainbox::graphics
+id: graphics/{index}_auto_switch_card_{product_slug}
+requires:
+ graphics_card.driver in ['nvidia', 'amdgpu-pro', 'pcieport']
+_summary: Switch GPU to {vendor} {product} and reboot
+_purpose:
+ Switch GPU to {vendor} {product} and reboot the machine
+plugin: shell
+user: root
+command:
+ {switch_to_cmd}
+ pm_test --silent --checkbox-respawn-cmd $PLAINBOX_SESSION_SHARE/__respawn_checkbox reboot --log-level=debug --log-dir=$PLAINBOX_SESSION_SHARE
+flags: noreturn preserve-locale
diff --git a/units/graphics/legacy.pxu b/units/graphics/legacy.pxu
index 91eb888..5e8fe82 100644
--- a/units/graphics/legacy.pxu
+++ b/units/graphics/legacy.pxu
@@ -84,7 +84,7 @@ estimated_duration: 10
 _summary: Test maximum supported resolution
 _description:
 PURPOSE:
- This test will verify the display is operating at its maximum supported resolution 
+ This test will verify the display is operating at its maximum supported resolution
 STEPS:
 1. Consult the system's specifications and locate the screen's maximum supported resolution.
 2. Click on Test to display the maximum resolution that can be used by Ubuntu on the current display.
@@ -97,7 +97,7 @@ category_id: com.canonical.plainbox::graphics
 command: graphics_modes_info
 estimated_duration: 0.250
 _description: Collect info on graphics modes (screen resolution and refresh rate)
-_summary: Collect info on graphics modes 
+_summary: Collect info on graphics modes
 
 id: graphics/color_depth
 plugin: shell
@@ -228,7 +228,7 @@ category_id: com.canonical.plainbox::graphics
 id: graphics/screenshot
 requires: package.name == 'fswebcam'
 command: set -o pipefail; camera_test still --device=/dev/external_webcam -f ${PLAINBOX_SESSION_SHARE}/screenshot.jpg -q 2>&1 | ansi_parser
-_summary: Test grabbing a screenshot 
+_summary: Test grabbing a screenshot
 _description:
 PURPOSE:
 Take a screengrab of the current screen (logged on Unity desktop)
@@ -241,9 +241,9 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: screenshot.jpg
 depends: graphics/screenshot
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
-_summary: Attach results of screenshot test 
+_summary: Attach results of screenshot test
 
 plugin: shell
 category_id: com.canonical.plainbox::graphics
@@ -271,6 +271,6 @@ plugin: attachment
 category_id: com.canonical.plainbox::graphics
 id: screenshot_fullscreen_video.jpg
 depends: graphics/screenshot_fullscreen_video
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_fullscreen_video.jpg
 _description: Attaches the screenshot captured in graphics/screenshot_fullscreen_video.
 _summary: Attach results of FSV screenshot test
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index 12ad318..2e21195 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -176,7 +176,7 @@ requires:
 id: udev_attachment
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: udevadm info --export-db | xml_sanitize
+command: udevadm info --export-db
 estimated_duration: 1.465
 _description: Attaches a dump of the udev database showing system hardware information.
 _summary: Attach dump of udev database
@@ -275,14 +275,14 @@ command:
 plugin: attachment
 category_id: com.canonical.plainbox::info
 id: installer_bootchart.tgz
-command: [ -f /var/log/installer/bootchart.tgz ] && base64 /var/log/installer/bootchart.tgz
+command: [ -f /var/log/installer/bootchart.tgz ] && cat /var/log/installer/bootchart.tgz
 _description: Attach the installer bootchart tarball if it exists.
 
 plugin: attachment
 category_id: com.canonical.plainbox::info
 id: installer_debug.gz
 user: root
-command: [ -f /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug | base64
+command: [ -f /var/log/installer/debug ] && gzip -9 -c /var/log/installer/debug
 estimated_duration: 0.1
 _description: Attaches the installer debug log if it exists.
 
@@ -408,7 +408,7 @@ id: info/kvm_output
 estimated_duration: 0.1
 _summary:
 Attaches console log from the kvm_check_vm test
-_description: 
+_description:
 Attaches the debug log from the virtualization/kvm_check_vm test
 to the results submission.
 command: [ -f $PLAINBOX_SESSION_SHARE/virt_debug ] && cat $PLAINBOX_SESSION_SHARE/virt_debug
diff --git a/units/led/category.pxu b/units/led/category.pxu
new file mode 100644
index 0000000..9f72d20
--- /dev/null
+++ b/units/led/category.pxu
@@ -0,0 +1,3 @@
+unit: category
+id: led
+_name: LED tests
diff --git a/units/led/jobs.pxu b/units/led/jobs.pxu
index 17ce655..15d3065 100644
--- a/units/led/jobs.pxu
+++ b/units/led/jobs.pxu
@@ -7,7 +7,7 @@ _steps:
 _verification:
 Power led is on when system is powered on
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 estimated_duration: 15.0
 
 id: led/power-blink-suspend
@@ -20,11 +20,11 @@ _steps:
 _verification:
 Power led is blinking when system is in suspend
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 estimated_duration: 180
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
@@ -39,7 +39,7 @@ _description:
 Did the Suspend LED blink or change color while the system was suspended?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/battery-charging
 estimated_duration: 120.0
 _description:
@@ -52,7 +52,7 @@ _description:
 Did the battery indicator LED turn orange?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/battery-charged
 estimated_duration: 240.0
 _description:
@@ -66,7 +66,7 @@ _description:
 Does the orange battery LED shut off when system is fully charged?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/battery-low
 estimated_duration: 30.0
 _description:
@@ -79,7 +79,7 @@ _description:
 Does the LED light orange when battery is low?
 
 plugin: user-interact-verify
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/hdd
 estimated_duration: 30.0
 command: led_hdd_test
@@ -93,7 +93,7 @@ _description:
 Did the HDD LED light?
 
 plugin: user-interact-verify
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/numeric-keypad
 estimated_duration: 30.0
 command: keyboard_test
@@ -109,7 +109,7 @@ _description:
 2. Numbers should only be entered in the keyboard verification window when the LED is on
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/caps-lock
 estimated_duration: 30.0
 _description:
@@ -122,7 +122,7 @@ _description:
 Did the Cap Keys LED light as expected?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/wlan
 depends: keys/wireless
 estimated_duration: 60.0
@@ -137,7 +137,7 @@ _description:
 Did the WLAN LED turn on or change color as expected?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/wlan-disabled
 estimated_duration: 30.0
 depends: keys/wireless
@@ -168,11 +168,11 @@ _steps:
 _verification:
 Bluetooth LED is turned on in step 2, and turned off in step 3.
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 estimated_duration: 180
 
 plugin: user-interact-verify
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/camera
 estimated_duration: 20.0
 depends: camera/detect
@@ -187,7 +187,7 @@ _description:
 Did the camera LED light?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/touchpad
 estimated_duration: 30.0
 _description:
@@ -202,7 +202,7 @@ _description:
 3. When the LED is off, the mouse pointer should not move on touchpad usage
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/wireless
 estimated_duration: 120.0
 _description:
@@ -219,7 +219,7 @@ _description:
 Did the WLAN/Bluetooth LED light as expected?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/mute
 depends: keys/mute
 estimated_duration: 30.0
@@ -234,7 +234,7 @@ _description:
 Did the Audio LED turn on and off or change color as expected?
 
 plugin: manual
-category_id: com.canonical.plainbox::led
+category_id: led
 id: led/microphone-mute
 estimated_duration: 30.0
 depends: keys/microphone-mute
@@ -247,3 +247,17 @@ _description:
 determine if it either turned off and on or changed colors.
 VERIFICATION:
 Did the Microphone Mute LED turn on and off or change color as expected?
+
+id: led/serial
+_summary: Serial ports LED behavior
+_purpose:
+ Check serial ports LED behavior is correct
+_steps:
+ 1. Start the test to send data to all serial ports (/dev/ttyS*)
+_verification:
+ All serial ports LED are on for a few seconds (3-4s)
+plugin: user-interact-verify
+command: echo {0..1024} | tee /dev/ttyS{0..100} &> /dev/null
+user: root
+category_id: led
+estimated_duration: 15
diff --git a/units/led/test-plan.pxu b/units/led/test-plan.pxu
index 4f59af9..f43a3ca 100644
--- a/units/led/test-plan.pxu
+++ b/units/led/test-plan.pxu
@@ -28,3 +28,21 @@ include:
 suspend/led_after_suspend/caps-lock
 suspend/led_after_suspend/power
 suspend/led_after_suspend/touchpad
+
+id: led-full
+unit: test plan
+_name: LED tests
+_description: QA LED tests for IoT devices
+include:
+nested_part:
+ led-manual
+
+id: led-manual
+unit: test plan
+_name: Manual LED tests
+_description: Manual LED tests for IoT devices
+include:
+ led/power
+ led/power-blink-suspend
+ led/bluetooth
+ led/serial
diff --git a/units/miscellanea/jobs.pxu b/units/miscellanea/jobs.pxu
index a253cd4..10df43d 100644
--- a/units/miscellanea/jobs.pxu
+++ b/units/miscellanea/jobs.pxu
@@ -96,7 +96,7 @@ id: miscellanea/fwts_results.log
 requires:
 package.name == 'fwts'
 command:
- [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log | base64
+ [[ -e ${PLAINBOX_SESSION_SHARE}/fwts_results.log ]] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_results.log
 _description: Attaches the miscellanes/fwts_test results log to the submission.
 
 plugin: attachment
@@ -106,7 +106,7 @@ id: miscellanea/fwts_results_hwe.log.gz
 requires:
 package.name == 'fwts'
 command:
- [ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log | base64
+ [ -f $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log ] && gzip -c $PLAINBOX_SESSION_SHARE/fwts_results_hwe.log
 _description: Attaches the FWTS results log to the submission (to HWE)
 _summary: Attach FWTS log to submission (to HWE)
 
@@ -208,7 +208,7 @@ _summary:
 plugin: shell
 category_id: com.canonical.plainbox::miscellanea
 id: miscellanea/dmitest_client
-requires: 
+requires:
 package.name == 'dmidecode'
 dmi_present.state == 'supported'
 estimated_duration: 0.5
@@ -306,7 +306,7 @@ category_id: com.canonical.plainbox::miscellanea
 estimated_duration: 0.5
 id: miscellanea/oops_results.log
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log | base64
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results.log
 _description: Attaches the FWTS oops results log to the submission
 
 plugin: shell
@@ -359,7 +359,7 @@ id: miscellanea/sosreport_attachment
 depends: miscellanea/sosreport
 user: root
 command:
- SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && base64 $SOSFILE
+ SOSFILE=`ls -t $PLAINBOX_SESSION_SHARE/sosreport*xz | head -1`; [ -e ${SOSFILE} ] && cat $SOSFILE
 _summary: Attach the baseline sosreport file
 
 plugin: shell
diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
index 2521f81..ce252fc 100644
--- a/units/power-management/jobs.pxu
+++ b/units/power-management/jobs.pxu
@@ -51,7 +51,7 @@ id: power-management/poweroff-log-attach
 estimated_duration: 1.0
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.1.log | base64
+ more $PLAINBOX_SESSION_SHARE/*poweroff.1.log | cat
 _description:
 This will attach any logs from the power-management/poweroff test to the results.
 
@@ -74,7 +74,7 @@ id: power-management/reboot-log-attach
 estimated_duration: 1.0
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.1.log | base64
+ more $PLAINBOX_SESSION_SHARE/*reboot.1.log | cat
 _description:
 This will attach any logs from the power-management/reboot test to the results.
 
@@ -254,4 +254,3 @@ _description:
 successfully otherwise, Select 'Fail' to indicate there was a problem.
 VERIFICATION:
 Did the system shutdown and boot correctly?
-
diff --git a/units/stress/jobs.pxu b/units/stress/jobs.pxu
index d1a8146..2a2a7d0 100644
--- a/units/stress/jobs.pxu
+++ b/units/stress/jobs.pxu
@@ -125,7 +125,7 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycle-log-attach
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_30_cycles.log
 _description:
 Attaches the log from the 30 cycle Suspend/Resume test if it exists
 
@@ -134,7 +134,7 @@ category_id: com.canonical.plainbox::stress
 id: power-management/suspend-30-cycle-log-attach-with-reboots
 estimated_duration: 1.0
 depends: power-management/suspend_30_cycles_with_reboots
-command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && xz -c $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log ] && cat $PLAINBOX_SESSION_SHARE/pm_test.reboot.3.log
 _description:
 Attaches the log from the '30 cycle Suspend/Resume and one reboot times 3' test if it exists
 
@@ -238,7 +238,7 @@ estimated_duration: 1.0
 depends: stress/reboot
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.100.log | base64
+ more $PLAINBOX_SESSION_SHARE/*reboot.100.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -260,7 +260,7 @@ id: stress/reboot_30_log
 depends: stress/reboot_30
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*reboot.30.log | base64
+ more $PLAINBOX_SESSION_SHARE/*reboot.30.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -283,7 +283,7 @@ estimated_duration: 1.0
 depends: stress/poweroff
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.100.log | base64
+ more $PLAINBOX_SESSION_SHARE/*poweroff.100.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -305,7 +305,7 @@ id: stress/poweroff_30_log
 depends: stress/poweroff_30
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/*poweroff.30.log | base64
+ more $PLAINBOX_SESSION_SHARE/*poweroff.30.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -322,7 +322,7 @@ estimated_duration: 1.0
 depends: stress/reboot_30_check
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log | base64
+ more $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.30.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -339,7 +339,7 @@ estimated_duration: 1.0
 depends: stress/poweroff_30_check
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log | base64
+ more $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.30.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -356,7 +356,7 @@ estimated_duration: 1.0
 depends: stress/reboot_check
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log | base64
+ more $PLAINBOX_SESSION_SHARE/pm_log_check_reboot.100.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -373,7 +373,7 @@ estimated_duration: 1.0
 depends: stress/poweroff_check
 command:
 set -o pipefail
- tar cvz $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log | base64
+ more $PLAINBOX_SESSION_SHARE/pm_log_check_poweroff.100.log | cat
 
 plugin: shell
 category_id: com.canonical.plainbox::stress
@@ -393,7 +393,7 @@ id: stress/graphics-tarball
 estimated_duration: 1.0
 requires:
 package.name == 'x11-apps'
-command: [ -f $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && tar cvz $PLAINBOX_SESSION_SHARE/graphics-stress-results | base64
+command: [ -f $PLAINBOX_SESSION_SHARE/graphics-stress-results ] && cat $PLAINBOX_SESSION_SHARE/graphics-stress-results
 _description: Attaches the graphics stress results to the submission.
 
 plugin: shell
@@ -453,4 +453,3 @@ _description:
 2. Press wifi hotkey at a rate of 1 press per second and slowly increase the speed of the tap, until you are tapping as fast as possible
 VERIFICATION:
 Verify the system is not frozen and the wifi and bluetooth applets are still visible and functional
-
diff --git a/units/submission/jobs.pxu b/units/submission/jobs.pxu
index 4c929b0..a21c897 100644
--- a/units/submission/jobs.pxu
+++ b/units/submission/jobs.pxu
@@ -4,7 +4,7 @@ category_id: com.canonical.plainbox::info
 requires:
 package.name == 'dkms'
 command:
- dkms_info --format json | plainbox dev parse dkms-info | \
+ dkms_info --format json | python3 -m plainbox dev parse dkms-info | \
 jq --indent 4 '.dkms_info'
 _description: Attaches json dumps of installed dkms package information.
 _summary: Attaches json dumps of installed dkms package information.
@@ -12,7 +12,7 @@ _summary: Attaches json dumps of installed dkms package information.
 id: udev_json
 plugin: attachment
 category_id: com.canonical.plainbox::info
-command: udevadm info --export-db | plainbox dev parse udevadm
+command: udevadm info --export-db | python3 -m plainbox dev parse udevadm
 _description: Attaches json dumps of udev_resource
 
 id: raw_devices_dmi_json
@@ -23,7 +23,7 @@ requires:
 dmi_present.state == 'supported'
 user: root
 command:
- dmidecode -t bios -t system | plainbox dev parse dmidecode | \
+ dmidecode -t bios -t system | python3 -m plainbox dev parse dmidecode | \
 jq --indent 4 '[.[0]."_attributes" +
 {"category": .[0]."category"}, .[1]."_attributes" +
 {"category": .[1]."category"}]'
@@ -35,7 +35,7 @@ id: modprobe_json
 plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
- find /etc/modprobe.* -name \*.conf | xargs cat | plainbox dev parse modprobe |
+ find /etc/modprobe.* -name \*.conf | xargs cat | python3 -m plainbox dev parse modprobe |
 jq --indent 4 'to_entries | map({"module": .key, "options": .value})'
 estimated_duration: 0.015
 _description: Attaches the contents of the various modprobe conf files.
@@ -46,7 +46,7 @@ _summary: Attach PCI configuration space hex dump
 plugin: attachment
 category_id: com.canonical.plainbox::info
 command:
- lspci -x | plainbox dev parse pci-subsys-id | \
+ lspci -x | python3 -m plainbox dev parse pci-subsys-id | \
 jq --indent 4 '.pci_subsystem_id'
 estimated_duration: 0.1
 _description: Attaches a hex dump of the standard part of the PCI configuration
@@ -65,7 +65,7 @@ _description:
 The information include:
 - fish packages
 - dell recovery stage 2 boot log
-command: recovery_info file bto.xml | plainbox dev parse bto
+command: recovery_info file bto.xml | python3 -m plainbox dev parse bto
 
 id: recovery_info_attachment_json
 plugin: attachment
@@ -82,4 +82,4 @@ _description:
 Example:
 image_version: somerville-trusty-amd64-20140620-0
 bto_version: A00_dell-bto-trusty-houston-15-A11-iso-20141203-0.iso
-command: recovery_info version | plainbox dev parse recovery-info
+command: recovery_info version | python3 -m plainbox dev parse recovery-info
diff --git a/units/submission/packaging.pxu b/units/submission/packaging.pxu
index ce8cc1c..d293608 100644
--- a/units/submission/packaging.pxu
+++ b/units/submission/packaging.pxu
@@ -1,7 +1,3 @@
 unit: packaging meta-data
 os-id: debian
 Depends: jq
-
-unit: packaging meta-data
-os-id: debian
-Depends: plainbox
diff --git a/units/suspend/suspend-graphics.pxu b/units/suspend/suspend-graphics.pxu
index c85d147..e05153a 100644
--- a/units/suspend/suspend-graphics.pxu
+++ b/units/suspend/suspend-graphics.pxu
@@ -102,7 +102,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz_xenial
 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}_xenial
-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 unit: template
@@ -199,3 +199,26 @@ estimated_duration: 1.2
 command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log ] && sleep_time_check $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
 _description: Checks the sleep times to ensure that a machine suspends and resumes within a given threshold
 
+unit: template
+template-resource: graphics_card
+template-filter: graphics_card.prime_gpu_offload == 'Off'
+id: power-management/{index}_suspend_30_times_on_{product_slug}
+plugin: shell
+category_id: com.canonical.plainbox::stress
+estimated_duration: 5400.0
+depends:
+ power-management/rtc
+ suspend/suspend_advanced
+ graphics/{index}_auto_switch_card_{product_slug}
+flags: noreturn autorestart
+user: root
+command:
+ if type -P fwts >/dev/null; then
+ echo "Calling fwts"
+ set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
+ else
+ echo "Calling sleep_test"
+ set -o pipefail; sleep_test -p | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log
+ fi
+_purpose:
+ Suspend SUT 30 times while using {product_slug} graphics card
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu
index 136adfb..6704a2f 100644
--- a/units/suspend/suspend.pxu
+++ b/units/suspend/suspend.pxu
@@ -49,17 +49,6 @@ _description:
 Dumps memory info to a file for comparison after suspend test has been run
 command: meminfo_resource > $PLAINBOX_SESSION_SHARE/meminfo_before_suspend
 
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_before_suspend
-depends: wireless/wireless_connection
-requires: device.category == 'WIRELESS'
-command: nmcli -t -f UUID con status > $PLAINBOX_SESSION_SHARE/connections && connect_wireless && gateway_ping_test --interface=`(nmcli dev list 2>/dev/null || nmcli dev show) | grep -B 1 -e 'wireless' -e 'wifi' | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
-estimated_duration: 20.0
-_description:
- This test disconnects all connections and then connects to the wireless
- interface. It then checks the connection to confirm it's working as expected.
-
 unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK'
@@ -76,22 +65,6 @@ command: network -i {interface} -t iperf
 _description:
 This test executes iperf connection performance/stability against device {__index__} ({interface}) before suspend.
 
-unit: template
-template-resource: device
-template-filter: device.category == 'WIRELESS'
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/iperf_before_suspend_wifi_auto_device{__index__}_{interface}
-depends: wireless/wireless_connection
-estimated_duration: 20.0
-requires:
- package.name == 'iperf'
-user: root
-environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: network -i {interface} -t iperf
-_description:
- This test executes iperf connection performance/stability against device {__index__} ({interface}) before suspend.
-
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/iperf_before_suspend_mobilebroadband_gsm_auto
@@ -99,7 +72,7 @@ depends: mobilebroadband/gsm_connection
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep gsm |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -113,7 +86,7 @@ depends: mobilebroadband/cdma_connection
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -327,7 +300,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/suspend-single-log-attach
 depends: suspend/suspend_advanced_auto
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -338,7 +311,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_suspend-single-log-attach_{product_slug}
 depends: suspend/{index}_suspend_after_switch_to_card_{product_slug}
-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_suspend_single.log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -359,7 +332,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_hybrid-sleep-single-log-attach_{product_slug}
 depends: suspend/{index}_hybrid_sleep_{product_slug}
-command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && xz -c $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log ] && cat $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single.log
 _description:
 Attaches the log from the single hybrid sleep/resume test to the results
 
@@ -630,395 +603,6 @@ _description:
 VERIFICATION:
 Does the display work normally after resuming from suspend using the {vendor} {product} graphics card?
 
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_after_suspend
-depends: suspend/suspend_advanced suspend/wireless_before_suspend
-requires:
- device.category == 'WIRELESS'
-command: connect_wireless && gateway_ping_test --interface=`(nmcli dev list 2>/dev/null || nmcli dev show) | grep -B 1 -e wireless -e wifi | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $PLAINBOX_SESSION_SHARE/connections`; do nmcli con up uuid "$con"; done
-estimated_duration: 20.0
-_description:
- This test checks that the wireless interface is working after suspending the system. It
- disconnects all interfaces and then connects to the wireless interface and checks that the
- connection is working as expected.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_bg
-depends: suspend/suspend_advanced
-estimated_duration: 20.0
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_BG_SSID WPA_BG_PSK
-command:
- trap "nmcli con delete id $WPA_BG_SSID" EXIT
- if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11b/g protocols after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_bg
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_BG_SSID
-command:
- trap "nmcli con delete id $OPEN_BG_SSID" EXIT
- if create_connection wifi $OPEN_BG_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11b/g protocols after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_n
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_N_SSID WPA_N_PSK
-command:
- trap "nmcli con delete id $WPA_N_SSID" EXIT
- if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11n protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_n
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_N_SSID
-command:
- trap "nmcli con delete id $OPEN_N_SSID" EXIT
- if create_connection wifi $OPEN_N_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11n protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_ac
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: WPA_AC_SSID WPA_AC_PSK
-command:
- trap "nmcli con delete id $WPA_AC_SSID" EXIT
- if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11ac protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_ac
-depends: suspend/suspend_advanced
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: OPEN_AC_SSID
-command:
- trap "nmcli con delete id $OPEN_AC_SSID" EXIT
- if create_connection wifi $OPEN_AC_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11ac protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_bg_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_BG_SSID WPA_BG_PSK
-command:
- trap "nmcli con delete id $WPA_BG_SSID" EXIT
- if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11b/g protocols after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_bg_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_BG_SSID
-command:
- trap "nmcli con delete id $OPEN_BG_SSID" EXIT
- if create_connection wifi $OPEN_BG_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11b/g protocols after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_n_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_N_SSID WPA_N_PSK
-command:
- trap "nmcli con delete id $WPA_N_SSID" EXIT
- if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11n protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_n_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_N_SSID
-command:
- trap "nmcli con delete id $OPEN_N_SSID" EXIT
- if create_connection wifi $OPEN_N_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11n protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_wpa_ac_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: WPA_AC_SSID WPA_AC_PSK
-command:
- trap "nmcli con delete id $WPA_AC_SSID" EXIT
- if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11ac protocol after the system has been suspended.
-
-plugin: shell
-category_id: com.canonical.plainbox::suspend
-id: suspend/wireless_connection_after_suspend_open_ac_auto
-depends: suspend/suspend_advanced_auto
-estimated_duration: 1.2
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: OPEN_AC_SSID
-command:
- trap "nmcli con delete id $OPEN_AC_SSID" EXIT
- if create_connection wifi $OPEN_AC_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11ac protocol after the system has been suspended.
-
 unit: template
 template-resource: device
 template-filter: device.category == 'NETWORK'
@@ -1058,7 +642,7 @@ depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep gsm |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -1072,7 +656,7 @@ depends: suspend/suspend_advanced_auto
 estimated_duration: 20.0
 user: root
 environ: TEST_TARGET_FTP TEST_TARGET_IPERF TEST_USER TEST_PASS
-command: 
+command:
 INTERFACE=`(nmcli -t -f GENERAL -m tabular dev list 2>/dev/null || nmcli -t -f GENERAL -m tabular dev show) |grep cdma |cut -d ":" -f 13`
 [ -z $INTERFACE ] && exit 1
 network test -i $INTERFACE -t iperf
@@ -1567,7 +1151,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/xrandr_screens_after_suspend.tar.gz
 depends: suspend/cycle_resolutions_after_suspend
-command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 unit: template
@@ -1577,7 +1161,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/{index}_xrandr_screens_after_suspend.tar.gz
 depends: suspend/{index}_cycle_resolutions_after_suspend_{product_slug}
-command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && base64 $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
+command: [ -f $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz ] && cat $PLAINBOX_SESSION_SHARE/{index}_xrandr_screens_after_suspend.tgz
 _description: This attaches screenshots from the suspend/cycle_resolutions_after_suspend test to the results submission.
 
 plugin: shell
@@ -1617,7 +1201,7 @@ _description:
 plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: suspend/suspend-auto-single-log-attach
-command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && xz -c $PLAINBOX_SESSION_SHARE/suspend_auto_single_log | base64
+command: [ -e $PLAINBOX_SESSION_SHARE/suspend_auto_single_log ] && cat $PLAINBOX_SESSION_SHARE/suspend_auto_single_log
 _description:
 Attaches the log from the single suspend/resume test to the results
 
@@ -1640,7 +1224,7 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 id: screenshot_after_suspend.jpg
 depends: suspend/screenshot_after_suspend
-command: base64 ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
+command: cat ${PLAINBOX_SESSION_SHARE}/screenshot_after_suspend.jpg
 _description: Attaches the screenshot captured in graphics/screenshot.
 
 plugin: shell
@@ -1651,6 +1235,7 @@ requires:
 package.name == 'wmctrl'
 package.name == 'mesa-utils'
 package.name == 'firefox'
+ package.name == 'unity'
 depends: suspend/suspend_advanced_auto
 command: gpu_test
 _description:
@@ -2724,6 +2309,5 @@ plugin: attachment
 category_id: com.canonical.plainbox::suspend
 estimated_duration: 0.5
 command:
- [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log | base64
+ [ -e ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log ] && xz -c ${PLAINBOX_SESSION_SHARE}/fwts_oops_results_after_s3.log
 _description: Attaches the FWTS oops results log to the submission after suspend
-
diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu
index 6615401..52c299d 100644
--- a/units/usb/usb.pxu
+++ b/units/usb/usb.pxu
@@ -51,7 +51,8 @@ _purpose:
 Check system can detect USB 2.0 storage when inserted
 _steps:
 1. Press continue
- 2. Connect USB 2.0 storage device
+ 2. Wait until the message "INSERT NOW" is printed on the screen
+ 3. Connect USB 2.0 storage device
 _verification:
 The verification of this test is automated.
 Do not change the automatically selected result.
@@ -62,7 +63,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher insertion usb2
 else
- removable_storage_watcher insert usb
+ removable_storage_watcher --unmounted insert usb
 fi
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -75,7 +76,8 @@ _purpose:
 Check system can detect insertion of a USB 3.0 storage device
 _steps:
 1. Press continue
- 2. Connect USB 3.0 storage device
+ 2. Wait until the message "INSERT NOW" is printed on the screen
+ 3. Connect USB 3.0 storage device
 _verification:
 The verification of this test is automated.
 Do not change the automatically selected result.
@@ -85,7 +87,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher insertion usb3
 else
- removable_storage_watcher -m 500000000 insert usb
+ removable_storage_watcher --unmounted -m 500000000 insert usb
 fi
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -96,7 +98,8 @@ _purpose:
 Check system can detect removal of a USB 2.0 storage device
 _steps:
 1. Press continue
- 2. Disconnect USB 2.0 storage device
+ 2. Wait until the message "REMOVE NOW" is printed on the screen
+ 3. Disconnect USB 2.0 storage device
 _verification:
 The verification of this test is automated.
 Do not change the automatically selected result.
@@ -108,7 +111,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher removal usb2
 else
- removable_storage_watcher remove usb
+ removable_storage_watcher --unmounted remove usb
 fi
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
@@ -119,7 +122,8 @@ _purpose:
 Check system can detect removal of a USB 3.0 storage device
 _steps:
 1. Press continue
- 2. Disconnect USB 3.0 storage device
+ 2. Wait until the message "REMOVE NOW" is printed on the screen
+ 3. Disconnect USB 3.0 storage device
 _verification:
 The verification of this test is automated.
 Do not change the automatically selected result.
@@ -131,7 +135,7 @@ command:
 if [[ -v SNAP ]]; then
 checkbox-support-run_watcher removal usb3
 else
- removable_storage_watcher -m 500000000 remove usb
+ removable_storage_watcher --unmounted -m 500000000 remove usb
 fi
 category_id: com.canonical.plainbox::usb
 estimated_duration: 120
diff --git a/units/virtualization/jobs.pxu b/units/virtualization/jobs.pxu
index 39f37e9..faccf65 100644
--- a/units/virtualization/jobs.pxu
+++ b/units/virtualization/jobs.pxu
@@ -18,7 +18,6 @@ _summary:
 plugin: shell
 category_id: com.canonical.plainbox::virtualization
 id: virtualization/verify_lxd
-user: root
 environ: LXD_TEMPLATE LXD_ROOTFS
 estimated_duration: 30.0
 requires:
diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 89868ef..427596c 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -1,234 +1,153 @@
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_scanning
-requires:
- package.name == 'network-manager'
- device.category == 'WIRELESS'
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_scanning_{{ interface }}
+_summary: Test system can discover Wi-Fi networks on {{ interface }}
 command:
- rfkill unblock wlan wifi
- if rfkill list wlan wifi | grep -q 'Hard blocked: yes'; then
- echo "Hard block is applied to WiFi device. Please remove and retest."
- exit 1
- fi
- wireless_networks=`(nmcli -f SSID dev wifi list 2>/dev/null || nmcli -f SSID dev wifi)`
- if [ `echo "$wireless_networks" | wc -l` -gt 1 ]; then
- echo "Wireless networks discovered: "
- echo "$wireless_networks"
- exit 0
- fi
- echo "No wireless networks discovered."
- exit 1
-estimated_duration: 0.645
-_description: Wireless scanning test. It scans and reports on discovered APs.
-
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test scan {{ interface }}
 plugin: shell
 category_id: com.canonical.plainbox::wireless
-id: wireless/info_automated
-requires:
- package.name == 'network-manager'
- device.category == 'WIRELESS'
-command: udev_resource -f WIRELESS | awk "/interface: / { print \$2 }" | xargs -n 1 network_info
-estimated_duration: 1.2
-_description:
- This is an automated test to gather some info on the current state of your wireless devices. If no devices are found, the test will exit with an error.
-
-plugin: user-interact-verify
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection
-command: network_check
-estimated_duration: 120.0
-requires: device.category == 'WIRELESS'
+estimated_duration: 6
 _description:
- PURPOSE:
- This test will check your wireless connection.
- STEPS:
- 1. Click on the Network icon in the panel.
- 2. Select a network below the 'Wireless networks' section.
- 3. Click "Test" to verify that it's possible to establish an HTTP connection.
- VERIFICATION:
- Did a notification show and was the connection correctly established?
+ Check system can find a wireless network AP nearby
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_wpa_bg_nm_{{ interface }}
+_summary: Connect to WPA-encrypted 802.11b/g Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to 802.11b/g AP with wpa security
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_wpa_bg
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_BG_SSID WPA_BG_PSK
 command:
- trap "nmcli con delete id $WPA_BG_SSID" EXIT
- if create_connection wifi $WPA_BG_SSID --security=wpa --key=$WPA_BG_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test secured {{ interface }} "$WPA_BG_SSID" "$WPA_BG_PSK"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11b/g protocols.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_open_bg_nm_{{ interface }}
+_summary: Connect to unencrypted 802.11b/g Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to insecure 802.11b/g AP
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_bg
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_BG_SSID
 command:
- trap "nmcli con delete id $OPEN_BG_SSID" EXIT
- if create_connection wifi $OPEN_BG_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test open {{ interface }} "$OPEN_BG_SSID"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11b/g protocols.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_wpa_n_nm_{{ interface }}
+_summary: Connect to WPA-encrypted 802.11n Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to 802.11n AP with wpa security
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_wpa_n
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: WPA_N_SSID WPA_N_PSK
 command:
- trap "nmcli con delete id $WPA_N_SSID" EXIT
- if create_connection wifi $WPA_N_SSID --security=wpa --key=$WPA_N_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test secured {{ interface }} "$WPA_N_SSID" "$WPA_N_PSK"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11n protocol.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ wireless_sta_protocol.{{ interface }}_n == 'supported'
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_open_n_nm_{{ interface }}
+_summary: Connect to unencrypted 802.11n Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to insecure 802.11n AP
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_n
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
-user: root
-environ: OPEN_N_SSID
 command:
- trap "nmcli con delete id $OPEN_N_SSID" EXIT
- if create_connection wifi $OPEN_N_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test open {{ interface }} "$OPEN_N_SSID"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11n protocol.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ wireless_sta_protocol.{{ interface }}_n == 'supported'
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_wpa_ac_nm_{{ interface }}
+_summary: Connect to WPA-encrypted 802.11ac Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to 802.11ac AP with wpa security
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_wpa_ac
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: WPA_AC_SSID WPA_AC_PSK
 command:
- trap "nmcli con delete id $WPA_AC_SSID" EXIT
- if create_connection wifi $WPA_AC_SSID --security=wpa --key=$WPA_AC_PSK; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test secured {{ interface }} "$WPA_AC_SSID" "$WPA_AC_PSK"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using WPA
- security and the 802.11ac protocol.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ wireless_sta_protocol.{{ interface }}_ac == 'supported'
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
+unit: template
+template-resource: device
+template-filter: device.category == 'WIRELESS'
+template-engine: jinja2
+template-unit: job
+id: wireless/wireless_connection_open_ac_nm_{{ interface }}
+_summary: Connect to unencrypted 802.11ac Wi-Fi network on {{ interface }}
+_purpose:
+ Check system can connect to insecure 802.11ac AP
 plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_ac
-requires:
- device.category == 'WIRELESS'
- environment.ROUTERS == 'multiple'
- IEEE_80211.ac == 'supported'
-user: root
-environ: OPEN_AC_SSID
 command:
- trap "nmcli con delete id $OPEN_AC_SSID" EXIT
- if create_connection wifi $OPEN_AC_SSID; then
- connect_wireless # lp:1471663
- INTERFACE=`nmcli dev status | awk '/802-11-wireless|wifi/ {print $1}'`
- iw dev $INTERFACE link
- gateway_ping_test --interface=$INTERFACE
- STATUS=$?
- # We reconnect the Ethernet connection if any (lp:1471663)
- WIRED=$(nmcli -f UUID,TYPE c | grep -oP ".*(?=\s+.*ethernet)")
- if [[ ! -z $WIRED ]]; then
- nmcli c up uuid $WIRED
- fi
- exit $STATUS
- else
- exit 1
- fi
+ net_driver_info $NET_DRIVER_INFO
+ wifi_nmcli_test open {{ interface }} "$OPEN_AC_SSID"
+category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-_description:
- Tests that the systems wireless hardware can connect to a router using no
- security and the 802.11ac protocol.
+flags: preserve-locale also-after-suspend also-after-suspend-manual
+requires:
+ wireless_sta_protocol.{{ interface }}_ac == 'supported'
+ {%- if __on_ubuntucore__ %}
+ connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
+ {% endif -%}
 
 plugin: user-interact-verify
 category_id: com.canonical.plainbox::wireless
@@ -525,78 +444,3 @@ command:
 estimated_duration: 330.0
 _description:
 Tests the performance of a system's wireless connection through the iperf tool, using UDP packets.
-
-unit: template
-template-resource: device
-template-filter:
- device.category == 'WIRELESS'
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/stress_performance_device{__index__}_{interface}
-estimated_duration: 330.0
-requires:
- package.name == 'iperf'
-environ: TEST_TARGET_IPERF
-user: root
-command: network test -i {interface} -t stress
-_description:
- This test executes iperf to generate a load on the network device {__index__} ({interface}) and then performs a ping test to watch for dropped packets and very large latency periods.
-
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_extension
-requires: device.category == 'WIRELESS'
-command: wireless_ext
-estimated_duration: 1.2
-_description:
- Test that the MAC80211 modules are loaded and wireless extensions are working.
-
-unit: template
-template-resource: device
-template-filter: device.category == 'WIRELESS'
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/iwconfig_check_device{__index__}_{interface}
-estimated_duration: 1.2
-command: iwconfig {interface}
-_description:
- This test executes iwconfig requests against wireless device {__index__} ({interface}).
-
-plugin: user-interact-verify
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_rfkill
-command: rfkill list | zenity --text-info --title rfkill-Info
-estimated_duration: 120.0
-requires: device.category == 'WIRELESS'
-_description:
- PURPOSE:
- This test will check whether or not your driver responds to rfkill commands.
- STEPS:
- 1. Use the hardware switch on the side of your device to switch off wireless.
- 2. If you do not have a hardware switch disable wireless from the network manager icon in the panel
- 3. Click "Test" to verify that the hard or soft blocks are in place.
- VERIFICATION:
- Did the hard or soft blocks show on in the dialog?
-
-unit: template
-template-resource: device
-template-filter: device.category == 'WIRELESS'
-plugin: user-interact-verify
-category_id: com.canonical.plainbox::wireless
-id: wireless/maximum_bandwidth_device{__index__}_{interface}
-estimated_duration: 120.0
-requires:
- package.name == 'zenity'
- package.name == 'iperf'
-environ: TEST_TARGET_IPERF
-user: root
-command: network test -i {interface} -t iperf 2>&1 | cat - <(echo; echo "Verify the result and click OK to decide on the outcome") | zenity --text-info --title 'mobile broadband max bw {interface}'
-_purpose:
- User verification of whether the observed transfer throughput is acceptable
- for the type and maximum speed of wireless device {__index__} ({interface}).
-_steps:
- 1. Click "Test".
- 2. Read the network test summary and confirm that the throughput is acceptable.
- 3. If needed, click "Test" again to repeat the transfer test.
-_verification:
- Was the reported throughput acceptable for the type and maximum speed of this interface?
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index b4cf2f7..ee921df 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -12,55 +12,67 @@ _name: Wireless tests (after suspend)
 _description: Wireless connection tests (after suspend)
 include:
 nested_part:
- after-suspend-wireless-cert-automated
+ after-suspend-manual-wireless-cert-automated
 
 id: wireless-cert-automated
 unit: test plan
 _name: Wireless tests
 _description: Wireless connection tests
 include:
- wireless/wireless_scanning certification-status=blocker
- wireless/wireless_connection_wpa_bg certification-status=blocker
- wireless/wireless_connection_open_bg certification-status=blocker
- wireless/wireless_connection_wpa_n certification-status=blocker
- wireless/wireless_connection_open_n certification-status=blocker
- wireless/wireless_connection_wpa_ac certification-status=blocker
- wireless/wireless_connection_open_ac certification-status=blocker
+ wireless/wireless_scanning_.* certification-status=blocker
+ wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
 
 id: after-suspend-wireless-cert-automated
 unit: test plan
 _name: Wireless tests (after suspend, automated)
 _description: Wireless connection tests (after suspend, automated)
 include:
- suspend/wireless_connection_after_suspend_wpa_bg certification-status=blocker
- suspend/wireless_connection_after_suspend_open_bg certification-status=blocker
- suspend/wireless_connection_after_suspend_wpa_n certification-status=blocker
- suspend/wireless_connection_after_suspend_open_n certification-status=blocker
- suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
- suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
+ after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+
+id: after-suspend-manual-wireless-cert-automated
+unit: test plan
+_name: Wireless tests (after manual suspend, automated)
+_description: Wireless connection tests (after manual suspend, automated)
+include:
+ after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
 
 id: wireless-cert-blockers
 unit: test plan
 _name: Wireless tests (certification blockers only)
 _description: Wireless connection tests (certification blockers only)
 include:
- wireless/wireless_scanning certification-status=blocker
- wireless/wireless_connection_wpa_bg certification-status=blocker
- wireless/wireless_connection_open_bg certification-status=blocker
- wireless/wireless_connection_wpa_n certification-status=blocker
- wireless/wireless_connection_open_n certification-status=blocker
- wireless/wireless_connection_wpa_ac certification-status=blocker
- wireless/wireless_connection_open_ac certification-status=blocker
+ wireless/wireless_scanning_.* certification-status=blocker
+ wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
 
 id: after-suspend-wireless-cert-blockers
 unit: test plan
-_name: Wireless tests (after suspend, certification blockers only)
+_name: Wireless tests (after manual suspend, certification blockers only)
 _description:
- Wireless connection tests (after suspend, certification blockers only)
+ Wireless connection tests (after manual suspend, certification blockers only)
 include:
- suspend/wireless_connection_after_suspend_wpa_bg certification-status=blocker
- suspend/wireless_connection_after_suspend_open_bg certification-status=blocker
- suspend/wireless_connection_after_suspend_wpa_n certification-status=blocker
- suspend/wireless_connection_after_suspend_open_n certification-status=blocker
- suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
- suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker