4 files changed, 134 insertions, 57 deletions
diff --git a/units/stella-laptop-full.pxu b/units/stella-full.pxu
index 2ff101c..a027fa2 100644
--- a/units/stella-laptop-full.pxu
+++ b/units/stella-full.pxu
@@ -1,5 +1,5 @@
-id: stella-laptop-full
-_name: Stella Laptop Full
+id: stella-full
+_name: Stella Full
 unit: test plan
 include:
 ## Common Whitelist for OEM projects
@@ -60,9 +60,9 @@ include:
 #audio/external-linein
 #audio/external-lineout
 # 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
+ #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__
@@ -417,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/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
diff --git a/units/stella-graphics.pxu b/units/stella-graphics.pxu
index af2f4f2..7eb62b9 100644
--- a/units/stella-graphics.pxu
+++ b/units/stella-graphics.pxu
@@ -3,7 +3,7 @@ _name: Stella Graphics
 unit: test plan
 include:
 ## Common Graphics Whitelist for OEM projects
- ## Rev 1.3, 2013-05-10
+ ## Rev 1.4, 2015-06-03
 ## Based on checkbox 0.16, checkbox-certification 0.16 checkbox-oem 0.46
 ## http://bit.ly/V8uMmF
 # Resource Jobs
@@ -31,6 +31,7 @@ include:
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::usb
 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
@@ -38,67 +39,88 @@ include:
 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::__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_.*
- 2013.com.canonical.certification::graphics/2__switch_card_.*
+ # 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
- __keys__
- #keys/brightness
- 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
- #monitor/rca
- #monitor/svideo
- 2013.com.canonical.certification::monitor/vga certification-status=blocker
- #monitor/multi-head
- 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
- #keys/video-out
 2013.com.canonical.certification::__power-management__
+ 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
@@ -108,17 +130,45 @@ include:
 #power-management/hibernate-single-log-check
 #power-management/hibernate-single-log-attach
 2013.com.canonical.certification::__suspend__
+ 2013.com.canonical.certification::suspend/generator_.*
+ # 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
 #power-management/lid_open
 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/suspend-single-log-attach
- #suspend/display_after_suspend
+ 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/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
+ 2013.com.canonical.certification::suspend/xrandr_screens_after_suspend.tar.gz
 #suspend/keys_after_suspend/brightness
 #suspend/keys_after_suspend/video-out
 # The following tests should run BEFORE the automated tests. The reboot and
@@ -191,11 +241,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
diff --git a/units/stella-regression.pxu b/units/stella-regression.pxu
index 3cbbbbd..b1eeff9 100644
--- a/units/stella-regression.pxu
+++ b/units/stella-regression.pxu
@@ -21,23 +21,6 @@ include:
 2013.com.canonical.certification::sleep
 2013.com.canonical.certification::uname
 2013.com.canonical.certification::xinput
- #File Attachment Jobs
- 2013.com.canonical.certification::__info__
- 2013.com.canonical.certification::acpi_sleep_attachment
- 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::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::lsmod_attachment
 #SRU-based Test Suite Jobs
 2013.com.canonical.certification::__audio__
 2013.com.canonical.certification::audio/alsa_record_playback_automated certification-status=blocker
@@ -122,3 +105,37 @@ include:
 2013.com.canonical.certification::suspend/gpu_lockup_after_suspend
 #2013.com.canonical.certification::suspend/screenshot_after_suspend
 #2013.com.canonical.certification::screenshot_after_suspend.jpg
+ #File 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::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
+ 2013.com.canonical.certification::info/xrandr
+ 2013.com.canonical.certification::info/disk_partitions
diff --git a/units/stella-wireless.pxu b/units/stella-wireless.pxu
index ccaf01b..7b24cc1 100644
--- a/units/stella-wireless.pxu
+++ b/units/stella-wireless.pxu
@@ -137,11 +137,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