Merge lp:~roadmr/ubuntu/precise/checkbox/0.13.8 into lp:ubuntu/precise/checkbox

[Daniel Manrique]

This merge contains some bug fixes we'd like to have on an SRU for Checkbox on Ubuntu 12.04. SRU criteria are presented in each bug's description.

Thanks!

[Martin Pitt (pitti)]

Sponsored. Closing MP manually as this will be the precise-proposed branch, and I can't push it to the precise branch (the package importer will sort that out). Thanks!

review: Approve

=== modified file 'checkbox/dispatcher.py'
--- checkbox/dispatcher.py	2011-11-18 12:46:21 +0000
+++ checkbox/dispatcher.py	2012-10-03 20:52:23 +0000
@@ -1,6 +1,21 @@
-# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
+#
+# This file is part of Checkbox.
+#
+# Copyright 2010-12 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
 __metaclass__ = type
 
 __all__ = [

=== modified file 'checkbox/user_interface.py'
--- checkbox/user_interface.py	2012-03-21 02:22:11 +0000
+++ checkbox/user_interface.py	2012-10-03 20:52:23 +0000
@@ -155,7 +155,8 @@
 
             # if gnome-session is running, try gnome-open; special-case firefox
             # (and more generally, mozilla browsers) and epiphany to open a new window
-            # with respectively -new-window and --new-window
+            # with respectively -new-window and --new-window; special-case chromium-browser
+            # to allow file:// URLs as needed by the checkbox report.
             try:
                 if os.getenv("DISPLAY") and \
                         subprocess.call(["pgrep", "-x", "-u", str(uid), "gnome-panel|gconfd-2"],
@@ -174,6 +175,11 @@
                         if browser:
                             subprocess.Popen(sudo_prefix + [browser.group(0), "--new-window", url])
                             return
+                        
+                        browser = re.match("(chromium-browser[^\s]*)", preferred_browser)
+                        if browser:
+                            subprocess.Popen(sudo_prefix + [browser.group(0), "--allow-file-access-from-files", url])
+                            return
 
                         subprocess.Popen(sudo_prefix + [preferred_browser % url], shell=True)
                         return

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-11 17:20:37 +0000
+++ debian/changelog	2012-10-03 20:52:23 +0000
@@ -1,3 +1,33 @@
+checkbox (0.13.8) precise-proposed; urgency=low
+
+  * New upstream release (LP: #1061198)
+
+  [Marc Tardif]
+  * checkbox/dispatcher.py: Updated license to GPLv3 to be consistent with
+    rest of Checkbox files (LP: #1049881)
+ 
+  [Sylvain Pineau]
+  * qt/frontend/qtfront.ui: Fixed the test purpose widget size to allow two
+    lines of description (LP: #1032255)
+  * scripts/camera_test, jobs/camera.txt.in: Added a 10s timeout to the camera
+    still test (LP: #990133)
+
+  [Daniel Manrique]
+  * jobs/audio.txt.in: replaced gconfaudiosink by autoaudiosink (LP: #978895)
+  * Instruct Chromium browser to accept file:// URLs so it can correctly
+    open the checkbox submission.xml report (LP: #1026614)
+  * scripts/network_check: InvalidURL exception is caught and handled more
+    cleanly (LP: #751701)
+  * Set the correct user (root) for fwts-wakealarm test (LP: #1004102)
+  * Set correct user (root) for usb/storage-preinserted, so it works correctly
+    on servers (LP: #1004131)
+
+  [Nathan Williams]
+  * scripts/network_check: Fixed exception handling in the absence of zenity
+    (LP: #988260)
+
+ -- Daniel Manrique <[e-mail]>  Tue, 02 Oct 2012 17:18:22 -0400
+
 checkbox (0.13.7) precise; urgency=low
 
   * New upstream release (LP: #980063)

=== modified file 'jobs/audio.txt.in'
--- jobs/audio.txt.in	2012-02-10 11:19:05 +0000
+++ jobs/audio.txt.in	2012-10-03 20:52:23 +0000
@@ -12,7 +12,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
-command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that internal speakers work correctly
@@ -29,7 +29,7 @@
 requires:
  device.category == 'AUDIO'
  package.name == 'alsa-base' and package.name == 'python-gst0.10'
-command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! gconfaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
+command: audio_settings store > $CHECKBOX_SHARE/pulseaudio_settings; audio_settings set --device=pci --volume=50; gst_pipeline_test -t 2 'audiotestsrc wave=sine freq=512 ! audioconvert ! audioresample ! autoaudiosink'; audio_settings restore --file=$CHECKBOX_SHARE/pulseaudio_settings
 _description:
  PURPOSE:
      This test will check that headphones connector works correctly

=== modified file 'jobs/power-management.txt.in'
--- jobs/power-management.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/power-management.txt.in	2012-10-03 20:52:23 +0000
@@ -68,6 +68,7 @@
 
 plugin: shell
 name: power-management/fwts_wakealarm
+user: root
 _description: Test ACPI Wakealarm (fwts wakealarm) 
 requires:
  package.name == 'linux'

=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2012-02-10 11:19:05 +0000
+++ jobs/usb.txt.in	2012-10-03 20:52:23 +0000
@@ -106,6 +106,7 @@
 
 plugin: shell
 name: usb/storage-preinserted
+user: root
 requires: package.name == 'linux'
 command: removable_storage_test -l usb && removable_storage_test usb
 _description:

=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-04-11 17:20:37 +0000
+++ qt/frontend/qtfront.ui	2012-10-03 20:52:23 +0000
@@ -736,7 +736,7 @@
                           <x>10</x>
                           <y>30</y>
                           <width>611</width>
-                          <height>21</height>
+                          <height>31</height>
                          </rect>
                         </property>
                         <property name="sizePolicy">

=== modified file 'scripts/audio_test'
--- scripts/audio_test	2011-09-01 12:23:07 +0000
+++ scripts/audio_test	2012-10-03 20:52:23 +0000
@@ -4,7 +4,7 @@
 GST_COMMAND_OLD="/usr/bin/gst-launch"
 GST_COMMAND_NEW="/usr/bin/gst-launch-0.10"
 GST_COMMAND_OPTS="audiotestsrc wave=sine freq=512 ! audioconvert !
-audioresample ! gconfaudiosink"
+audioresample ! autoaudiosink"
 #SOX_COMMAND="rec -q -r 44100 -p | sox -p $OUTPUT silence -l 1 00:00:00.5 -45d -1 00:00:00.5 -45d"
 REC_COMMAND="rec -q -r 44100 $OUTPUT"
 SOX_COMMAND="sox $OUTPUT $OUTPUT.1.wav silence -l 1 00:00:00.5 -45d -1 00:00:00.5 -45d"

=== modified file 'scripts/camera_test'
--- scripts/camera_test	2012-02-10 11:19:05 +0000
+++ scripts/camera_test	2012-10-03 20:52:23 +0000
@@ -89,7 +89,11 @@
                 self._pipeline.set_state(gst.STATE_PLAYING)
                 time.sleep(3)
                 self._pipeline.set_state(gst.STATE_READY)
-                call(["eog", file.name])
+                try:
+                    call(["timeout", "-k", "11", "10", "eog", filename])
+                except CalledProcessError:
+                    pass
+
 
 def parse_arguments(argv):
     """

=== modified file 'scripts/network_check'
--- scripts/network_check	2011-09-29 13:12:01 +0000
+++ scripts/network_check	2012-10-03 20:52:23 +0000
@@ -5,6 +5,7 @@
 """
 from subprocess import call
 from optparse import OptionParser, Option
+import httplib
 import urllib2
 import sys
 
@@ -15,7 +16,7 @@
     """
     try:
         urllib2.urlopen(url)
-    except urllib2.URLError:
+    except (urllib2.URLError, httplib.InvalidURL):
         return False
 
     return True
@@ -53,8 +54,11 @@
         command.append("--error")
 
     if not options.auto:
-        call(command)
-    
+        try:
+            call(command)
+        except OSError:
+            print("Zenity missing; unable to report test result:\n %s" % message)
+   
     if any(results.itervalues()):
         return 0
     else: