Checkbox

Merge lp:~brendan-donegan/checkbox/bug1089227 into lp:checkbox

  1. bug1089227
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 1846
Merged at revision: 1846
Proposed branch: lp:~brendan-donegan/checkbox/bug1089227
Merge into: lp:checkbox
Diff against target: 223 lines (+26/-22)
2 files modified
debian/changelog (+3/-0)
jobs/suspend.txt.in (+23/-22)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1089227
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+139419@code.launchpad.net

Description of the change

Lots of led_after_suspend and key_after_suspend tests were added at one point, but they were mistakenly made to depend on suspend_advanced_auto, which is only for use in whitelists that are fully automated. Manual or semi-manual whitelist should use suspend/suspend_advanced and since the LED and key tests are themselves manual, they should depend on that. One test was also missing a dependency altogether.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Makes sense, thanks +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-12-11 18:16:13 +0000
+++ debian/changelog 2012-12-12 09:56:22 +0000
@@ -14,6 +14,9 @@
14 or other artifacts.14 or other artifacts.
15 * jobs/info.txt.in - add an xrandr attachment job to provide information15 * jobs/info.txt.in - add an xrandr attachment job to provide information
16 about displays connected to the system (LP: #1085219)16 about displays connected to the system (LP: #1085219)
17 * jobs/suspend.txt.in - changed suspend_advanced_auto dependency of key_after_suspend
18 and led_after_suspend tests to suspend/suspend_advanced, since they are manual and
19 should depend on the manual suspend test (LP: #1089227)
1720
18 [ Jeff Lane ]21 [ Jeff Lane ]
19 * jobs/suspend.txt.in - removed incorrect multiple router requirement for22 * jobs/suspend.txt.in - removed incorrect multiple router requirement for
2023
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in 2012-11-21 17:47:17 +0000
+++ jobs/suspend.txt.in 2012-12-12 09:56:22 +0000
@@ -641,7 +641,7 @@
641641
642plugin: manual642plugin: manual
643name: suspend/led_after_suspend/power643name: suspend/led_after_suspend/power
644depends: suspend/suspend_advanced_auto644depends: suspend/suspend_advanced
645_description:645_description:
646 PURPOSE:646 PURPOSE:
647 Validate that the power LED operated the same after resuming from suspend647 Validate that the power LED operated the same after resuming from suspend
@@ -652,7 +652,7 @@
652652
653plugin: manual653plugin: manual
654name: suspend/led_after_suspend/battery-charging654name: suspend/led_after_suspend/battery-charging
655depends: suspend/suspend_advanced_auto655depends: suspend/suspend_advanced
656_description:656_description:
657 PURPOSE:657 PURPOSE:
658 Validate that the battery light shows charging status after resuming from suspend658 Validate that the battery light shows charging status after resuming from suspend
@@ -664,7 +664,7 @@
664664
665plugin: manual665plugin: manual
666name: suspend/led_after_suspend/battery-charged666name: suspend/led_after_suspend/battery-charged
667depends: suspend/suspend_advanced_auto667depends: suspend/suspend_advanced
668_description:668_description:
669 PURPOSE:669 PURPOSE:
670 Validate that the battery LED properly displays charged status after resuming from suspend670 Validate that the battery LED properly displays charged status after resuming from suspend
@@ -677,6 +677,7 @@
677677
678plugin: manual678plugin: manual
679name: suspend/led_after_suspend/battery-low679name: suspend/led_after_suspend/battery-low
680depends: suspend/suspend_advanced
680_description:681_description:
681 PURPOSE:682 PURPOSE:
682 Validate that the battery LED indicated low power after resuming from suspend683 Validate that the battery LED indicated low power after resuming from suspend
@@ -688,7 +689,7 @@
688689
689plugin: manual690plugin: manual
690name: suspend/led_after_suspend/hdd691name: suspend/led_after_suspend/hdd
691depends: suspend/suspend_advanced_auto692depends: suspend/suspend_advanced
692command: led_hdd_test693command: led_hdd_test
693_description:694_description:
694 PURPOSE:695 PURPOSE:
@@ -701,7 +702,7 @@
701702
702plugin: manual703plugin: manual
703name: suspend/led_after_suspend/numeric-keypad704name: suspend/led_after_suspend/numeric-keypad
704depends: suspend/suspend_advanced_auto705depends: suspend/suspend_advanced
705command: keyboard_test706command: keyboard_test
706_description:707_description:
707 PURPOSE:708 PURPOSE:
@@ -716,7 +717,7 @@
716717
717plugin: manual718plugin: manual
718name: suspend/led_after_suspend/caps-lock719name: suspend/led_after_suspend/caps-lock
719depends: suspend/suspend_advanced_auto720depends: suspend/suspend_advanced
720_description:721_description:
721 PURPOSE:722 PURPOSE:
722 Validate that the Caps Lock key operates the same before and after resuming from suspend723 Validate that the Caps Lock key operates the same before and after resuming from suspend
@@ -728,7 +729,7 @@
728729
729plugin: manual730plugin: manual
730name: suspend/led_after_suspend/wlan731name: suspend/led_after_suspend/wlan
731depends: suspend/suspend_advanced_auto732depends: suspend/suspend_advanced
732_description:733_description:
733 PURPOSE:734 PURPOSE:
734 WLAN LED verification after resuming from suspend735 WLAN LED verification after resuming from suspend
@@ -742,7 +743,7 @@
742743
743plugin: manual744plugin: manual
744name: suspend/led_after_suspend/wlan-disabled745name: suspend/led_after_suspend/wlan-disabled
745depends: suspend/suspend_advanced_auto746depends: suspend/suspend_advanced
746_description:747_description:
747 PURPOSE:748 PURPOSE:
748 Validate that WLAN LED shuts off when disabled after resuming from suspend749 Validate that WLAN LED shuts off when disabled after resuming from suspend
@@ -756,7 +757,7 @@
756757
757plugin: manual758plugin: manual
758name: suspend/led_after_suspend/bluetooth759name: suspend/led_after_suspend/bluetooth
759depends: suspend/suspend_advanced_auto760depends: suspend/suspend_advanced
760_description:761_description:
761 PURPOSE:762 PURPOSE:
762 Validate that the Bluetooth LED turns on and off when BT is enabled/disabled after resuming from suspend763 Validate that the Bluetooth LED turns on and off when BT is enabled/disabled after resuming from suspend
@@ -772,7 +773,7 @@
772name: suspend/led_after_suspend/camera773name: suspend/led_after_suspend/camera
773depends:774depends:
774 camera/detect775 camera/detect
775 suspend/suspend_advanced_auto776 suspend/suspend_advanced
776command: camera_test led777command: camera_test led
777_description:778_description:
778 PURPOSE:779 PURPOSE:
@@ -785,7 +786,7 @@
785786
786plugin: manual787plugin: manual
787name: suspend/led_after_suspend/touchpad788name: suspend/led_after_suspend/touchpad
788depends: suspend/suspend_advanced_auto789depends: suspend/suspend_advanced
789_description:790_description:
790 PURPOSE:791 PURPOSE:
791 Touchpad LED verification after resuming from suspend792 Touchpad LED verification after resuming from suspend
@@ -799,7 +800,7 @@
799800
800plugin: manual801plugin: manual
801name: suspend/led_after_suspend/wireless802name: suspend/led_after_suspend/wireless
802depends: suspend/suspend_advanced_auto803depends: suspend/suspend_advanced
803_description:804_description:
804 PURPOSE:805 PURPOSE:
805 Validate Wireless (WLAN + Bluetooth) LED operated the same after resuming from suspend806 Validate Wireless (WLAN + Bluetooth) LED operated the same after resuming from suspend
@@ -815,7 +816,7 @@
815816
816plugin: manual817plugin: manual
817name: suspend/keys_after_suspend/brightness818name: suspend/keys_after_suspend/brightness
818depends: suspend/suspend_advanced_auto819depends: suspend/suspend_advanced
819requires: dmi.product in ['Notebook','Laptop','Portable']820requires: dmi.product in ['Notebook','Laptop','Portable']
820_description:821_description:
821 PURPOSE:822 PURPOSE:
@@ -827,7 +828,7 @@
827828
828plugin: manual829plugin: manual
829name: suspend/keys_after_suspend/volume830name: suspend/keys_after_suspend/volume
830depends: suspend/suspend_advanced_auto831depends: suspend/suspend_advanced
831requires:832requires:
832 device.category == 'KEYBOARD'833 device.category == 'KEYBOARD'
833user: root834user: root
@@ -844,7 +845,7 @@
844845
845plugin: manual846plugin: manual
846name: suspend/keys_after_suspend/mute847name: suspend/keys_after_suspend/mute
847depends: suspend/suspend_advanced_auto848depends: suspend/suspend_advanced
848requires:849requires:
849 device.category == 'KEYBOARD'850 device.category == 'KEYBOARD'
850user: root851user: root
@@ -860,7 +861,7 @@
860861
861plugin: manual862plugin: manual
862name: suspend/keys_after_suspend/sleep863name: suspend/keys_after_suspend/sleep
863depends: suspend/suspend_advanced_auto864depends: suspend/suspend_advanced
864requires:865requires:
865 device.category == 'KEYBOARD'866 device.category == 'KEYBOARD'
866_description:867_description:
@@ -874,7 +875,7 @@
874875
875plugin: manual876plugin: manual
876name: suspend/keys_after_suspend/battery-info877name: suspend/keys_after_suspend/battery-info
877depends: suspend/suspend_advanced_auto878depends: suspend/suspend_advanced
878requires: dmi.product in ['Notebook','Laptop','Portable']879requires: dmi.product in ['Notebook','Laptop','Portable']
879user: root880user: root
880command: key_test -s '0xe071,0xef1:Battery Info'881command: key_test -s '0xe071,0xef1:Battery Info'
@@ -891,7 +892,7 @@
891892
892plugin: manual893plugin: manual
893name: suspend/keys_after_suspend/wireless894name: suspend/keys_after_suspend/wireless
894depends: suspend/suspend_advanced_auto895depends: suspend/suspend_advanced
895requires: dmi.product in ['Notebook','Laptop','Portable']896requires: dmi.product in ['Notebook','Laptop','Portable']
896_description:897_description:
897 PURPOSE:898 PURPOSE:
@@ -904,7 +905,7 @@
904905
905plugin: manual906plugin: manual
906name: suspend/keys_after_suspend/media-control907name: suspend/keys_after_suspend/media-control
907depends: suspend/suspend_advanced_auto908depends: suspend/suspend_advanced
908requires:909requires:
909 device.category == 'KEYBOARD'910 device.category == 'KEYBOARD'
910user: root911user: root
@@ -921,7 +922,7 @@
921922
922plugin: manual923plugin: manual
923name: suspend/keys_after_suspend/super924name: suspend/keys_after_suspend/super
924depends: suspend/suspend_advanced_auto925depends: suspend/suspend_advanced
925requires:926requires:
926 device.category == 'KEYBOARD'927 device.category == 'KEYBOARD'
927user: root928user: root
@@ -937,7 +938,7 @@
937938
938plugin: manual939plugin: manual
939name: suspend/keys_after_suspend/video-out940name: suspend/keys_after_suspend/video-out
940depends: suspend/suspend_advanced_auto941depends: suspend/suspend_advanced
941requires: dmi.product in ['Notebook','Laptop','Portable']942requires: dmi.product in ['Notebook','Laptop','Portable']
942_description:943_description:
943 PURPOSE:944 PURPOSE:
@@ -950,7 +951,7 @@
950951
951plugin: manual952plugin: manual
952name: suspend/keys_after_suspend/touchpad953name: suspend/keys_after_suspend/touchpad
953depends: suspend/suspend_advanced_auto954depends: suspend/suspend_advanced
954requires: dmi.product in ['Notebook','Laptop','Portable']955requires: dmi.product in ['Notebook','Laptop','Portable']
955_description:956_description:
956 PURPOSE:957 PURPOSE:

Subscribers

People subscribed via source and target branches