Update Somerville provide

7 files changed, 1126 insertions, 210 deletions

diff --git a/units/somerville-BIOS.pxu b/units/somerville-BIOS.pxu
index 5579b12..81849b6 100644
--- a/units/somerville-BIOS.pxu
+++ b/units/somerville-BIOS.pxu
@@ -1,10 +1,11 @@
-id: somerville-BIOS
-_name: Somerville BIOS
+id: Somerville-cert-14-04-3
+_name: Somerville 14.04.3 Client Certification Tests
 unit: test plan
 include:
- ## BIOS Whitelist for Dell projects
- ## Rev 1.1, 2014-09-30
+ ## Client Certification Whitelist for Dell projects
+ ## Rev 1.0, 2015-05-27
 # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
 2013.com.canonical.certification::cdimage
@@ -21,10 +22,10 @@ include:
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
@@ -41,48 +42,106 @@ include:
 somerville/manifest_version
 somerville/Unity-mode-default3d
 somerville/dell-repository
- #miscellanea
- 2013.com.canonical.certification::__miscellanea__
- 2013.com.canonical.certification::miscellanea/tester-info
- 2013.com.canonical.certification::miscellanea/chvt
- # See Automated Tests section at the end of this file
- #audio
 2013.com.canonical.certification::__audio__
+ 2013.com.canonical.certification::audio/generator_.*
 2013.com.canonical.certification::audio/alsa_info_collect
 2013.com.canonical.certification::audio/alsa_info_attachment
+ 2013.com.canonical.certification::audio/speaker-headphone-plug-detection certification-status=blocker
+ 2013.com.canonical.certification::audio/microphone-plug-detection certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_external certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
 2013.com.canonical.certification::audio/list_devices
 2013.com.canonical.certification::audio/playback_auto certification-status=blocker
- 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
- 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
- 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
- #bluetooth
+ 2013.com.canonical.certification::audio/playback_headphones certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
+ # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
+ 2013.com.canonical.certification::__benchmarks__
+ # See Automated Tests section at the end of this file
 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
 2013.com.canonical.certification::bluetooth/HID
- #camera
 2013.com.canonical.certification::__camera__
 2013.com.canonical.certification::camera/detect certification-status=blocker
 2013.com.canonical.certification::camera/still certification-status=blocker
 2013.com.canonical.certification::camera/display certification-status=blocker
- #disk
+ 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
+ 2013.com.canonical.certification::__cpu__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::cpu/cstates certification-status=blocker
+ 2013.com.canonical.certification::cpu/cstates_results.log
 2013.com.canonical.certification::__disk__
+ # See Automated Tests section at the end of this file
 2013.com.canonical.certification::disk/detect certification-status=blocker
- #graphics
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
+ 2013.com.canonical.certification::__esata__
+ 2013.com.canonical.certification::esata/insert certification-status=blocker
+ 2013.com.canonical.certification::esata/storage-test certification-status=blocker
+ 2013.com.canonical.certification::esata/remove certification-status=blocker
+ 2013.com.canonical.certification::__expresscard__
+ 2013.com.canonical.certification::expresscard/verification certification-status=blocker
+ 2013.com.canonical.certification::__firewire__
+ 2013.com.canonical.certification::firewire/insert certification-status=blocker
+ 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
+ 2013.com.canonical.certification::firewire/remove certification-status=blocker
+ 2013.com.canonical.certification::__firmware__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__monitor__
+ 2013.com.canonical.certification::monitor/generator_.*
+ 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
+ # See Graphic Tests section for monitor test on second graphic card
 2013.com.canonical.certification::__graphics__
 2013.com.canonical.certification::graphics/generator_.*
+ 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
+ 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_glxgears_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/1_driver_version_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_compiz_check_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_rotation_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_display_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
- 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
- #keys
+ 2013.com.canonical.certification::graphics/1_video_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_switch_card_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_glxgears_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_driver_version_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_compiz_check_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_rotation_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_video_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
+ 2013.com.canonical.certification::__hibernate__
+ #See below, power-management/hibernate_advanced
+ 2013.com.canonical.certification::__input__
+ 2013.com.canonical.certification::input/pointing
+ 2013.com.canonical.certification::input/pointing_.* certification-status=blocker
+ 2013.com.canonical.certification::input/clicking
+ 2013.com.canonical.certification::input/clicking_.* certification-status=blocker
+ 2013.com.canonical.certification::input/keyboard certification-status=blocker
 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/lock-screen certification-status=blocker
 2013.com.canonical.certification::keys/super certification-status=blocker
@@ -97,7 +156,6 @@ include:
 2013.com.canonical.certification::keys/keyboard-overhead-light certification-status=blocker
 2013.com.canonical.certification::keys/microphone-mute certification-status=blocker
 2013.com.canonical.certification::keys/touchpad
- #led
 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/bluetooth certification-status=non-blocker
 2013.com.canonical.certification::led/camera certification-status=blocker
@@ -109,31 +167,49 @@ include:
 2013.com.canonical.certification::led/battery-charging
 2013.com.canonical.certification::led/battery-charged
 2013.com.canonical.certification::led/battery-low
- 2013.com.canonical.certification::led/wlan certification-status=non-blocker
- 2013.com.canonical.certification::led/wlan-disabled
- 2013.com.canonical.certification::led/hdd
- 2013.com.canonical.certification::led/touchpad
- #networking
- 2013.com.canonical.certification::__networking__
- 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- #2013.com.canonical.certification::networking/info_wlan\d
- #above case does not exist
- 2013.com.canonical.certification::networking/ntp certification-status=blocker
- #mediacard
+ # NOTE: led/power-blink-suspend and led/suspend are used later in the
+ # testplan just after a number of suspend tests.
+ # led/power-blink-suspend
+ # led/suspend
+ # NOTE: led/wireless is redundant given that we have led/wlan and
+ # led/bluetooth already
+ # led/wireless
 2013.com.canonical.certification::__mediacard__
+ 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
 2013.com.canonical.certification::mediacard/sdhc-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sdhc-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sdhc-remove certification-status=blocker
- #monitor
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/displayport certification-status=blocker
- 2013.com.canonical.certification::monitor/dvi certification-status=blocker
- 2013.com.canonical.certification::monitor/hdmi certification-status=blocker
- 2013.com.canonical.certification::monitor/vga certification-status=blocker
- #power-management
+ 2013.com.canonical.certification::__memory__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/oops_results.log
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__networking__
+ # See before the Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
+ 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
+ 2013.com.canonical.certification::networking/info certification-status=blocker
+ 2013.com.canonical.certification::networking/info_eth\d certification-status=blocker
+ 2013.com.canonical.certification::networking/info_wlan\d certification-status=blocker
+ 2013.com.canonical.certification::networking/ntp certification-status=blocker
+ 2013.com.canonical.certification::__optical__
+ 2013.com.canonical.certification::optical/detect certification-status=blocker
+ 2013.com.canonical.certification::optical/read certification-status=blocker
+ 2013.com.canonical.certification::optical/read_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/cdrom-write certification-status=blocker
+ 2013.com.canonical.certification::optical/cdrom-write_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/dvd-write certification-status=blocker
+ 2013.com.canonical.certification::optical/dvd-write_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-read_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-write_.* certification-status=blocker
 2013.com.canonical.certification::__power-management__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
 2013.com.canonical.certification::power-management/lid certification-status=blocker
 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
@@ -141,21 +217,37 @@ include:
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
- 2013.com.canonical.certification::power-management/hibernate-single-log-check
- 2013.com.canonical.certification::power-management/hibernate-single-log-attach
- 2013.com.canonical.certification::keys/hibernate certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot certification-status=blocker
- 2013.com.canonical.certification::power-management/reboot-log-attach
- #usb
+ 2013.com.canonical.certification::__touchpad__
+ 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
+ 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/vertical certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-selection certification-status=blocker
+ 2013.com.canonical.certification::touchpad/drag-and-drop certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-rightclick certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
+ 2013.com.canonical.certification::__touchscreen__
+ 2013.com.canonical.certification::touchscreen/nontouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-rotate
+ 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
 2013.com.canonical.certification::__usb__
 2013.com.canonical.certification::usb/detect certification-status=blocker
+ 2013.com.canonical.certification::usb/HID certification-status=blocker
+ 2013.com.canonical.certification::usb/insert certification-status=blocker
+ 2013.com.canonical.certification::usb/storage-automated certification-status=blocker
+ 2013.com.canonical.certification::usb/remove certification-status=blocker
 2013.com.canonical.certification::usb3/insert certification-status=blocker
 2013.com.canonical.certification::usb3/storage-automated certification-status=blocker
+ 2013.com.canonical.certification::usb3/superspeed_performance certification-status=blocker
 2013.com.canonical.certification::usb3/remove certification-status=blocker
- #wireless
 2013.com.canonical.certification::__wireless__
 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
@@ -164,43 +256,68 @@ include:
 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
- #suspend
 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/memory_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_get_before_suspend certification-status=blocker
+ # Test card 2 first, if present, since it's the one we will be using
+ # after coming back from suspend if the system has hybrid graphics.
+ 2013.com.canonical.certification::suspend/2_resolution_before_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend_after_switch_to_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_compiz_check_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_driver_version_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_resolution_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_display_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_glxgears_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_video_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_xrandr_screens_after_suspend_.*.tar.gz
+ # Now we ask to switch to the first graphics card. This requires a restart
+ # of checkbox.
+ 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
- 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/driver_version_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/display_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/glxgears_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/video_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::led/power-blink-suspend certification-status=blocker
 2013.com.canonical.certification::led/suspend certification-status=blocker
 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/generator_display_after_suspend
- 2013.com.canonical.certification::suspend/2_display_after_suspend.* certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_detect_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_get_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::suspend/record_playback_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sdhc-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sdhc-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sdhc-remove-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_insert_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_storage_automated_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_remove_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_insert_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_storage_automated_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_remove_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_bg certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_bg certification-status=blocker
 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_n certification-status=blocker
@@ -230,15 +347,49 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
 2013.com.canonical.certification::suspend/led_after_suspend/hdd
 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
- somerville/suspend-power-menu
- somerville/suspend-power-button
- somerville/suspend-on-battery-power
- somerville/suspend-on-AC-power 
- #stress
- 2013.com.canonical.certification::__stress__
+ 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::keys/hibernate certification-status=blocker
+ # The following tests should run BEFORE the automated tests. The reboot and
+ # power off tests will also give us a clean system to start the stress run
+ # with.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach
 2013.com.canonical.certification::power-management/suspend_30_cycles certification-status=blocker
+ 2013.com.canonical.certification::power-management/suspend-30-cycles-log-check
 2013.com.canonical.certification::power-management/suspend-30-cycle-log-attach
 2013.com.canonical.certification::power-management/suspend-30-cycles-time-check certification-status=non-blocker
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests.
+ # They have been moved to the end of the test run to improve the testing
+ # process.
+ 2013.com.canonical.certification::firmware/fwts
+ 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
+ 2013.com.canonical.certification::firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
+ 2013.com.canonical.certification::cpu/scaling_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/scaling_test-log-attach
+ 2013.com.canonical.certification::cpu/maxfreq_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/maxfreq_test-log-attach
+ 2013.com.canonical.certification::cpu/offlining_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/topology certification-status=blocker
+ 2013.com.canonical.certification::cpu/clocktest
+ 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::disk/stats_.*
+ 2013.com.canonical.certification::disk/read_performance certification-status=blocker
+ 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/smart certification-status=blocker
+ 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/storage_devices
+ 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
+ 2013.com.canonical.certification::memory/info certification-status=blocker
+ 2013.com.canonical.certification::memory/check certification-status=blocker
 #Info attachment jobs
 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
@@ -248,17 +399,24 @@ include:
 2013.com.canonical.certification::dmidecode_attachment
 2013.com.canonical.certification::efi_attachment
 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
 2013.com.canonical.certification::modprobe_attachment
 2013.com.canonical.certification::modules_attachment
 2013.com.canonical.certification::sysctl_attachment
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp
diff --git a/units/somerville-cert-14-04-3.pxu b/units/somerville-cert-14-04-3.pxu
new file mode 100644
index 0000000..8ae8c2a
--- /dev/null
+++ b/units/somerville-cert-14-04-3.pxu
@@ -0,0 +1,387 @@
+id: Somerville-cert-14-04-3
+_name: Somerville 14.04.3 Client Certification Tests
+unit: test plan
+include:
+ ## Client Certification Whitelist for Dell projects
+ ## Rev 1.0, 2015-05-27
+ # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
+ 2013.com.canonical.certification::IEEE_80211
+ 2013.com.canonical.certification::block_device
+ 2013.com.canonical.certification::cdimage
+ 2013.com.canonical.certification::cpuinfo
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::display
+ 2013.com.canonical.certification::dmi
+ 2013.com.canonical.certification::dpkg
+ 2013.com.canonical.certification::efi
+ 2013.com.canonical.certification::environment
+ 2013.com.canonical.certification::gconf
+ 2013.com.canonical.certification::lsb
+ 2013.com.canonical.certification::meminfo
+ 2013.com.canonical.certification::mobilebroadband
+ 2013.com.canonical.certification::module
+ 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
+ 2013.com.canonical.certification::package
+ 2013.com.canonical.certification::rtc
+ 2013.com.canonical.certification::sleep
+ 2013.com.canonical.certification::uname
+ 2013.com.canonical.certification::usb
+ 2013.com.canonical.certification::xinput
+ 2013.com.canonical.certification::resource
+ 2013.com.canonical.certification::miscellanea/submission-resources
+ # Tests grouped by categories. Categories start with '__'
+ 2013.com.canonical.certification::hardware
+ 2013.com.canonical.certification::hardware/certification
+ somerville
+ somerville/recovery
+ somerville/recovery/desktop-disk
+ somerville/phase-sku
+ somerville/query-bto-version
+ somerville/manifest_version
+ somerville/Unity-mode-default3d
+ somerville/dell-repository
+ 2013.com.canonical.certification::__audio__
+ 2013.com.canonical.certification::audio/generator_.*
+ 2013.com.canonical.certification::audio/alsa_info_collect
+ 2013.com.canonical.certification::audio/alsa_info_attachment
+ 2013.com.canonical.certification::audio/speaker-headphone-plug-detection certification-status=blocker
+ 2013.com.canonical.certification::audio/microphone-plug-detection certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_external certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
+ 2013.com.canonical.certification::audio/list_devices
+ 2013.com.canonical.certification::audio/playback_auto certification-status=blocker
+ 2013.com.canonical.certification::audio/playback_headphones certification-status=blocker
+ 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
+ # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
+ 2013.com.canonical.certification::__benchmarks__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__bluetooth__
+ 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/HID
+ 2013.com.canonical.certification::__camera__
+ 2013.com.canonical.certification::camera/detect certification-status=blocker
+ 2013.com.canonical.certification::camera/still certification-status=blocker
+ 2013.com.canonical.certification::camera/display certification-status=blocker
+ 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
+ 2013.com.canonical.certification::__cpu__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::cpu/cstates certification-status=blocker
+ 2013.com.canonical.certification::cpu/cstates_results.log
+ 2013.com.canonical.certification::__disk__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::disk/detect certification-status=blocker
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
+ 2013.com.canonical.certification::__esata__
+ 2013.com.canonical.certification::esata/insert certification-status=blocker
+ 2013.com.canonical.certification::esata/storage-test certification-status=blocker
+ 2013.com.canonical.certification::esata/remove certification-status=blocker
+ 2013.com.canonical.certification::__expresscard__
+ 2013.com.canonical.certification::expresscard/verification certification-status=blocker
+ 2013.com.canonical.certification::__firewire__
+ 2013.com.canonical.certification::firewire/insert certification-status=blocker
+ 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
+ 2013.com.canonical.certification::firewire/remove certification-status=blocker
+ 2013.com.canonical.certification::__firmware__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__monitor__
+ 2013.com.canonical.certification::monitor/generator_.*
+ 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
+ # See Graphic Tests section for monitor test on second graphic card
+ 2013.com.canonical.certification::__graphics__
+ 2013.com.canonical.certification::graphics/generator_.*
+ 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
+ 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_glxgears_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_driver_version_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_compiz_check_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_rotation_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_video_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_switch_card_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_glxgears_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_driver_version_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_compiz_check_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_rotation_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_video_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
+ 2013.com.canonical.certification::__hibernate__
+ #See below, power-management/hibernate_advanced
+ 2013.com.canonical.certification::__input__
+ 2013.com.canonical.certification::input/pointing
+ 2013.com.canonical.certification::input/pointing_.* certification-status=blocker
+ 2013.com.canonical.certification::input/clicking
+ 2013.com.canonical.certification::input/clicking_.* certification-status=blocker
+ 2013.com.canonical.certification::input/keyboard certification-status=blocker
+ 2013.com.canonical.certification::__keys__
+ 2013.com.canonical.certification::keys/lock-screen certification-status=blocker
+ 2013.com.canonical.certification::keys/super certification-status=blocker
+ 2013.com.canonical.certification::keys/battery-info certification-status=blocker
+ 2013.com.canonical.certification::keys/brightness certification-status=blocker
+ 2013.com.canonical.certification::keys/media-control certification-status=blocker
+ 2013.com.canonical.certification::keys/mute certification-status=blocker
+ 2013.com.canonical.certification::keys/volume certification-status=blocker
+ 2013.com.canonical.certification::keys/video-out certification-status=blocker
+ 2013.com.canonical.certification::keys/wireless certification-status=blocker
+ 2013.com.canonical.certification::keys/keyboard-backlight certification-status=blocker
+ 2013.com.canonical.certification::keys/keyboard-overhead-light certification-status=blocker
+ 2013.com.canonical.certification::keys/microphone-mute certification-status=blocker
+ 2013.com.canonical.certification::__led__
+ 2013.com.canonical.certification::led/camera certification-status=blocker
+ 2013.com.canonical.certification::led/caps-lock certification-status=blocker
+ 2013.com.canonical.certification::led/mute certification-status=blocker
+ 2013.com.canonical.certification::led/numeric-keypad certification-status=blocker
+ 2013.com.canonical.certification::led/power certification-status=blocker
+ # NOTE: led/power-blink-suspend and led/suspend are used later in the
+ # testplan just after a number of suspend tests.
+ # led/power-blink-suspend
+ # led/suspend
+ # NOTE: led/wireless is redundant given that we have led/wlan and
+ # led/bluetooth already
+ # led/wireless
+ 2013.com.canonical.certification::__mediacard__
+ 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sdhc-insert certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sdhc-storage certification-status=blocker
+ 2013.com.canonical.certification::mediacard/sdhc-remove certification-status=blocker
+ 2013.com.canonical.certification::__memory__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/oops_results.log
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__networking__
+ # See before the Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
+ 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
+ 2013.com.canonical.certification::networking/info certification-status=blocker
+ 2013.com.canonical.certification::networking/info_eth\d certification-status=blocker
+ 2013.com.canonical.certification::networking/info_wlan\d certification-status=blocker
+ 2013.com.canonical.certification::networking/ntp certification-status=blocker
+ 2013.com.canonical.certification::__optical__
+ 2013.com.canonical.certification::optical/detect certification-status=blocker
+ 2013.com.canonical.certification::optical/read certification-status=blocker
+ 2013.com.canonical.certification::optical/read_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/cdrom-write certification-status=blocker
+ 2013.com.canonical.certification::optical/cdrom-write_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/dvd-write certification-status=blocker
+ 2013.com.canonical.certification::optical/dvd-write_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-read_.* certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-write_.* certification-status=blocker
+ 2013.com.canonical.certification::__power-management__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ 2013.com.canonical.certification::power-management/rtc certification-status=blocker
+ 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
+ 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
+ 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
+ 2013.com.canonical.certification::__touchpad__
+ 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
+ 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/vertical certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-selection certification-status=blocker
+ 2013.com.canonical.certification::touchpad/drag-and-drop certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-rightclick certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
+ 2013.com.canonical.certification::__touchscreen__
+ 2013.com.canonical.certification::touchscreen/nontouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-rotate
+ 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
+ 2013.com.canonical.certification::__usb__
+ 2013.com.canonical.certification::usb/detect certification-status=blocker
+ 2013.com.canonical.certification::usb/HID certification-status=blocker
+ 2013.com.canonical.certification::usb/insert certification-status=blocker
+ 2013.com.canonical.certification::usb/storage-automated certification-status=blocker
+ 2013.com.canonical.certification::usb/remove certification-status=blocker
+ 2013.com.canonical.certification::usb3/insert certification-status=blocker
+ 2013.com.canonical.certification::usb3/storage-automated certification-status=blocker
+ 2013.com.canonical.certification::usb3/superspeed_performance certification-status=blocker
+ 2013.com.canonical.certification::usb3/remove certification-status=blocker
+ 2013.com.canonical.certification::__wireless__
+ 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_n certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
+ 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
+ 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/audio_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/cpu_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/memory_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_send_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_get_before_suspend certification-status=blocker
+ # Test card 2 first, if present, since it's the one we will be using
+ # after coming back from suspend if the system has hybrid graphics.
+ 2013.com.canonical.certification::suspend/2_resolution_before_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend_after_switch_to_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_compiz_check_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_driver_version_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_resolution_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_display_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_glxgears_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_video_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_xrandr_screens_after_suspend_.*.tar.gz
+ # Now we ask to switch to the first graphics card. This requires a restart
+ # of checkbox.
+ 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/driver_version_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/display_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/glxgears_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/video_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
+ 2013.com.canonical.certification::keys/sleep certification-status=blocker
+ 2013.com.canonical.certification::led/power-blink-suspend certification-status=blocker
+ 2013.com.canonical.certification::led/suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/audio_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/cpu_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_detect_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_send_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/bluetooth_obex_get_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/record_playback_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/pointing-after-suspend
+ 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sdhc-insert-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sdhc-storage-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/sdhc-remove-after-suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_insert_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_storage_automated_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb_remove_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_insert_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_storage_automated_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/usb3_remove_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_bg certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_bg certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_n certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_n certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_wpa_ac certification-status=blocker
+ 2013.com.canonical.certification::suspend/wireless_connection_after_suspend_open_ac certification-status=blocker
+ 2013.com.canonical.certification::keys/hibernate certification-status=blocker
+ # The following tests should run BEFORE the automated tests. The reboot and
+ # power off tests will also give us a clean system to start the stress run
+ # with.
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests.
+ # They have been moved to the end of the test run to improve the testing
+ # process.
+ 2013.com.canonical.certification::firmware/fwts
+ 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
+ 2013.com.canonical.certification::firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
+ 2013.com.canonical.certification::cpu/scaling_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/scaling_test-log-attach
+ 2013.com.canonical.certification::cpu/maxfreq_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/maxfreq_test-log-attach
+ 2013.com.canonical.certification::cpu/offlining_test certification-status=blocker
+ 2013.com.canonical.certification::cpu/topology certification-status=blocker
+ 2013.com.canonical.certification::cpu/clocktest
+ 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::disk/stats_.*
+ 2013.com.canonical.certification::disk/read_performance certification-status=blocker
+ 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/smart certification-status=blocker
+ 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/storage_devices
+ 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
+ 2013.com.canonical.certification::memory/info certification-status=blocker
+ 2013.com.canonical.certification::memory/check certification-status=blocker
+ #Info attachment jobs
+ 2013.com.canonical.certification::__info__
+ 2013.com.canonical.certification::codecs_attachment
+ 2013.com.canonical.certification::cpuinfo_attachment
+ 2013.com.canonical.certification::dmesg_attachment
+ 2013.com.canonical.certification::dmi_attachment
+ 2013.com.canonical.certification::dmidecode_attachment
+ 2013.com.canonical.certification::efi_attachment
+ 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
+ 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
+ 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
+ 2013.com.canonical.certification::modprobe_attachment
+ 2013.com.canonical.certification::modules_attachment
+ 2013.com.canonical.certification::sysctl_attachment
+ 2013.com.canonical.certification::sysfs_attachment
+ 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
+ 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
+ 2013.com.canonical.certification::acpi_sleep_attachment
+ 2013.com.canonical.certification::info/hdparm
+ 2013.com.canonical.certification::info/hdparm_.*.txt
+ 2013.com.canonical.certification::installer_debug.gz
+ 2013.com.canonical.certification::info/touchpad_driver
+ 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp
diff --git a/units/somerville-full.pxu b/units/somerville-full.pxu
index db6c316..18686ff 100644
--- a/units/somerville-full.pxu
+++ b/units/somerville-full.pxu
@@ -3,8 +3,9 @@ _name: Somerville Full
 unit: test plan
 include:
 ## Full Whitelist for Dell projects
- ## Rev 1.2, 2015-05-13
+ ## Rev 1.3, 2015-05-27
 # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
 2013.com.canonical.certification::cdimage
@@ -21,10 +22,10 @@ include:
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
@@ -46,6 +47,7 @@ include:
 2013.com.canonical.certification::miscellanea/chvt
 # See Automated Tests section at the end of this file
 2013.com.canonical.certification::__audio__
+ 2013.com.canonical.certification::audio/generator_.*
 2013.com.canonical.certification::audio/alsa_info_collect
 2013.com.canonical.certification::audio/alsa_info_attachment
 2013.com.canonical.certification::audio/speaker-headphone-plug-detection certification-status=blocker
@@ -56,20 +58,15 @@ include:
 2013.com.canonical.certification::audio/channels
 2013.com.canonical.certification::audio/playback_auto certification-status=blocker
 2013.com.canonical.certification::audio/playback_headphones certification-status=blocker
- 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
- 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
- #2013.com.canonical.certification::audio/check_volume
- #2013.com.canonical.certification::audio/alsa_record_playback_usb
- #2013.com.canonical.certification::audio/external-linein
- #2013.com.canonical.certification::audio/external-lineout
- 2013.com.canonical.certification::__codecs__
- 2013.com.canonical.certification::codecs/ogg-vorbis
- 2013.com.canonical.certification::codecs/wav
 2013.com.canonical.certification::__benchmarks__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__codecs__
+ 2013.com.canonical.certification::codecs/ogg-vorbis
+ 2013.com.canonical.certification::codecs/wav 
 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
@@ -86,7 +83,8 @@ include:
 2013.com.canonical.certification::__disk__
 # See Automated Tests section at the end of this file
 2013.com.canonical.certification::disk/detect certification-status=blocker
- #2013.com.canonical.certification::disk/hdd-parking
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
 2013.com.canonical.certification::__esata__
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
@@ -97,35 +95,67 @@ include:
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
 2013.com.canonical.certification::firewire/remove certification-status=blocker
+ 2013.com.canonical.certification::__thunderbolt__
+ 2013.com.canonical.certification::thunderbolt/insert certification-status=non-blocker
+ 2013.com.canonical.certification::thunderbolt/storage-test certification-status=non-blocker
+ 2013.com.canonical.certification::thunderbolt/remove certification-status=non-blocker
+ # See the Thunderbolt monitor test for the daisy-chain test
 2013.com.canonical.certification::__firmware__
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__ethernet__
- 2013.com.canonical.certification::ethernet/detect certification-status=blocker
- 2013.com.canonical.certification::ethernet/info_automated
+ # See Automated Tests section at the end of this file 
+ 2013.com.canonical.certification::__monitor__
+ 2013.com.canonical.certification::monitor/generator_.*
+ 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::audio/1_playback_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::thunderbolt/daisy-chain certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/1_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
+ # See Graphic Tests section for monitor test on second graphic card 
 2013.com.canonical.certification::__graphics__
 somerville/amd-graphics-mode-default-value
 2013.com.canonical.certification::graphics/generator_.*
+ 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
+ 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_glxgears_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/1_driver_version_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_compiz_check_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_rotation_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_display_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_video_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
- 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_cycle_resolution_.* certification-status=non-blocker
 2013.com.canonical.certification::graphics/2_switch_card_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_glxgears_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_driver_version_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_compiz_check_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_rotation_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/2_display_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_video_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
+ 2013.com.canonical.certification::graphics/2_cycle_resolution_.* certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/2_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::audio/2_playback_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/2_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
 2013.com.canonical.certification::__hibernate__
 #See below, power-management/hibernate_advanced
 2013.com.canonical.certification::__input__
@@ -133,7 +163,6 @@ include:
 2013.com.canonical.certification::input/accelerometer certification-status=non-blocker
 2013.com.canonical.certification::input/pointing
 2013.com.canonical.certification::input/pointing_.* certification-status=blocker
- 2013.com.canonical.certification::input/keyboard certification-status=blocker
 2013.com.canonical.certification::input/clicking
 2013.com.canonical.certification::input/clicking_.* certification-status=blocker
 2013.com.canonical.certification::input/keyboard certification-status=blocker
@@ -163,6 +192,13 @@ include:
 2013.com.canonical.certification::led/battery-charging
 2013.com.canonical.certification::led/battery-charged
 2013.com.canonical.certification::led/battery-low
+ # NOTE: led/power-blink-suspend and led/suspend are used later in the
+ # testplan just after a number of suspend tests.
+ # led/power-blink-suspend
+ # led/suspend
+ # NOTE: led/wireless is redundant given that we have led/wlan and
+ # led/bluetooth already
+ # led/wireless
 2013.com.canonical.certification::led/wlan certification-status=non-blocker
 2013.com.canonical.certification::led/wlan-disabled
 2013.com.canonical.certification::led/hdd
@@ -191,29 +227,19 @@ include:
 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
 2013.com.canonical.certification::miscellanea/oops_results.log
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/powersaving certification-status=blocker
- 2013.com.canonical.certification::monitor/dim_brightness certification-status=blocker
- 2013.com.canonical.certification::monitor/displayport certification-status=blocker
- 2013.com.canonical.certification::monitor/dvi certification-status=blocker
- 2013.com.canonical.certification::monitor/hdmi certification-status=blocker
- 2013.com.canonical.certification::monitor/rca certification-status=blocker
- 2013.com.canonical.certification::monitor/svideo certification-status=blocker
- 2013.com.canonical.certification::monitor/vga certification-status=blocker
- 2013.com.canonical.certification::monitor/multi-head certification-status=blocker
+ # See Automated Tests section at the end of this file
 2013.com.canonical.certification::__mobilebroadband__
 2013.com.canonical.certification::mobilebroadband/gsm_connection certification-status=non-blocker
 2013.com.canonical.certification::mobilebroadband/cdma_connection certification-status=non-blocker
 2013.com.canonical.certification::__networking__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
 2013.com.canonical.certification::networking/info certification-status=blocker
 2013.com.canonical.certification::networking/info_eth\d
- #2013.com.canonical.certification::networking/info_wlan\d
- #above case does not exist
+ 2013.com.canonical.certification::networking/info_wlan\d
 2013.com.canonical.certification::networking/ntp certification-status=blocker
 2013.com.canonical.certification::__optical__
- 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::optical/detect certification-status=blocker
 2013.com.canonical.certification::optical/read certification-status=blocker
 2013.com.canonical.certification::optical/read_.* certification-status=blocker
@@ -222,11 +248,12 @@ include:
 2013.com.canonical.certification::optical/dvd-write certification-status=blocker
 2013.com.canonical.certification::optical/dvd-write_.* certification-status=blocker
 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-read certification-status=blocker
- 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-read_.* certification-status=blocker
 2013.com.canonical.certification::optical/bluray-write certification-status=blocker
+ 2013.com.canonical.certification::optical/bluray-write_.* certification-status=blocker
 2013.com.canonical.certification::__power-management__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
 2013.com.canonical.certification::power-management/lid certification-status=blocker
 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
@@ -234,16 +261,12 @@ include:
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
- 2013.com.canonical.certification::power-management/hibernate-single-log-check
- 2013.com.canonical.certification::power-management/hibernate-single-log-attach
- 2013.com.canonical.certification::keys/hibernate certification-status=blocker
 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
 2013.com.canonical.certification::power-management/poweroff-log-attach
 2013.com.canonical.certification::power-management/reboot certification-status=blocker
 2013.com.canonical.certification::power-management/reboot-log-attach
 2013.com.canonical.certification::__touchpad__
- 2013.com.canonical.certification::touchpad/basic
+ 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
 2013.com.canonical.certification::touchpad/vertical certification-status=blocker
 2013.com.canonical.certification::touchpad/singletouch-automated certification-status=blocker
@@ -274,6 +297,7 @@ include:
 2013.com.canonical.certification::usb/remove certification-status=blocker
 2013.com.canonical.certification::usb3/insert certification-status=blocker
 2013.com.canonical.certification::usb3/storage-automated certification-status=blocker
+ 2013.com.canonical.certification::usb3/superspeed_performance certification-status=blocker
 2013.com.canonical.certification::usb3/remove certification-status=blocker
 2013.com.canonical.certification::__wireless__
 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
@@ -284,35 +308,60 @@ include:
 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/memory_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_get_before_suspend certification-status=blocker
+ # Test card 2 first, if present, since it's the one we will be using
+ # after coming back from suspend if the system has hybrid graphics.
+ 2013.com.canonical.certification::suspend/2_resolution_before_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend_after_switch_to_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend-time-check_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_suspend-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_hybrid_sleep_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_compiz_check_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_driver_version_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_resolution_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_display_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_glxgears_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_video_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_cycle_resolutions_after_suspend_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_xrandr_screens_after_suspend_.*.tar.gz
+ 2013.com.canonical.certification::power-management/2_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/2_hibernate-single-log-attach_.*
+ # Now we ask to switch to the first graphics card. This requires a restart
+ # of checkbox.
+ 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/driver_version_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/display_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/glxgears_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/video_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::led/power-blink-suspend certification-status=blocker
 2013.com.canonical.certification::led/suspend certification-status=blocker
 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/audio_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cpu_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/generator_display_after_suspend
- 2013.com.canonical.certification::suspend/2_display_after_suspend.* certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_detect_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_get_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::suspend/record_playback_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
@@ -369,13 +418,9 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
 2013.com.canonical.certification::suspend/led_after_suspend/hdd
 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
- # Now we ask to switch to the first graphics card. This requires a restart
- # of checkbox. If the system only has one card, the test instructions should
- # tell the user to just do nothing.
- 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/suspend/generator_suspend_after_switch_to_card
- 2013.com.canonical.certification::suspend/1_suspend_after_switch_to_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/1_display_after_suspend.* certification-status=blocker
+ 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ 2013.com.canonical.certification::keys/hibernate 
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
@@ -388,9 +433,11 @@ include:
 2013.com.canonical.certification::firmware/fwts
 2013.com.canonical.certification::firmware/fwts_logs
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
- 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log
- 2013.com.canonical.certification::firmware/fwts_wakealarm
- 2013.com.canonical.certification::firmware/fwts_wakealarm.log
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
+ 2013.com.canonical.certification::firmware/firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
 2013.com.canonical.certification::benchmarks/disk/hdparm-read
 2013.com.canonical.certification::benchmarks/disk/hdparm-read_.*
 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read
@@ -422,17 +469,24 @@ include:
 2013.com.canonical.certification::dmidecode_attachment
 2013.com.canonical.certification::efi_attachment
 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
 2013.com.canonical.certification::modprobe_attachment
 2013.com.canonical.certification::modules_attachment
 2013.com.canonical.certification::sysctl_attachment
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index 49f9da0..fe0ce72 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -3,8 +3,9 @@ _name: Somerville Graphics
 unit: test plan
 include:
 ## Graphic Whitelist for Dell projects
- ## Rev 1.1, 2015-03-17
+ ## Rev 1.2, 2015-06-02
 # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
 2013.com.canonical.certification::cdimage
@@ -21,10 +22,10 @@ include:
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
@@ -40,55 +41,99 @@ include:
 somerville/query-bto-version
 somerville/manifest_version
 somerville/Unity-mode-default3d
+ somerville/dell-repository
 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
 2013.com.canonical.certification::miscellanea/chvt
 # See Automated Tests section at the end of this file
 2013.com.canonical.certification::__audio__
- 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
- 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
+ 2013.com.canonical.certification::audio/generator_.*
 2013.com.canonical.certification::__benchmarks__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__disk__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::disk/detect certification-status=blocker
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
+ 2013.com.canonical.certification::__thunderbolt__
+ # See the Thunderbolt monitor test for the daisy-chain test
+ 2013.com.canonical.certification::__firmware__
+ # See Automated Tests section at the end of this file 
+ 2013.com.canonical.certification::__monitor__
+ 2013.com.canonical.certification::monitor/generator_.*
+ 2013.com.canonical.certification::monitor/1_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/1_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::audio/1_playback_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::thunderbolt/daisy-chain certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/1_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/1_multi-head_.* certification-status=blocker
+ # See Graphic Tests section for monitor test on second graphic card 
 2013.com.canonical.certification::__graphics__
 somerville/amd-graphics-mode-default-value
 2013.com.canonical.certification::graphics/generator_.*
+ 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
+ 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
+ 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_glxgears_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-version certification-status=blocker
 2013.com.canonical.certification::graphics/1_driver_version_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_compiz_check_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_rotation_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_display_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_video_.* certification-status=blocker
 2013.com.canonical.certification::graphics/1_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
- 2013.com.canonical.certification::graphics/xorg-process certification-status=blocker
- 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use certification-status=blocker
+ 2013.com.canonical.certification::graphics/1_cycle_resolution_.* certification-status=non-blocker
 2013.com.canonical.certification::graphics/2_switch_card_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_glxgears_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_driver_version_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_compiz_check_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_rotation_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/2_display_.* certification-status=blocker
+ 2013.com.canonical.certification::graphics/2_video_.* certification-status=blocker
 2013.com.canonical.certification::graphics/2_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
+ 2013.com.canonical.certification::graphics/2_cycle_resolution_.* certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/2_powersaving_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dim_brightness_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_displayport_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_dvi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::audio/2_playback_hdmi_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::audio/2_playback_thunderbolt_.* certification-status=non-blocker
+ 2013.com.canonical.certification::monitor/2_rca_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_svideo_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_vga_.* certification-status=blocker
+ 2013.com.canonical.certification::monitor/2_multi-head_.* certification-status=blocker
 2013.com.canonical.certification::__hibernate__
 #See below, power-management/hibernate_advanced
 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/video-out certification-status=blocker
- 2013.com.canonical.certification::__monitor__
- 2013.com.canonical.certification::monitor/powersaving certification-status=blocker
- 2013.com.canonical.certification::monitor/dim_brightness certification-status=blocker
- 2013.com.canonical.certification::monitor/displayport certification-status=blocker
- 2013.com.canonical.certification::monitor/dvi certification-status=blocker
- 2013.com.canonical.certification::monitor/hdmi certification-status=blocker
- 2013.com.canonical.certification::monitor/rca certification-status=blocker
- 2013.com.canonical.certification::monitor/svideo certification-status=blocker
- 2013.com.canonical.certification::monitor/vga certification-status=blocker
- 2013.com.canonical.certification::monitor/multi-head certification-status=blocker
+ 2013.com.canonical.certification::__memory__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/oops_results.log
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__networking__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
+ 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
+ 2013.com.canonical.certification::networking/info certification-status=blocker
+ 2013.com.canonical.certification::networking/info_eth\d
+ 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/ntp certification-status=blocker
 2013.com.canonical.certification::__power-management__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
 2013.com.canonical.certification::power-management/lid certification-status=blocker
 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
@@ -96,32 +141,52 @@ include:
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
- 2013.com.canonical.certification::power-management/hibernate-single-log-check
- 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
 2013.com.canonical.certification::power-management/poweroff-log-attach
 2013.com.canonical.certification::power-management/reboot certification-status=blocker
 2013.com.canonical.certification::power-management/reboot-log-attach
 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
+ 2013.com.canonical.certification::suspend/memory_before_suspend certification-status=blocker
+ # Test card 2 first, if present, since it's the one we will be using
+ # after coming back from suspend if the system has hybrid graphics.
+ 2013.com.canonical.certification::suspend/2_resolution_before_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend_after_switch_to_card_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_suspend-time-check_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_suspend-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_hybrid_sleep_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/2_compiz_check_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_driver_version_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_resolution_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_display_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_glxgears_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_video_after_suspend_.* certification-status=blocker
+ 2013.com.canonical.certification::suspend/2_cycle_resolutions_after_suspend_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/2_xrandr_screens_after_suspend_.*.tar.gz
+ 2013.com.canonical.certification::power-management/2_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/2_hibernate-single-log-attach_.*
+ # Now we ask to switch to the first graphics card. This requires a restart
+ # of checkbox.
+ 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
 2013.com.canonical.certification::suspend/resolution_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/compiz_check_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/driver_version_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/generator_display_after_suspend
- 2013.com.canonical.certification::suspend/2_display_after_suspend.* certification-status=blocker
- 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/display_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/glxgears_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/video_after_suspend certification-status=blocker
+ 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
+ 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/keys_after_suspend/video-out
- # Now we ask to switch to the first graphics card. This requires a restart
- # of checkbox. If the system only has one card, the test instructions should
- # tell the user to just do nothing.
- 2013.com.canonical.certification::graphics/1_switch_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/suspend/generator_suspend_after_switch_to_card
- 2013.com.canonical.certification::suspend/1_suspend_after_switch_to_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/1_display_after_suspend.* certification-status=blocker
+ 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
@@ -129,7 +194,25 @@ include:
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests. They
 # have been moved to the end of the test run to improve the testing process.
+ 2013.com.canonical.certification::firmware/fwts
+ 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
+ 2013.com.canonical.certification::firmware/firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
+ 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::disk/stats_.*
+ 2013.com.canonical.certification::disk/read_performance certification-status=blocker
+ 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/smart certification-status=blocker
+ 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/storage_devices
+ 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
+ 2013.com.canonical.certification::memory/info certification-status=blocker
+ 2013.com.canonical.certification::memory/check certification-status=blocker
 #Info attachment jobs
 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
@@ -139,17 +222,24 @@ include:
 2013.com.canonical.certification::dmidecode_attachment
 2013.com.canonical.certification::efi_attachment
 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
 2013.com.canonical.certification::modprobe_attachment
 2013.com.canonical.certification::modules_attachment
 2013.com.canonical.certification::sysctl_attachment
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp
diff --git a/units/somerville-stress.pxu b/units/somerville-stress.pxu
index 4833fc0..38d3aa8 100644
--- a/units/somerville-stress.pxu
+++ b/units/somerville-stress.pxu
@@ -3,12 +3,11 @@ _name: Somerville Stress
 unit: test plan
 include:
 ## Stress Whitelist for Dell projects
- ## Rev 1.0, 2014-07-11
+ ## Rev 1.1, 2015-06-02
 # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
 2013.com.canonical.certification::IEEE_80211
- 2013.com.canonical.certification::accessibility
 2013.com.canonical.certification::block_device
- 2013.com.canonical.certification::build
 2013.com.canonical.certification::cdimage
 2013.com.canonical.certification::cpuinfo
 2013.com.canonical.certification::device
@@ -23,15 +22,15 @@ include:
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
- 2013.com.canonical.certification::resource
+ 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
- # requirement of s3/s4 tests
- 2013.com.canonical.certification::rtc
+ 2013.com.canonical.certification::resource
+ 2013.com.canonical.certification::miscellanea/submission-resources
 # Tests grouped by categories. Categories start with '__'
 2013.com.canonical.certification::hardware
 2013.com.canonical.certification::hardware/certification
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
new file mode 100644
index 0000000..33e4efb
--- /dev/null
+++ b/units/somerville-touch-webcam.pxu
@@ -0,0 +1,184 @@
+id: somerville-touch-webcam
+_name: Somerville Touch/Webcam 
+unit: test plan
+include:
+ ## Touch/Webcam Whitelist for Dell projects
+ ## Rev 1.0, 2015-06-02
+ # Resource Jobs
+ 2013.com.canonical.plainbox::collect-manifest
+ 2013.com.canonical.certification::IEEE_80211
+ 2013.com.canonical.certification::block_device
+ 2013.com.canonical.certification::cdimage
+ 2013.com.canonical.certification::cpuinfo
+ 2013.com.canonical.certification::device
+ 2013.com.canonical.certification::display
+ 2013.com.canonical.certification::dmi
+ 2013.com.canonical.certification::dpkg
+ 2013.com.canonical.certification::efi
+ 2013.com.canonical.certification::environment
+ 2013.com.canonical.certification::gconf
+ 2013.com.canonical.certification::lsb
+ 2013.com.canonical.certification::meminfo
+ 2013.com.canonical.certification::mobilebroadband
+ 2013.com.canonical.certification::module
+ 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
+ 2013.com.canonical.certification::package
+ 2013.com.canonical.certification::rtc
+ 2013.com.canonical.certification::sleep
+ 2013.com.canonical.certification::uname
+ 2013.com.canonical.certification::usb
+ 2013.com.canonical.certification::xinput
+ 2013.com.canonical.certification::resource
+ 2013.com.canonical.certification::miscellanea/submission-resources
+ # Tests grouped by categories. Categories start with '__'
+ 2013.com.canonical.certification::hardware
+ 2013.com.canonical.certification::hardware/certification
+ somerville
+ somerville/recovery
+ somerville/recovery/desktop-disk
+ somerville/phase-sku
+ somerville/query-bto-version
+ somerville/manifest_version
+ somerville/dell-repository
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/tester-info
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__camera__
+ 2013.com.canonical.certification::camera/detect certification-status=blocker
+ 2013.com.canonical.certification::camera/still certification-status=blocker
+ 2013.com.canonical.certification::camera/display certification-status=blocker
+ 2013.com.canonical.certification::camera/multiple-resolution-images certification-status=blocker
+ 2013.com.canonical.certification::__disk__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::disk/detect certification-status=blocker
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
+ 2013.com.canonical.certification::__firmware__
+ # See Automated Tests section at the end of this file 
+ 2013.com.canonical.certification::__hibernate__
+ #See below, power-management/hibernate_advanced
+ 2013.com.canonical.certification::__keys__
+ 2013.com.canonical.certification::keys/touchpad
+ 2013.com.canonical.certification::__led__
+ 2013.com.canonical.certification::led/camera certification-status=blocker
+ 2013.com.canonical.certification::led/touchpad
+ 2013.com.canonical.certification::__memory__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/oops_results.log
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__networking__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
+ 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
+ 2013.com.canonical.certification::networking/info certification-status=blocker
+ 2013.com.canonical.certification::networking/info_eth\d
+ 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/ntp certification-status=blocker
+ 2013.com.canonical.certification::__power-management__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
+ 2013.com.canonical.certification::power-management/lid certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
+ 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
+ 2013.com.canonical.certification::power-management/rtc certification-status=blocker
+ 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
+ 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
+ 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
+ 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
+ 2013.com.canonical.certification::power-management/poweroff-log-attach
+ 2013.com.canonical.certification::power-management/reboot certification-status=blocker
+ 2013.com.canonical.certification::power-management/reboot-log-attach
+ 2013.com.canonical.certification::__touchpad__
+ 2013.com.canonical.certification::touchpad/detected-as-mouse certification-status=blocker
+ 2013.com.canonical.certification::touchpad/horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/vertical certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/singletouch-selection certification-status=blocker
+ 2013.com.canonical.certification::touchpad/drag-and-drop certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-rightclick certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-horizontal certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-vertical certification-status=blocker
+ 2013.com.canonical.certification::touchpad/multitouch-zoom certification-status=non-blocker
+ 2013.com.canonical.certification::touchpad/multitouch-dash certification-status=non-blocker
+ 2013.com.canonical.certification::__touchscreen__
+ 2013.com.canonical.certification::touchscreen/nontouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-automated certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-manual certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/drag-n-drop certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-zoom certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-rotate
+ 2013.com.canonical.certification::touchscreen/3-touch-tap certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/4-touch-tap certification-status=blocker
+ 2013.com.canonical.certification::touchscreen/multitouch-dash certification-status=non-blocker
+ 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
+ 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
+ 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
+ 2013.com.canonical.certification::suspend/1_hybrid_sleep_.* certification-status=non-blocker
+ 2013.com.canonical.certification::suspend/1_hybrid-sleep-single-log-attach_.*
+ 2013.com.canonical.certification::suspend/keys_after_suspend/touchpad
+ 2013.com.canonical.certification::suspend/led_after_suspend/camera
+ 2013.com.canonical.certification::suspend/led_after_suspend/touchpad
+ 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
+ somerville/suspend-power-menu
+ somerville/suspend-power-button
+ somerville/suspend-on-battery-power
+ somerville/suspend-on-AC-power 
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests. They
+ # have been moved to the end of the test run to improve the testing process.
+ 2013.com.canonical.certification::firmware/fwts
+ 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
+ 2013.com.canonical.certification::firmware/firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
+ 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::disk/stats_.*
+ 2013.com.canonical.certification::disk/read_performance certification-status=blocker
+ 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/smart certification-status=blocker
+ 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/storage_devices
+ 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
+ 2013.com.canonical.certification::memory/info certification-status=blocker
+ 2013.com.canonical.certification::memory/check certification-status=blocker
+ #Info attachment jobs
+ 2013.com.canonical.certification::__info__
+ 2013.com.canonical.certification::codecs_attachment
+ 2013.com.canonical.certification::cpuinfo_attachment
+ 2013.com.canonical.certification::dmesg_attachment
+ 2013.com.canonical.certification::dmi_attachment
+ 2013.com.canonical.certification::dmidecode_attachment
+ 2013.com.canonical.certification::efi_attachment
+ 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
+ 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
+ 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
+ 2013.com.canonical.certification::modprobe_attachment
+ 2013.com.canonical.certification::modules_attachment
+ 2013.com.canonical.certification::sysctl_attachment
+ 2013.com.canonical.certification::sysfs_attachment
+ 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
+ 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
+ 2013.com.canonical.certification::acpi_sleep_attachment
+ 2013.com.canonical.certification::info/hdparm
+ 2013.com.canonical.certification::info/hdparm_.*.txt
+ 2013.com.canonical.certification::installer_debug.gz
+ 2013.com.canonical.certification::info/touchpad_driver
+ 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index c21aed2..3eddc01 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -1,9 +1,9 @@
 id: somerville-wireless
-_name: Somerville Wireless
+_name: Somerville Wireless 
 unit: test plan
 include:
 ## Wireless Whitelist for Dell projects
- ## Rev 1.2, 2015-05-13
+ ## Rev 1.3, 2015-06-02
 # Resource Jobs
 2013.com.canonical.certification::IEEE_80211
 2013.com.canonical.certification::block_device
@@ -21,10 +21,10 @@ include:
 2013.com.canonical.certification::mobilebroadband
 2013.com.canonical.certification::module
 2013.com.canonical.certification::optical_drive
+ 2013.com.canonical.certification::optical_drive_.* certification-status=blocker
 2013.com.canonical.certification::package
 2013.com.canonical.certification::rtc
 2013.com.canonical.certification::sleep
- 2013.com.canonical.certification::touchpad_scroll
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 2013.com.canonical.certification::xinput
@@ -39,41 +39,51 @@ include:
 somerville/phase-sku
 somerville/query-bto-version
 somerville/manifest_version
+ somerville/dell-repository
 2013.com.canonical.certification::__miscellanea__
 2013.com.canonical.certification::miscellanea/tester-info
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__benchmarks__
+ # See Automated Tests section at the end of this file
 2013.com.canonical.certification::__bluetooth__
 2013.com.canonical.certification::bluetooth/detect-output certification-status=blocker
+ 2013.com.canonical.certification::bluetooth/audio-a2dp certification-status=blocker
 2013.com.canonical.certification::bluetooth/audio certification-status=blocker
 2013.com.canonical.certification::bluetooth/browse-files certification-status=blocker
 2013.com.canonical.certification::bluetooth/file-transfer certification-status=blocker
 2013.com.canonical.certification::bluetooth/HID
- 2013.com.canonical.certification::__ethernet__
- 2013.com.canonical.certification::ethernet/detect certification-status=blocker
- 2013.com.canonical.certification::ethernet/info_automated
- 2013.com.canonical.certification::__networking__
+ 2013.com.canonical.certification::__disk__
 # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
- 2013.com.canonical.certification::networking/info certification-status=blocker
- 2013.com.canonical.certification::networking/info_eth\d
- #2013.com.canonical.certification::networking/info_wlan\d
- #above case does not exist
- 2013.com.canonical.certification::networking/ntp certification-status=blocker
+ 2013.com.canonical.certification::disk/detect certification-status=blocker
+ 2013.com.canonical.certification::__ethernet__
+ # See Networking section below
+ 2013.com.canonical.certification::__firmware__
+ # See Automated Tests section at the end of this file 
+ 2013.com.canonical.certification::__hibernate__
+ #See below, power-management/hibernate_advanced
 2013.com.canonical.certification::__keys__
 2013.com.canonical.certification::keys/wireless certification-status=blocker
 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/bluetooth certification-status=non-blocker
 2013.com.canonical.certification::led/wlan certification-status=non-blocker
 2013.com.canonical.certification::led/wlan-disabled
- 2013.com.canonical.certification::__wireless__
- 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_wpa_n certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
- 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
+ 2013.com.canonical.certification::__memory__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__miscellanea__
+ 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/oops_results.log
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::__networking__
+ # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::ethernet/detect certification-status=blocker
+ 2013.com.canonical.certification::networking/gateway_ping certification-status=blocker
+ 2013.com.canonical.certification::networking/info certification-status=blocker
+ 2013.com.canonical.certification::networking/info_eth\d
+ 2013.com.canonical.certification::networking/info_wlan\d
+ 2013.com.canonical.certification::networking/ntp certification-status=blocker
 2013.com.canonical.certification::__power-management__
 # See Automated Tests section at the end of this file
+ 2013.com.canonical.certification::power-management/generator_.*
 2013.com.canonical.certification::power-management/lid certification-status=blocker
 2013.com.canonical.certification::power-management/lid_close certification-status=blocker
 2013.com.canonical.certification::power-management/lid_open certification-status=blocker
@@ -81,23 +91,27 @@ include:
 2013.com.canonical.certification::power-management/tickless_idle certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm certification-status=blocker
 2013.com.canonical.certification::power-management/fwts_wakealarm-log-attach
- 2013.com.canonical.certification::power-management/hibernate_advanced certification-status=non-blocker
- 2013.com.canonical.certification::power-management/hibernate-single-log-check
- 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::power-management/poweroff certification-status=blocker
 2013.com.canonical.certification::power-management/poweroff-log-attach
 2013.com.canonical.certification::power-management/reboot certification-status=blocker
 2013.com.canonical.certification::power-management/reboot-log-attach
+ 2013.com.canonical.certification::__wireless__
+ 2013.com.canonical.certification::wireless/wireless_scanning certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_bg certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_bg certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_n certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_n certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_wpa_ac certification-status=blocker
+ 2013.com.canonical.certification::wireless/wireless_connection_open_ac certification-status=blocker
 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_get_before_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
 2013.com.canonical.certification::suspend/suspend-time-check certification-status=non-blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
+ 2013.com.canonical.certification::suspend/suspend-single-log-attach
 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_detect_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/bluetooth_obex_send_after_suspend certification-status=blocker
@@ -113,10 +127,33 @@ include:
 2013.com.canonical.certification::suspend/led_after_suspend/bluetooth
 2013.com.canonical.certification::suspend/led_after_suspend/wlan
 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
+ 2013.com.canonical.certification::power-management/1_hibernate_advanced_.* certification-status=non-blocker
+ 2013.com.canonical.certification::power-management/1_hibernate-single-log-attach._*
 somerville/suspend-power-menu
 somerville/suspend-power-button
 somerville/suspend-on-battery-power
 somerville/suspend-on-AC-power 
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests. They
+ # have been moved to the end of the test run to improve the testing process.
+ 2013.com.canonical.certification::firmware/fwts
+ 2013.com.canonical.certification::firmware/fwts_logs
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis
+ 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_results.log 
+ 2013.com.canonical.certification::firmware/firmware/fwts_wakealarm.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/fwts_uefirtvariable.* certification-status=blocker
+ 2013.com.canonical.certification::firmware/no_ACPI_REV_interface certification-status=blocker
+ 2013.com.canonical.certification::miscellanea/dmitest_client
+ 2013.com.canonical.certification::disk/stats
+ 2013.com.canonical.certification::disk/stats_.*
+ 2013.com.canonical.certification::disk/read_performance certification-status=blocker
+ 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/smart certification-status=blocker
+ 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
+ 2013.com.canonical.certification::disk/storage_devices
+ 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
+ 2013.com.canonical.certification::memory/info certification-status=blocker
+ 2013.com.canonical.certification::memory/check certification-status=blocker
 #Info attachment jobs
 2013.com.canonical.certification::__info__
 2013.com.canonical.certification::codecs_attachment
@@ -126,17 +163,24 @@ include:
 2013.com.canonical.certification::dmidecode_attachment
 2013.com.canonical.certification::efi_attachment
 2013.com.canonical.certification::lspci_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
 2013.com.canonical.certification::lsusb_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
 2013.com.canonical.certification::meminfo_attachment
+ 2013.com.canonical.certification::modinfo_attachment
 2013.com.canonical.certification::modprobe_attachment
 2013.com.canonical.certification::modules_attachment
 2013.com.canonical.certification::sysctl_attachment
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
+ 2013.com.canonical.certification::dell_bto_xml_attachment
 2013.com.canonical.certification::lsmod_attachment
+ 2013.com.canonical.certification::dkms_info_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
 2013.com.canonical.certification::info/hdparm
 2013.com.canonical.certification::info/hdparm_.*.txt
 2013.com.canonical.certification::installer_debug.gz
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/disk_partitions
+ 2013.com.canonical.certification::info/buildstamp