Merge lp:~sylvain-pineau/checkbox/gpu_test_raring into lp:checkbox

[Sylvain Pineau]

scripts/gpu_test: Raring version

scripts/gpu_test: Raring version

Remove the need of running the script with the root user,
Restore the workspaces switch and the HTML5 video playback
Remove the extra suspend/resume

[Daniel Manrique (roadmr)]

Looks good and works as advertised. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-30 14:37:48 +0000
+++ debian/changelog	2013-05-01 08:07:31 +0000
@@ -5,6 +5,11 @@
     a bug on ARM. Modified output so most of it is redirected to stderr for
     fail cases, we don't need that much for success cases. (LP: #1078897) 
 
+  [ Sylvain Pineau ]
+  * jobs/suspend.txt.in, scripts/gpu_test: Remove the need of running the script
+    with the root user, restore the workspaces switch and the HTML5 video
+    playback ; remove the extra suspend/resume (LP: #1172851)
+
  -- Brendan Donegan <[e-mail]>  Fri, 26 Apr 2013 18:23:03 +0100
 
 checkbox (0.16) raring; urgency=low
 
=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2013-04-24 17:17:25 +0000
+++ jobs/suspend.txt.in	2013-05-01 08:07:31 +0000
@@ -851,21 +851,17 @@
 plugin: shell
 name: suspend/gpu_lockup_after_suspend
 requires:
- package.name == 'fwts'
  package.name == 'wmctrl'
  package.name == 'mesa-utils'
 depends: suspend/suspend_advanced_auto
-user: root
 command: gpu_test
 _description:
  PURPOSE:
-     Do some challenging operations, suspend the system, do more challenging
-     operations - then check for lockup on the GPU
+     Do some challenging operations then check for lockup on the GPU
  STEPS:
      1. Create 2 glxgears windows and move them quickly
-     2. Switch workspaces/viewports with wmctrl
+     2. Switch workspaces with wmctrl
      3. Launch an HTML5 video playback in firefox
-     4. Suspend/resume
  VERIFICATION:
      After a 60s workload, check kern.log for reported GPU errors
 
 
=== modified file 'scripts/gpu_test'
--- scripts/gpu_test	2012-08-24 07:30:14 +0000
+++ scripts/gpu_test	2013-05-01 08:07:31 +0000
@@ -1,12 +1,36 @@
 #!/usr/bin/python3
-
+# Copyright 2013 Canonical Ltd.
+# Written by:
+#   Sylvain Pineau <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Script checking gpu lockups.
+
+Several threads are started to exercise the GPU in ways that can cause gpu
+lockups.
+Inspired by the workload directory of the xdiagnose package.
+"""
+
+import os
 import re
-import os
+import subprocess
 import sys
 import time
-import subprocess
+from gi.repository import Gio
+from math import cos, sin
 from threading import Thread
-from math import cos, sin
 
 
 class GlxThread(Thread):
@@ -44,7 +68,8 @@
                 coords = "%s,%s" % (x, y)
                 subprocess.call(
                     'wmctrl -i -r %s -e 0,%s,-1,-1' % (self.id, coords),
-                    shell=True)
+                    shell=True
+                )
                 time.sleep(0.002 * self.offset)
                 if self.cancel:
                     return
@@ -55,27 +80,6 @@
     Start a thread performing fast workspace switches
     """
 
-    def __init__(self, size):
-        Thread.__init__(self)
-        self.size = size
-        self.cancel = False
-
-    def run(self):
-        while(1):
-            for i in range(self.size):
-                subprocess.call('wmctrl -s %s' % i, shell=True)
-                time.sleep(0.5)
-                if self.cancel:
-                    # Switch back to workspace #1
-                    subprocess.call('wmctrl -s 0', shell=True)
-                    return
-
-
-class ChangeViewport(Thread):
-    """
-    Start a thread performing fast viewport switches
-    """
-
     def __init__(self, hsize, vsize, xsize, ysize):
         Thread.__init__(self)
         self.hsize = hsize
@@ -93,7 +97,7 @@
                         shell=True)
                     time.sleep(0.5)
                     if self.cancel:
-                        # Switch back to viewport #1
+                        # Switch back to workspace #1
                         subprocess.call('wmctrl -o 0,0', shell=True)
                         return
 
@@ -104,48 +108,31 @@
     """
 
     def run(self):
-        html5_path = os.path.join(os.getenv('CHECKBOX_SHARE', 'data/websites/html5_video.html'))
+        html5_path = os.path.join(
+            os.getenv('CHECKBOX_SHARE'),
+            'data/websites/html5_video.html')
         subprocess.call(
-            'sudo -H -u %s xdg-open %s' % (os.getenv('SUDO_USER'), html5_path),
+            'xdg-open %s' % html5_path,
             stdout=open(os.devnull, 'w'),
             stderr=subprocess.STDOUT,
             shell=True)
 
     def terminate(self):
-        subprocess.call('wmctrl -c firefox', shell=True)
-
-
-def pidof(name):
-    for pid in os.listdir("/proc"):
-        if not pid.isdigit():
-            continue
-        try:
-            exe = os.readlink(os.path.join("/proc", pid, "exe"))
-        except OSError:
-            continue
-        if os.path.basename(exe) == name:
-            return int(pid)
-    return 0
-
-
-def is_unity_2d_running():
-    return pidof("unity-2d-panel") > 0
-
-
-def check_gpu():
-    f = open('/var/log/kern.log', 'r')
-    with f:
+            subprocess.call("pkill firefox", shell=True)
+
+
+def check_gpu(log=None):
+    if not log:
+        log = '/var/log/kern.log'
+    with open(log, 'r') as f:
         if re.findall(r'gpu\s+hung', f.read(), flags=re.I):
             print("GPU hung Detected")
-            sys.exit(1)
+            return 1
 
 
 def main():
-    if not (os.geteuid() == 0):
-        print("Must be run as root.")
+    if check_gpu():
         return 1
-
-    check_gpu()
     GlxWindows = []
     GlxRotate = []
     subprocess.call("pkill 'glxgears|firefox'", shell=True)
@@ -153,6 +140,8 @@
     Html5Video = Html5VideoThread()
     Html5Video.start()
 
+    source = Gio.SettingsSchemaSource.get_default()
+
     for i in range(2):
         GlxWindows.append(GlxThread())
         GlxWindows[i].start()
@@ -169,28 +158,33 @@
         GlxRotate.append(RotateGlxThread(GlxWindows[i].id, i + 1))
         GlxRotate[i].start()
 
-    if is_unity_2d_running():
-        size = int(subprocess.check_output(
-            'gconftool --get /apps/metacity/general/num_workspaces',
-            shell=True))
-        DesktopSwitch = ChangeWorkspace(size)
+    hsize = vsize = 2
+    hsize_ori = vsize_ori = None
+    if source.lookup("org.compiz.core", True):
+        settings = Gio.Settings(
+            "org.compiz.core",
+            "/org/compiz/profiles/unity/plugins/core/"
+        )
+        hsize_ori = settings.get_int("hsize")
+        vsize_ori = settings.get_int("vsize")
+        settings.set_int("hsize", hsize)
+        settings.set_int("vsize", vsize)
+        time.sleep(5)
     else:
-        (x_res, y_res) = re.search(b'DG:\s+(\d+)x(\d+)',
-            subprocess.check_output('wmctrl -d', shell=True)).groups()
         hsize = int(subprocess.check_output(
             'gconftool --get /apps/compiz-1/general/screen0/options/hsize',
             shell=True))
         vsize = int(subprocess.check_output(
             'gconftool --get /apps/compiz-1/general/screen0/options/vsize',
             shell=True))
-        DesktopSwitch = ChangeViewport(
-            hsize, vsize, int(x_res) // hsize, int(y_res) // vsize)
+    (x_res, y_res) = re.search(
+        b'DG:\s+(\d+)x(\d+)',
+        subprocess.check_output('wmctrl -d', shell=True)).groups()
+    DesktopSwitch = ChangeWorkspace(
+        hsize, vsize, int(x_res) // hsize, int(y_res) // vsize)
     DesktopSwitch.start()
 
-    time.sleep(20)
-    # Suspend/resume the SUT
-    subprocess.call('fwts -q s3 --s3-sleep-delay=30', shell=True)
-    time.sleep(20)
+    time.sleep(35)
 
     for i in range(2):
         GlxRotate[i].cancel = True
@@ -198,7 +192,16 @@
     DesktopSwitch.cancel = True
     time.sleep(10)
     Html5Video.terminate()
-    check_gpu()
+    if check_gpu():
+        return 1
+
+    if source.lookup("org.compiz.core", True):
+        settings = Gio.Settings(
+            "org.compiz.core",
+            "/org/compiz/profiles/unity/plugins/core/")
+        settings.set_int("hsize", hsize_ori)
+        settings.set_int("vsize", vsize_ori)
+        Gio.Settings.sync()
 
 if __name__ == '__main__':
     sys.exit(main())