Merge lp:~sylvain-pineau/checkbox/fix-1447466 into lp:checkbox

[Sylvain Pineau]

A fix for the linked bug (to escape subshell commands in the generator job)

[Maciej Kisielewski (kissiel)]

Nice inline python :)
+1

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/jobs/graphics.txt.in'
--- providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2015-04-16 14:23:08 +0000
+++ providers/plainbox-provider-checkbox/jobs/graphics.txt.in	2015-04-24 10:16:09 +0000
@@ -146,8 +146,8 @@
   device.category == 'VIDEO'
   package.name == 'zenity'
  command: 
-    maxi="$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print $1}')"
-    now="$(xdpyinfo | grep dimension | awk '{print $2}')"
+    maxi="\$(xrandr -q |grep -A 1 "connected\( primary\)* [0-9]" |tail -1 |awk '{print \$1}')"
+    now="\$(python3 -c 'from gi.repository import Gdk; screen=Gdk.Screen.get_default(); geo = screen.get_monitor_geometry(screen.get_primary_monitor()); print(geo.width, "x", geo.height, sep="")')"
     test "\$maxi" != "\$now" && notify="\nPlease switch to the maximum resolution \nfor every graphic tests"
     zenity --info --text "Maximum resolution: \$maxi\nCurrent resolution: \$now \$notify"
  estimated_duration: 10.0