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

[Brendan Donegan]

As mentioned in the bug, the text of the test is slightly confusing when it passes. This is just a minor tweak to clarify it.

[lp:~brendan-donegan/checkbox/bug1065976]

1783. By Brendan Donegan on 2012-10-18

Use the word display instead of monitor.

[Marc Tardif (cr3)]

I love it, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-17 19:23:51 +0000
+++ debian/changelog	2012-10-18 09:49:24 +0000
@@ -10,6 +10,8 @@
   * checkbox/lib/templates.py, jobs/resources.txt.in, jobs/wireless.txt.in,
     jobs/suspend.txt.in - Don't try and coerce keys of resource jobs to
     lowercase, as it upset the core of Checkbox (LP: #1067280)
+  * scripts/resolution_test - Slightly clarify output of script so that it's
+    a bit more obvious why it failed (LP: #1065976)
 
   [Daniel Manrique]
   * [FEATURE] checkbox/job.py: Fixed intltool warning about unnamed

=== modified file 'scripts/resolution_test'
--- scripts/resolution_test	2012-07-23 11:39:10 +0000
+++ scripts/resolution_test	2012-10-18 09:49:24 +0000
@@ -20,8 +20,8 @@
     # Evaluate just the primary display
     screen = Gdk.Screen.get_default()
     geom = screen.get_monitor_geometry(screen.get_primary_monitor())
-    print("Expected monitor dimensions: %d x %d" % (min_h, min_v))
-    print("Detected monitor dimensions: %d x %d" % (geom.width, geom.height))
+    print("Minimum acceptable display resolution: %d x %d" % (min_h, min_v))
+    print("Detected display resolution: %d x %d" % (geom.width, geom.height))
     return geom.width >= min_h and geom.height >= min_v