[Stella] Desktop test plan removed, laptop test plan adjusted to match Cert 14.04 test plan

2 files changed, 103 insertions, 564 deletions

diff --git a/units/stella-desktop-full.pxu b/units/stella-desktop-full.pxu
deleted file mode 100644
index 09e2ff3..0000000
--- a/units/stella-desktop-full.pxu
+++ /dev/null
@@ -1,525 +0,0 @@
-id: stella-desktop-full
-_name: Stella Desktop Full
-unit: test plan
-include:
- ## Common Whitelist for OEM projects
- ## Rev 1.2, 2015-05-13
- ## Based on checkbox-ng, checkbox-gui, plainbox, plainbox-provider-checkbox (0.4~dev-bzr3032)
- # Resource Jobs
- 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
- 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::module
- 2013.com.canonical.certification::optical_drive
- 2013.com.canonical.certification::package
- 2013.com.canonical.certification::resource
- #resources
- 2013.com.canonical.certification::sleep
- #touchpad_scroll
- 2013.com.canonical.certification::xinput
- 2013.com.canonical.certification::uname
- 2013.com.canonical.certification::usb
- 2013.com.canonical.certification::IEEE_80211
- # requirement of s3/s4 tests
- 2013.com.canonical.certification::rtc
- 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
- 2013.com.canonical.certification::__miscellanea__
- 2013.com.canonical.certification::miscellanea/tester-info
- #miscellanea/chvt
- # See Automated Tests section at the end of this file
- 2013.com.canonical.certification::__audio__
- 2013.com.canonical.certification::audio/alsa_info_collect
- 2013.com.canonical.certification::audio/alsa_info_attachment
- #audio/alsa_record_playback_usb
- 2013.com.canonical.certification::audio/list_devices
- 2013.com.canonical.certification::audio/playback_auto certification-status=blocker
- 2013.com.canonical.certification::audio/channels
- #audio/check_volume
- 2013.com.canonical.certification::audio/alsa_record_playback_internal certification-status=blocker
- 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
- 2013.com.canonical.certification::audio/playback_headphones certification-status=blocker
- 2013.com.canonical.certification::audio/alsa_record_playback_external certification-status=blocker
- #audio/plug-detection
- 2013.com.canonical.certification::audio/speaker-headphone-plug-detection certification-status=blocker
- 2013.com.canonical.certification::audio/microphone-plug-detection certification-status=blocker
- #audio/external-linein
- #audio/external-lineout
- 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
- 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
- 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::__bluetooth__
- 2013.com.canonical.certification::bluetooth/detect-output 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::__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
- #__esata__
- #esata/insert
- #esata/storage-test
- #esata/remove
- #__expresscard__
- #expresscard/verification
- #__firewire__
- #firewire/insert
- #firewire/storage-test
- #firewire/remove
- #__floppy__
- #floppy/check
- #floppy/check_fd\d
- # firmware tests
- 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_
- 2013.com.canonical.certification::ethernet/fwts_logs
- 2013.com.canonical.certification::ethernet/fwts_uefirtvariable
- # required by suspend/network_before_suspend
- 2013.com.canonical.certification::__ethernet__
- 2013.com.canonical.certification::ethernet/detect certification-status=blocker
- 2013.com.canonical.certification::ethernet/info_automated
- ## this test cause a unused test case error, but required for cert.
- 2013.com.canonical.certification::__graphics__
- 2013.com.canonical.certification::graphics/generator_.*
- 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/driver_version
- 2013.com.canonical.certification::graphics/1_modes_.*
- 2013.com.canonical.certification::graphics/1_color_depth_.*
- 2013.com.canonical.certification::graphics/1_fresh_rate_.*
- 2013.com.canonical.certification::graphics/1_graphic_memory_.*
- 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_resolution_.*
- 2013.com.canonical.certification::graphics/1_resolution-change_.*
- 2013.com.canonical.certification::graphics/1_screen_resolution_.*
- 2013.com.canonical.certification::graphics/1_unity_support_.*
- 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/1_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/1_screenshot_.*
- 2013.com.canonical.certification::graphics/1_screenshot.jpg_.*
- 2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video_.*
- 2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video.jpg_.*
- 2013.com.canonical.certification::graphics/2_switch_card_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/2_modes_.*
- 2013.com.canonical.certification::graphics/2_color_depth_.*
- 2013.com.canonical.certification::graphics/2_fresh_rate_.*
- 2013.com.canonical.certification::graphics/2_graphic_memory_.*
- 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_resolution_.*
- 2013.com.canonical.certification::graphics/2_resolution-change_.*
- 2013.com.canonical.certification::graphics/2_screen_resolution_.*
- 2013.com.canonical.certification::graphics/2_unity_support_.*
- 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/2_minimum_resolution_.*
- 2013.com.canonical.certification::graphics/2_screenshot_.*
- 2013.com.canonical.certification::graphics/2_screenshot.jpg_.*
- 2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video_.*
- 2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video.jpg_.*
- 2013.com.canonical.certification::graphics/xorg-failsafe certification-status=blocker
- 2013.com.canonical.certification::graphics/display
- 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::__hibernate__
- #See below, power-management/hibernate_advanced
- 2013.com.canonical.certification::__input__
- 2013.com.canonical.certification::input/accelerometer_verify certification-status=non-blocker
- 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_mouse
- 2013.com.canonical.certification::input/pointing_mouse
- #2013.com.canonical.certification::input/clicking_touchpad
- #2013.com.canonical.certification::input/pointing_touchpad
- 2013.com.canonical.certification::__keys__
- 2013.com.canonical.certification::keys/mute certification-status=blocker
- 2013.com.canonical.certification::keys/volume certification-status=blocker
- 2013.com.canonical.certification::keys/brightness certification-status=blocker
- 2013.com.canonical.certification::keys/wireless certification-status=blocker
- 2013.com.canonical.certification::keys/super certification-status=blocker
- 2013.com.canonical.certification::keys/media-control certification-status=blocker
- 2013.com.canonical.certification::keys/video-out certification-status=blocker
- 2013.com.canonical.certification::keys/battery-info certification-status=blocker
- 2013.com.canonical.certification::keys/touchpad
- 2013.com.canonical.certification::keys/microphone-mute certification-status=blocker
- #2013.com.canonical.certification::keys/hibernate
- #2013.com.canonical.certification::keys/keyboard-backlight
- #2013.com.canonical.certification::keys/keyboard-overhead-light
- #2013.com.canonical.certification::keys/lock-screen
- 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
- 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
- #mediacard/cf-insert
- #mediacard/cf-storage
- #mediacard/cf-remove
- #mediacard/msp-insert
- #mediacard/msp-storage
- #mediacard/msp-remove
- #mediacard/xd-insert
- #mediacard/xd-storage
- #mediacard/xd-remove
- 2013.com.canonical.certification::__memory__
- # See Automated Tests section at the end of this file
- #2013.com.canonical.certification::__mobilebroadband__
- #2013.com.canonical.certification::mobilebroadband/gsm_connection
- #2013.com.canonical.certification::mobilebroadband/cdma_connection
- 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::__networking__
- # See Automated Tests section at the end of this file
- #networking/wired_connection
- ## use above test as a reminder to connect ethernet cable
- 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::__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
- #optical/read-automated
- #optical/cdrom-audio-playback
- 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::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::__power-management__
- # See Automated Tests section at the end of this file
- 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/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::__touchpad__
- #2013.com.canonical.certification::touchpad/basic
- #2013.com.canonical.certification::touchpad/drag-and-drop
- #2013.com.canonical.certification::touchpad/horizontal
- #2013.com.canonical.certification::touchpad/vertical
- #2013.com.canonical.certification::touchpad/singletouch-automated
- #2013.com.canonical.certification::touchpad/singletouch-selection
- #2013.com.canonical.certification::touchpad/multitouch-automated
- #2013.com.canonical.certification::touchpad/multitouch-dash
- #2013.com.canonical.certification::touchpad/multitouch-horizontal
- #2013.com.canonical.certification::touchpad/multitouch-manual
- #2013.com.canonical.certification::touchpad/multitouch-rightclick
- #2013.com.canonical.certification::touchpad/multitouch-vertical
- #2013.com.canonical.certification::touchpad/multitouch-zoom
- 2013.com.canonical.certification::__touchscreen__
- 2013.com.canonical.certification::touchscreen/tap-detect
- 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/nontouch-automated certification-status=blocker
- 2013.com.canonical.certification::touchscreen/nontouch-dash
- 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/multitouch-dash certification-status=blocker
- 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/remove certification-status=blocker
- 2013.com.canonical.certification::usb/usb3_read_performance
- 2013.com.canonical.certification::usb/usb3_read_performance_.*
- 2013.com.canonical.certification::__wireless__
- #wireless/wireless_connection
- ## as a reminder for QA to make sure wireless connected
- #led/wlan
- #led/wlan-disabled
- 2013.com.canonical.certification::wireless/wireless_scanning 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::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::__suspend__
- 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
- # Ethernet was not connected here
- 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
- 2013.com.canonical.certification::suspend/suspend_advanced certification-status=blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
- 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::__led__
- 2013.com.canonical.certification::led/power 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::led/wlan
- 2013.com.canonical.certification::led/mute certification-status=blocker
- 2013.com.canonical.certification::led/hdd
- 2013.com.canonical.certification::led/camera certification-status=blocker
- 2013.com.canonical.certification::led/battery-charging
- 2013.com.canonical.certification::led/battery-charged
- #led/battery-low
- #2013.com.canonical.certification::led/microphone
- #2013.com.canonical.certification::led/bluetooth
- 2013.com.canonical.certification::led/numeric-keypad certification-status=blocker
- 2013.com.canonical.certification::led/caps-lock certification-status=blocker
- #2013.com.canonical.certification::led/touchpad
- #2013.com.canonical.certification::led/wireless
- 2013.com.canonical.certification::keys/sleep certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-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
- #mediacard/cf-insert-after-suspend
- #mediacard/cf-storage-after-suspend
- #mediacard/cf-remove-after-suspend
- #mediacard/msp-insert-after-suspend
- #mediacard/msp-storage-after-suspend
- #mediacard/msp-remove-after-suspend
- #mediacard/xd-insert-after-suspend
- #mediacard/xd-storage-after-suspend
- #mediacard/xd-remove-after-suspend
- 2013.com.canonical.certification::suspend/network_after_suspend certification-status=blocker
- # Ethernet was not connected here
- 2013.com.canonical.certification::suspend/audio_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/record_playback_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/generator_display_after_suspend
- 2013.com.canonical.certification::suspend/generator_suspend_after_switch_to_card
- 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
- ##suspend/xrandr_screens_after_suspend.tar.gz
- ## this one depends on cycle_resolutions_after_suspend_auto
- 2013.com.canonical.certification::suspend/keys_after_suspend/mute
- 2013.com.canonical.certification::suspend/keys_after_suspend/volume
- 2013.com.canonical.certification::suspend/keys_after_suspend/brightness
- #2013.com.canonical.certification::suspend/keys_after_suspend/wireless
- 2013.com.canonical.certification::suspend/keys_after_suspend/super
- 2013.com.canonical.certification::suspend/keys_after_suspend/media-control
- 2013.com.canonical.certification::suspend/keys_after_suspend/sleep
- 2013.com.canonical.certification::suspend/keys_after_suspend/video-out
- 2013.com.canonical.certification::suspend/keys_after_suspend/battery-info
- 2013.com.canonical.certification::suspend/keys_after_suspend/touchpad
- 2013.com.canonical.certification::suspend/led_after_suspend/wlan
- 2013.com.canonical.certification::suspend/led_after_suspend/wlan-disabled
- #suspend/led_after_suspend/camera
- #suspend/led_after_suspend/power
- #suspend/led_after_suspend/battery-charging
- #suspend/led_after_suspend/battery-charged
- #suspend/led_after_suspend/battery-low
- #suspend/led_after_suspend/hdd
- #suspend/led_after_suspend/numeric-keypad
- #suspend/led_after_suspend/caps-lock
- #suspend/led_after_suspend/wireless
- #suspend/led_after_suspend/touchpad
- 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/cpu_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/memory_after_suspend certification-status=blocker
- #suspend/gpu_lockup_after_suspend
- ## depends on suspend_advanced_auto, so skip
- # 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_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/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::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
- # 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/1_suspend_after_switch_to_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/1_display_after_suspend.* 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
- 2013.com.canonical.certification::power-management/poweroff-log-attach
- 2013.com.canonical.certification::power-management/reboot
- 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::__install__
- 2013.com.canonical.certification::install/apt-get-gets-updates
- 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
- 2013.com.canonical.certification::benchmarks/disk/hdparm-cache-read_.*
- 2013.com.canonical.certification::benchmarks/graphics/gtkperf
- 2013.com.canonical.certification::benchmarks/graphics/render-bench
- #benchmarks/graphics/qgears2-Xrender-gearsfancy
- #benchmarks/graphics/qgears2-Xrender-compo
- #benchmarks/graphics/qgears2-gl-gearsfancy
- #benchmarks/graphics/qgears2-gl-compo
- #### above 4 qgears2 cases caused serious issue for Watauga2 image, #1095959
- 2013.com.canonical.certification::benchmarks/graphics/glmark2
- 2013.com.canonical.certification::benchmarks/system/cpu_on_idle
- 2013.com.canonical.certification::benchmarks/system/disk_on_idle
- 2013.com.canonical.certification::cpu/scaling_test certification-status=blocker
- 2013.com.canonical.certification::cpu/scaling_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/maxfreq_test 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::graphics/generator_3d_window_open_close
- 2013.com.canonical.certification::graphics/generator_3d_window_move
- 2013.com.canonical.certification::graphics/generator_3d_window_suspend_resume
- 2013.com.canonical.certification::graphics/generator_multi_3d_windows_open_close
- 2013.com.canonical.certification::memory/info certification-status=blocker
- 2013.com.canonical.certification::memory/check certification-status=blocker
- 2013.com.canonical.certification::miscellanea/fwts_test
- 2013.com.canonical.certification::miscellanea/fwts_results.log
- 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
- #miscellanea/sources-list
- #2013.com.canonical.certification::power-management/suspend_30_cycles
- #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
- #2013.com.canonical.certification::power-management/hibernate_30_cycles
- #2013.com.canonical.certification::power-management/hibernate-30-cycles-log-check
- #2013.com.canonical.certification::power-management/hibernate-30-cycle-log-attach
- #2013.com.canonical.certification::__stress__
- #2013.com.canonical.certification::stress/cpu_stress_test
- #stress/reboot
- #stress/reboot_log
- #stress/poweroff
- #stress/poweroff_log
- #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_network_attachment
- 2013.com.canonical.certification::lsusb_attachment
- 2013.com.canonical.certification::meminfo_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::udev_resource_attachment
- 2013.com.canonical.certification::lsmod_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/audio_device_driver
- 2013.com.canonical.certification::info/network_devices
- 2013.com.canonical.certification::info/xrandr
- 2013.com.canonical.certification::info/disk_partitions
- stella
- stella/energy-star-compliant
- stella/energy-star-compliant-NB/suspend-on-AC-power
- stella/energy-star-compliant-NB/suspend-on-battery-power
- stella/hotkeys
- stella/hotkeys/help
- stella/account
- stella/account/switch-to-guest-session
- stella/hp-particular
- stella/hp-particular/hp-documents
- #stella/hp-particular/build_valid_check
- stella/hp-particular/collect_installed_information_client
- stella/third-party-addon
- stella/third-party-addon/Adobe-flash
- stella/third-party-addon/check-mp3-codec-installed
- stella/third-party-addon/check-Hanyi-font-installed
- stella/third-party-addon/Unity-mode-default3d
- #stella/vnb-sourcelist
- #stella/vnb-sourcelist/oem-sp1-repository
- #stella/vnb-sourcelist/oem-sp2-repository
- #stella/vnb-sourcelist/daan-repository
- #stella/cmit-sourcelist
- #stella/cmit-sourcelist/oem-trusty-repository
- #stella/cmit-sourcelist/datong-repository
diff --git a/units/stella-laptop-full.pxu b/units/stella-laptop-full.pxu
index 4825c9b..2ff101c 100644
--- a/units/stella-laptop-full.pxu
+++ b/units/stella-laptop-full.pxu
@@ -3,8 +3,8 @@ _name: Stella Laptop Full
 unit: test plan
 include:
 ## Common Whitelist for OEM projects
- ## Rev 1.2, 2015-05-13
- ## Based on checkbox-ng, checkbox-gui, plainbox, plainbox-provider-checkbox (0.4~dev-bzr3032)
+ ## Rev 1.3, 2015-06-03
+ ## Based on checkbox-ng, checkbox-gui, plainbox, plainbox-provider-checkbox
 # Resource Jobs
 2013.com.canonical.certification::accessibility
 2013.com.canonical.certification::block_device
@@ -42,6 +42,7 @@ include:
 #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
 #audio/alsa_record_playback_usb
@@ -58,8 +59,7 @@ include:
 2013.com.canonical.certification::audio/microphone-plug-detection certification-status=blocker
 #audio/external-linein
 #audio/external-lineout
- 2013.com.canonical.certification::audio/playback_hdmi certification-status=blocker
- 2013.com.canonical.certification::audio/playback_displayport certification-status=blocker
+ # See Monitor / Graphic test section for hybrid-graphic monitor audio tests
 2013.com.canonical.certification::__codecs__
 2013.com.canonical.certification::codecs/ogg-vorbis
 2013.com.canonical.certification::codecs/wav
@@ -67,6 +67,7 @@ include:
 # 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
@@ -104,48 +105,83 @@ include:
 2013.com.canonical.certification::ethernet/detect certification-status=blocker
 2013.com.canonical.certification::ethernet/info_automated
 ## this test cause a unused test case error, but required for cert.
+ 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/1_glxgears_.* certification-status=blocker
 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/driver_version
+ 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/1_minimum_resolution_.*
+ 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
+ # Below are tests that do not appear in Cert-14.04 test plan
 2013.com.canonical.certification::graphics/1_modes_.*
 2013.com.canonical.certification::graphics/1_color_depth_.*
 2013.com.canonical.certification::graphics/1_fresh_rate_.*
 2013.com.canonical.certification::graphics/1_graphic_memory_.*
- 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_resolution_.*
 2013.com.canonical.certification::graphics/1_resolution-change_.*
 2013.com.canonical.certification::graphics/1_screen_resolution_.*
 2013.com.canonical.certification::graphics/1_unity_support_.*
- 2013.com.canonical.certification::graphics/1_maximum_resolution_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/1_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/1_minimum_resolution_.*
 2013.com.canonical.certification::graphics/1_screenshot_.*
 2013.com.canonical.certification::graphics/1_screenshot.jpg_.*
 2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video_.*
 2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video.jpg_.*
+ # Switch to second card (if any)
 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::graphics/2_minimum_resolution_.*
+ 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
+ # Below are tests that do not appear in Cert-14.04 test plan
 2013.com.canonical.certification::graphics/2_modes_.*
 2013.com.canonical.certification::graphics/2_color_depth_.*
 2013.com.canonical.certification::graphics/2_fresh_rate_.*
 2013.com.canonical.certification::graphics/2_graphic_memory_.*
- 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_resolution_.*
 2013.com.canonical.certification::graphics/2_resolution-change_.*
 2013.com.canonical.certification::graphics/2_screen_resolution_.*
 2013.com.canonical.certification::graphics/2_unity_support_.*
- 2013.com.canonical.certification::graphics/2_maximum_resolution_.* certification-status=blocker
- 2013.com.canonical.certification::graphics/2_cycle_resolution_.*
- 2013.com.canonical.certification::graphics/2_minimum_resolution_.*
 2013.com.canonical.certification::graphics/2_screenshot_.*
 2013.com.canonical.certification::graphics/2_screenshot.jpg_.*
 2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video_.*
 2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video.jpg_.*
+ # Monitor tests on second graphic card
+ 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::graphics/xorg-failsafe certification-status=blocker
- 2013.com.canonical.certification::graphics/display
 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::__hibernate__
@@ -199,17 +235,17 @@ include:
 #2013.com.canonical.certification::__mobilebroadband__
 #2013.com.canonical.certification::mobilebroadband/gsm_connection
 #2013.com.canonical.certification::mobilebroadband/cdma_connection
- 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::__networking__
+ # Monitor tests below are not relevant anymore since they are now handled for each graphic cards
+ # 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::__networking__
 # See Automated Tests section at the end of this file
 #networking/wired_connection
 ## use above test as a reminder to connect ethernet cable
@@ -236,6 +272,7 @@ include:
 2013.com.canonical.certification::optical/dvd-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/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
@@ -293,22 +330,53 @@ include:
 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::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
 2013.com.canonical.certification::suspend/network_before_suspend certification-status=blocker
 # Ethernet was not connected here
- 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_.*
+ 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::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::suspend/suspend_advanced certification-status=blocker
- 2013.com.canonical.certification::suspend/suspend-single-log-check
 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/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
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 2013.com.canonical.certification::__led__
 2013.com.canonical.certification::led/power certification-status=blocker
 2013.com.canonical.certification::led/power-blink-suspend certification-status=blocker
@@ -349,8 +417,6 @@ include:
 # Ethernet was not connected here
 2013.com.canonical.certification::suspend/audio_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/record_playback_after_suspend certification-status=blocker
- 2013.com.canonical.certification::suspend/generator_display_after_suspend
- 2013.com.canonical.certification::suspend/generator_suspend_after_switch_to_card
 2013.com.canonical.certification::suspend/resolution_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/cycle_resolutions_after_suspend certification-status=blocker
 ##suspend/xrandr_screens_after_suspend.tar.gz
@@ -400,12 +466,6 @@ include:
 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
- # 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/1_suspend_after_switch_to_card_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/1_display_after_suspend.* 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.
@@ -455,8 +515,6 @@ include:
 2013.com.canonical.certification::miscellanea/fwts_test
 2013.com.canonical.certification::miscellanea/fwts_results.log
 2013.com.canonical.certification::miscellanea/oops certification-status=blocker
- 2013.com.canonical.certification::suspend/hybrid_sleep certification-status=non-blocker
- 2013.com.canonical.certification::suspend/hybrid-sleep-single-log-attach
 #miscellanea/sources-list
 #2013.com.canonical.certification::power-management/suspend_30_cycles
 #2013.com.canonical.certification::power-management/suspend-30-cycles-log-check
@@ -489,11 +547,17 @@ include:
 2013.com.canonical.certification::sysfs_attachment
 2013.com.canonical.certification::udev_attachment
 2013.com.canonical.certification::udev_resource_attachment
+ 2013.com.canonical.certification::recovery_info_attachment
 2013.com.canonical.certification::lsmod_attachment
 2013.com.canonical.certification::acpi_sleep_attachment
+ 2013.com.canonical.certification::lspci_standard_config_attachment
+ 2013.com.canonical.certification::kernel_cmdline_attachment
+ 2013.com.canonical.certification::modinfo_attachment
+ 2013.com.canonical.certification::dkms_info_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/buildstamp
 2013.com.canonical.certification::info/touchpad_driver
 2013.com.canonical.certification::info/audio_device_driver
 2013.com.canonical.certification::info/network_devices