Merge lp:~roadmr/checkbox/1232232-gpu-test-fixes into lp:checkbox

[Daniel Manrique]

scripts/gpu_test: Better validation that glxgears windows were found.

This is to avoid manipulation of nonexisting windows which causes
threads to crash and the entire program to stall.

scripts/gpu_test: Better validation that glxgears windows were found.

This is to avoid manipulation of nonexisting windows which causes
threads to crash and the entire program to stall.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-09-20 15:34:47 +0000
+++ checkbox-old/debian/changelog	2013-09-27 20:39:01 +0000
@@ -1,7 +1,13 @@
 checkbox (0.16.12) UNRELEASED; urgency=low
 
+  [ Brendan Donegan ]
   * Incremented changelog
 
+  [ Daniel Manrique ]
+  * scripts/gpu_test: Better validation that glxgears windows were found, to
+    avoid manipulation of nonexisting windows which causes threads to crash
+    and the entire program to stall. (LP: #1232232)
+
  -- Brendan Donegan <[e-mail]>  Fri, 20 Sep 2013 16:10:13 +0100
 
 checkbox (0.16.11) saucy; urgency=low

=== modified file 'checkbox-old/scripts/gpu_test'
--- checkbox-old/scripts/gpu_test	2013-08-30 14:54:37 +0000
+++ checkbox-old/scripts/gpu_test	2013-09-27 20:39:01 +0000
@@ -46,7 +46,11 @@
             shell=True)
 
     def terminate(self):
-        subprocess.call('wmctrl -i -c %s' % self.id, shell=True)
+        if hasattr(self, 'id'):
+            subprocess.call('wmctrl -i -c %s' % self.id, shell=True)
+        else:
+            print("WARNING: Attempted to terminate non-existing window.")
+
 
 
 class RotateGlxThread(Thread):
@@ -168,8 +172,11 @@
             GlxWindows[i].id = str(
                 re.match(b'^(0x\w+)', app).group(0), 'utf-8')
             break
-        GlxRotate.append(RotateGlxThread(GlxWindows[i].id, i + 1))
-        GlxRotate[i].start()
+        if hasattr(GlxWindows[i], "id"):
+            GlxRotate.append(RotateGlxThread(GlxWindows[i].id, i + 1))
+            GlxRotate[i].start()
+        else:
+            print("WARNING: Window {} not found, not rotating it.".format(i))
 
     hsize = vsize = 2
     hsize_ori = vsize_ori = None
@@ -199,8 +206,9 @@
 
     time.sleep(35)
 
-    for i in range(2):
+    for i in range(len(GlxRotate)):
         GlxRotate[i].cancel = True
+    for i in range(len(GlxWindows)):
         GlxWindows[i].terminate()
     DesktopSwitch.cancel = True
     time.sleep(10)