Merge lp:~roadmr/checkbox/1217937-gpu-test-calledprocesserror into lp:checkbox

[Daniel Manrique]

Fix gpu_test failing with an exception if wmctrl returns failure. I'm not 100% sure the behavior once we catch the exception is correct, but at least this avoids the nasty trace.

Fix gpu_test failing with an exception if wmctrl returns failure. I'm not 100% sure the behavior once we catch the exception is correct, but at least this avoids the nasty trace.

[lp:~roadmr/checkbox/1217937-gpu-test-calledprocesserror]

2326. By Daniel Manrique on 2013-08-29

"Fixes a bug where logs were compressed in an incorrect directory, causing attachment to fail. Jeffrey Chang fixed this really. [r=bladernr][bug=1218186][author=roadmr]"

2327. By Jeff Marcom on 2013-08-30

"automatic merge by tarmac [r=zkrynicki][bug=][author=jeffmarcom]"

[Zygmunt Krynicki (zyga)]

please rebase

review: Needs Fixing

[lp:~roadmr/checkbox/1217937-gpu-test-calledprocesserror]

2328. By Jeff Lane  on 2013-08-30

"scripts/storage test now checks to make sure there's enough free disk space before running bonnie++ and adjusts bonnie++ parameters accordingly if there is not enough free disk space. This avoids a bug causing false failures on systems with small disk drives. [r=zkrynicki][bug=1217268][author=bladernr]"

2329. By Daniel Manrique on 2013-08-30

"The linked bug is about a test failing because it's comparing xinput lists from before and after booting, and even though the devices may be the same, they are in different orders, so the comparison fails.The fix is simply to sort xinput output to ensure valid comparisons. [r=zkrynicki][bug=1218188][author=roadmr]"

2330. By Zygmunt Krynicki on 2013-08-30

"automatic merge by tarmac [r=roadmr][bug=][author=zkrynicki]"

2331. By Zygmunt Krynicki on 2013-08-30

"automatic merge by tarmac [r=zkrynicki][bug=][author=zkrynicki]"

2332. By Daniel Manrique on 2013-08-30

scripts/gpu_test: Catch CalledProcessError when calling wmctrl, to avoid crashes that cause the test to hang (LP: #1217937)

[Daniel Manrique (roadmr)]

Rebased to fix the changelog conflict

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-08-30 12:39:32 +0000
+++ checkbox-old/debian/changelog	2013-08-30 14:55:16 +0000
@@ -23,6 +23,10 @@
   * checkbox-old/scripts/fwts_test: Added the following new tests:
     method, msr, aspm, klog, oops and uefirtvariable (LP: #1202493)
 
+  [ Daniel Manrique ]
+  * scripts/gpu_test: Catch CalledProcessError when calling wmctrl, to avoid
+    crashes that cause the test to hang (LP: #1217937)
+
  -- Brendan Donegan <[e-mail]>  Fri, 23 Aug 2013 14:22:13 +0100
 
 checkbox (0.16.9) saucy; urgency=low

=== modified file 'checkbox-old/scripts/gpu_test'
--- checkbox-old/scripts/gpu_test	2013-08-15 13:47:30 +0000
+++ checkbox-old/scripts/gpu_test	2013-08-30 14:55:16 +0000
@@ -155,9 +155,13 @@
         GlxWindows.append(GlxThread())
         GlxWindows[i].start()
         time.sleep(5)
-        windows = subprocess.check_output(
-            'wmctrl -l | grep glxgears',
-            shell=True)
+        try:
+            windows = subprocess.check_output(
+                        'wmctrl -l | grep glxgears',
+                        shell=True)
+        except subprocess.CalledProcessError as er:
+            print("WARNING: Got an exception %s" % er)
+            windows = ""
         for app in sorted(windows.splitlines(), reverse=True):
             if not b'glxgears' in app:
                 continue