Merge lp:~bladernr/checkbox/1071605-cycle-resolutions-after-suspend-auto-fix into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1832
Proposed branch: lp:~bladernr/checkbox/1071605-cycle-resolutions-after-suspend-auto-fix
Merge into: lp:checkbox
Diff against target: 26 lines (+4/-1)
2 files modified
debian/changelog (+3/-0)
jobs/suspend.txt.in (+1/-1)
To merge this branch: bzr merge lp:~bladernr/checkbox/1071605-cycle-resolutions-after-suspend-auto-fix
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+134611@code.launchpad.net

Description of the change

modified the job so that suspend/cycle_resolutions_after_suspend_auto depends on suspend_advanced_auto rather than suspend_advanced like it did.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Nice, thanks! Merging!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-15 15:50:36 +0000
3+++ debian/changelog 2012-11-16 05:03:22 +0000
4@@ -147,6 +147,9 @@
5 (LP: #1014813)
6 * scripts/alsa_info - updated script to latest version available
7 (LP: #1078837)
8+ * jobs/suspend.txt.in - fixed cycle_resolutions_after_suspend_auto so that it
9+ properly depends on suspend_advanced_auto rather than suspend_advanced
10+ (LP: #1071605)
11
12 -- Jeff Lane <jeff@ubuntu.com> Thu, 15 Nov 2012 10:50:03 -0500
13
14
15=== modified file 'jobs/suspend.txt.in'
16--- jobs/suspend.txt.in 2012-11-08 15:37:30 +0000
17+++ jobs/suspend.txt.in 2012-11-16 05:03:22 +0000
18@@ -551,7 +551,7 @@
19 plugin: shell
20 name: suspend/cycle_resolutions_after_suspend_auto
21 requires: package.name == 'xorg'
22-depends: suspend/suspend_advanced graphics/cycle_resolution
23+depends: suspend/suspend_advanced_auto graphics/cycle_resolution
24 _description:
25 This test will check to make sure supported video modes work after a suspend and resume.
26 This is done automatically by taking screenshots and uploading them as an attachment.

Subscribers

People subscribed via source and target branches