Import plainbox-provider-checkbox_0.40.0~rc3.orig.tar.gzupstream-0.40.0_rc3patched-0.40.0_rc3-1

8 files changed, 43 insertions, 217 deletions

diff --git a/bin/pm_test b/bin/pm_test
index 395498c..35cd215 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -202,8 +202,8 @@ class PowerManagementOperation(object):
 MessageDialog(title, message).run()
 if self.args.checkbox_respawn_cmd:
 subprocess.run(
- r'DISPLAY=:0 x-terminal-emulator -e "bash -c \"source {}; exec bash\""'.format(
- self.args.checkbox_respawn_cmd), shell=True)
+ r'DISPLAY=:0 x-terminal-emulator -e "sudo -u {} bash -c \"source {}; exec bash\""'.format(
+ self.user, self.args.checkbox_respawn_cmd), shell=True)
 
 def teardown(self):
 """
diff --git a/manage.py b/manage.py
index 5641256..932ce73 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
 setup(
 name='plainbox-provider-checkbox',
 namespace='com.canonical.certification',
- version="0.40.0rc2",
+ version="0.40.0rc3",
 description=N_("Checkbox provider"),
 gettext_domain='plainbox-provider-checkbox',
 strict=False, deprecated=False,
diff --git a/units/bluetooth/test-plan.pxu b/units/bluetooth/test-plan.pxu
index e6d64e9..844d8b1 100644
--- a/units/bluetooth/test-plan.pxu
+++ b/units/bluetooth/test-plan.pxu
@@ -3,10 +3,10 @@ unit: test plan
 _name: Bluetooth tests
 _description: Bluetooth tests
 include:
- bluetooth/detect-output
- bluetooth/audio-a2dp
- bluetooth/browse-files
- bluetooth/file-transfer
+ bluetooth/detect-output certification-status=blocker
+ bluetooth/audio-a2dp certification-status=blocker
+ bluetooth/browse-files certification-status=blocker
+ bluetooth/file-transfer certification-status=blocker
 bluetooth/HID
 bluetooth4/HOGP-mouse certification-status=blocker
 bluetooth4/HOGP-keyboard certification-status=blocker
@@ -16,12 +16,16 @@ unit: test plan
 _name: Bluetooth tests (automated)
 _description: Bluetooth tests (automated)
 include:
- bluetooth/detect-output
+ bluetooth/detect-output certification-status=blocker
 
 id: bluetooth-cert-blockers
 unit: test plan
 _name: Bluetooth tests (certification blockers only)
 _description: Bluetooth tests (certification blockers only)
 include:
+ bluetooth/detect-output certification-status=blocker
+ bluetooth/audio-a2dp certification-status=blocker
+ bluetooth/browse-files certification-status=blocker
+ bluetooth/file-transfer certification-status=blocker
 bluetooth4/HOGP-mouse certification-status=blocker
 bluetooth4/HOGP-keyboard certification-status=blocker
diff --git a/units/default.pxu b/units/default.pxu
deleted file mode 100644
index 5647b95..0000000
--- a/units/default.pxu
+++ /dev/null
@@ -1,109 +0,0 @@
-id: default
-_name: Default Tests
-unit: test plan
-include:
- optical_drive
- miscellanea/submission-resources
- miscellanea/is_laptop
- codecs_attachment
- cpuinfo_attachment
- dmesg_attachment
- dmi_attachment
- dmidecode_attachment
- lshw_attachment
- efi_attachment
- lsmod_attachment
- lspci_attachment
- modprobe_attachment
- modules_attachment
- sysfs_attachment
- sysctl_attachment
- udev_attachment
- audio/list_devices
- audio/playback_headphones
- audio/playback_auto
- audio/alsa_record_playback_external
- audio/alsa_record_playback_internal
- audio/alsa_record_playback_usb
- audio/playback_auto
- benchmarks/disk/hdparm-read_.*
- benchmarks/disk/hdparm-cache-read_.*
- bluetooth/detect-output
- camera/detect
- camera/still
- camera/display
- cpu/offlining_test
- cpu/topology
- cpu/clocktest
- disk/detect
- firewire/insert
- firewire/storage-test
- firewire/remove
- graphics/1_compiz_check.*
- graphics/1_resolution.*
- graphics/1_minimum_resolution.*
- graphics/1_driver_version.*
- graphics/VESA_drivers_not_in_use
- input/keyboard
- input/mouse
- keys/super
- keys/battery-info
- keys/brightness
- keys/media-control
- keys/mute
- keys/volume
- keys/wireless
- mediacard/mmc-insert
- mediacard/mmc-storage
- mediacard/mmc-remove
- mediacard/sd-insert
- mediacard/sd-storage
- mediacard/sd-remove
- mediacard/sdhc-insert
- mediacard/sdhc-storage
- mediacard/sdhc-remove
- mediacard/cf-insert
- mediacard/cf-storage
- mediacard/cf-remove
- memory/info
- monitor/hdmi
- monitor/vga
- monitor/powersaving
- ethernet/detect
- wireless/wireless_connection
- optical/detect
- optical/read_.*
- expresscard/verification
- power-management/rtc
- suspend/audio_before_suspend
- suspend/memory_before_suspend
- suspend/network_before_suspend
- suspend/resolution_before_suspend
- suspend/suspend_advanced
- suspend/wireless_before_suspend
- keys/sleep
- suspend/mmc-insert-after-suspend
- suspend/mmc-storage-after-suspend
- suspend/mmc-remove-after-suspend
- suspend/sd-insert-after-suspend
- suspend/sd-storage-after-suspend
- suspend/sd-remove-after-suspend
- suspend/sdhc-insert-after-suspend
- suspend/sdhc-storage-after-suspend
- suspend/sdhc-remove-after-suspend
- mediacard/cf-insert-after-suspend
- mediacard/cf-storage-after-suspend
- mediacard/cf-remove-after-suspend
- suspend/audio_after_suspend
- suspend/bluetooth_detect_after_suspend
- suspend/memory_after_suspend
- suspend/network_after_suspend
- suspend/resolution_after_suspend
- suspend/wireless_after_suspend
- usb/detect
- usb/insert
- usb/storage-automated
- usb/remove
-bootstrap_include:
- device
- graphics_card
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu
index 0588e26..12ad318 100644
--- a/units/info/jobs.pxu
+++ b/units/info/jobs.pxu
@@ -340,9 +340,14 @@ plugin: attachment
 category_id: com.canonical.plainbox::info
 id: info/buildstamp
 estimated_duration: 0.1
-_description: Attaches the buildstamp identifier for the preinstalled OS
-_summary: Attach /etc/buildstamp
-command: [ -s /etc/buildstamp ] && cat /etc/buildstamp
+_description: Attaches the buildstamp identifier for the OS
+_summary: Attaches the buildstamp identifier for the OS
+command:
+ if [ -s /etc/buildstamp ]; then
+ cat /etc/buildstamp
+ elif [ -e /var/lib/snapd/seed/seed.yaml ]; then
+ echo && date -r /var/lib/snapd/seed/seed.yaml -R
+ fi
 
 plugin: shell
 category_id: com.canonical.plainbox::info
diff --git a/units/stress/test-plan.pxu b/units/stress/test-plan.pxu
index 5f72916..5581401 100644
--- a/units/stress/test-plan.pxu
+++ b/units/stress/test-plan.pxu
@@ -14,6 +14,8 @@ include:
 power-management/suspend_30_cycles certification-status=blocker
 power-management/suspend-30-cycle-log-attach
 power-management/suspend-30-cycles-time-check certification-status=non-blocker
+ power-management/hibernate_30_cycles certification-status=non-blocker
+ power-management/hibernate-30-cycle-log-attach
 stress/cpu_stress_ng_test certification-status=blocker
 
 id: stress-cert-blockers
@@ -35,6 +37,15 @@ include:
 power-management/suspend-30-cycle-log-attach-with-reboots
 power-management/suspend-30-cycles-time-check-with-reboots
 
+id: stress-hibernate-30-cycles-automated
+unit: test plan
+_name: Hibernate stress tests
+_description: Hibernate stress tests
+include:
+ power-management/hibernate_30_cycles certification-status=non-blocker
+ power-management/hibernate-30-cycles-log-check
+ power-management/hibernate-30-cycle-log-attach
+
 id: stress-30-reboot-poweroff-automated
 unit: test plan
 _name: Power Management reboot and power off stress tests (automated)
diff --git a/units/suspend/test-plan.pxu b/units/suspend/test-plan.pxu
index 57124f5..a9068d2 100644
--- a/units/suspend/test-plan.pxu
+++ b/units/suspend/test-plan.pxu
@@ -34,9 +34,9 @@ include:
 suspend/audio_before_suspend certification-status=blocker
 suspend/cpu_before_suspend certification-status=blocker
 suspend/memory_before_suspend certification-status=blocker
- suspend/bluetooth_obex_send_before_suspend
- suspend/bluetooth_obex_browse_before_suspend
- suspend/bluetooth_obex_get_before_suspend
+ suspend/bluetooth_obex_send_before_suspend certification-status=blocker
+ suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
+ suspend/bluetooth_obex_get_before_suspend certification-status=blocker
 
 id: after-suspend-reference-cert-automated
 unit: test plan
@@ -48,9 +48,9 @@ include:
 suspend/cpu_after_suspend certification-status=blocker
 suspend/memory_after_suspend certification-status=blocker
 suspend/bluetooth_detect_after_suspend certification-status=blocker
- suspend/bluetooth_obex_send_after_suspend
- suspend/bluetooth_obex_browse_after_suspend
- suspend/bluetooth_obex_get_after_suspend
+ suspend/bluetooth_obex_send_after_suspend certification-status=blocker
+ suspend/bluetooth_obex_browse_after_suspend certification-status=blocker
+ suspend/bluetooth_obex_get_after_suspend certification-status=blocker
 
 id: before-suspend-reference-cert-blockers
 unit: test plan
@@ -61,6 +61,9 @@ include:
 suspend/audio_before_suspend certification-status=blocker
 suspend/cpu_before_suspend certification-status=blocker
 suspend/memory_before_suspend certification-status=blocker
+ suspend/bluetooth_obex_send_before_suspend certification-status=blocker
+ suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
+ suspend/bluetooth_obex_get_before_suspend certification-status=blocker
 
 id: after-suspend-reference-cert-blockers
 unit: test plan
@@ -72,6 +75,9 @@ include:
 suspend/cpu_after_suspend certification-status=blocker
 suspend/memory_after_suspend certification-status=blocker
 suspend/bluetooth_detect_after_suspend certification-status=blocker
+ suspend/bluetooth_obex_send_after_suspend certification-status=blocker
+ suspend/bluetooth_obex_browse_after_suspend certification-status=blocker
+ suspend/bluetooth_obex_get_after_suspend certification-status=blocker
 
 id: suspend-key-led-oops-check-cert-blockers
 unit: test plan
diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index cf13a3c..89868ef 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -526,67 +526,6 @@ estimated_duration: 330.0
 _description:
 Tests the performance of a system's wireless connection through the iperf tool, using UDP packets.
 
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_a
-requires:
- device.category == 'WIRELESS'
- IEEE_80211.band_5GHz == 'supported'
-user: root
-environ: OPEN_A_SSID
-command:
- trap "nmcli con delete id $OPEN_A_SSID" EXIT
- if create_connection wifi $OPEN_A_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
-estimated_duration: 30.0
-_description:
- Test that the system's wireless hardware can connect to a router using the
- 802.11a protocol. This requires that you have a router pre-configured to only
- respond to requests on the 802.11a protocol.
-
-plugin: shell
-category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_b
-requires:
- device.category == 'WIRELESS'
-user: root
-environ: OPEN_B_SSID
-command:
- trap "nmcli con delete id $OPEN_B_SSID" EXIT
- if create_connection wifi $OPEN_B_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
-estimated_duration: 30.0
-_description:
- Test that the system's wireless hardware can connect to a router using the
- 802.11b protocol. This requires that you have a router pre-configured to only
- respond to requests on the 802.11b protocol.
-
 unit: template
 template-resource: device
 template-filter:
@@ -605,36 +544,6 @@ _description:
 
 plugin: shell
 category_id: com.canonical.plainbox::wireless
-id: wireless/wireless_connection_open_g
-requires:
- device.category == 'WIRELESS'
-user: root
-environ: OPEN_G_SSID
-command:
- trap "nmcli con delete id $OPEN_G_SSID" EXIT
- if create_connection wifi $OPEN_G_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
-estimated_duration: 30.0
-_description:
- Test that the system's wireless hardware can connect to a router using the
- 802.11g protocol. This requires that you have a router pre-configured to only
- respond to requests on the 802.11g protocol.
-
-plugin: shell
-category_id: com.canonical.plainbox::wireless
 id: wireless/wireless_extension
 requires: device.category == 'WIRELESS'
 command: wireless_ext