Merge lp:~roadmr/ubuntu/oneiric/checkbox/0.12.8.1 into lp:ubuntu/oneiric/checkbox

[Daniel Manrique]

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

Thanks!

[Luke Yelavich (themuso)]

Thanks for your work. For future reference, please make sure the upload target is set to $dist-proposed for stable release updates, where $dist is oneiric, precise, etc. I'd also ask that you not tag your branches. It is usually up to the uploader to tag a branch, since they may need to make further changes before the upload, and it keeps the work of each upload a little more tidy if the final commit of that upload is tagged. In this case its not a problem, but its something thats worth thinking about in the future.

Thanks again.

review: Approve

[Daniel Manrique (roadmr)]

Hi Luke,

Thanks so much for your advice, I'll be sure to follow it in the future. It's only the second SRU I request so I'm still a bit wobbly but I'll improve. Also thanks for reviewing our changes!

Unmerged revisions

36. By Daniel Manrique on 2011-12-02

 * Ensure that connect_wireless chooses a wireless connection from the list
   of available connections (LP: #877752)
 * Have the bluetooth/detect tests require a device with the category
   BLUETOOTH to run, thus preventing the test from failing on systems with
   no Bluetooth device (LP: #862322)
 * Guard against trying to write files to logical partitions on USB sticks
   (which will obviously fail) in usb_test (LP: #887049)
 * Allow input/mouse test to run if a TOUCH device is present
   (LP: #886129)
 * Flush file descriptors and sync disk before running a test (LP: #814801)
* Move progress indicator to main checkbox dialog instead of a
  transient window (LP: #868995)

=== modified file 'checkbox/contrib/persist.py'
--- checkbox/contrib/persist.py	2011-02-14 18:19:27 +0000
+++ checkbox/contrib/persist.py	2011-12-06 19:34:35 +0000
@@ -23,6 +23,7 @@
 import re
 import posixpath
 
+from checkbox.lib.safe import safe_close
 
 __all__ = ["Persist", "MemoryBackend", "PickleBackend", "BPickleBackend",
     "path_string_to_tuple", "path_tuple_to_string", "RootedPersist",
@@ -517,14 +518,14 @@
         try:
             return self._pickle.load(file)
         finally:
-            file.close()
+            safe_close(file)
 
     def save(self, filepath, map):
         file = open(filepath, "w")
         try:
             self._pickle.dump(map, file, 2)
         finally:
-            file.close()
+            safe_close(file)
 
 
 class BPickleBackend(Backend):
@@ -538,11 +539,11 @@
         try:
             return self._bpickle.loads(file.read())
         finally:
-            file.close()
+            safe_close(file)
 
     def save(self, filepath, map):
         file = open(filepath, "w")
         try:
             file.write(self._bpickle.dumps(map))
         finally:
-            file.close()
+            safe_close(file)

=== modified file 'checkbox/lib/safe.py'
--- checkbox/lib/safe.py	2009-03-17 09:46:16 +0000
+++ checkbox/lib/safe.py	2011-12-06 19:34:35 +0000
@@ -94,3 +94,8 @@
         md5sum = digest.hexdigest()
 
     return md5sum
+
+def safe_close(file):
+    file.flush()
+    os.fsync(file.fileno())
+    file.close()

=== modified file 'checkbox/message.py'
--- checkbox/message.py	2010-03-09 16:58:36 +0000
+++ checkbox/message.py	2011-12-06 19:34:35 +0000
@@ -22,7 +22,7 @@
 import posixpath
 
 from checkbox.contrib import bpickle
-
+from checkbox.lib.safe import safe_close
 
 HELD = "h"
 BROKEN = "b"
@@ -215,7 +215,7 @@
         try:
             return file.read()
         finally:
-            file.close()
+            safe_close(file)
 
     def _get_flags(self, path):
         basename = posixpath.basename(path)
@@ -253,7 +253,8 @@
 
         file = open(filename + ".tmp", "w")
         file.write(message_data)
-        file.close()
+        safe_close(file)
+
         os.rename(filename + ".tmp", filename)
 
         # For now we use the inode as the message id, as it will work

=== modified file 'checkbox_gtk/gtk_interface.py'
--- checkbox_gtk/gtk_interface.py	2011-09-29 13:12:01 +0000
+++ checkbox_gtk/gtk_interface.py	2011-12-06 19:34:35 +0000
@@ -102,10 +102,8 @@
             image_head.connect("expose-event",self.draw_image_head)
 
         # Set wait transient for dialog
-        self._wait = self._get_widget("window_wait")
-        self._wait.set_transient_for(self._dialog)
-        self._wait.realize()
-        self._wait.get_window().set_functions(Gdk.WMFunction.MOVE)
+        self._wait = self._get_widget("box_wait")
+        self._wait.hide()
 
         # Set shorthand for notebook
         self._notebook = self._get_widget("notebook_main")

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 13:12:01 +0000
+++ debian/changelog	2011-12-06 19:34:35 +0000
@@ -1,3 +1,23 @@
+checkbox (0.12.9) oneiric; urgency=low
+
+   [Brendan Donegan]  
+   * Ensure that connect_wireless chooses a wireless connection from the list
+     of available connections (LP: #877752)
+   * Have the bluetooth/detect tests require a device with the category
+     BLUETOOTH to run, thus preventing the test from failing on systems with
+     no Bluetooth device (LP: #862322)
+   * Guard against trying to write files to logical partitions on USB sticks
+     (which will obviously fail) in usb_test (LP: #887049)
+   * Allow input/mouse test to run if a TOUCH device is present
+     (LP: #886129)
+   * Flush file descriptors and sync disk before running a test (LP: #814801)
+
+  [Daniel Manrique]
+  * Move progress indicator to main checkbox dialog instead of a 
+    transient window (LP: #868995)
+
+ -- Daniel Manrique <[e-mail]>  Fri, 02 Dec 2011 16:49:05 -0500
+
 checkbox (0.12.8) oneiric; urgency=low
 
   New upstream release (LP: #862579):

=== modified file 'gtk/checkbox-gtk.ui'
--- gtk/checkbox-gtk.ui	2011-06-13 14:22:39 +0000
+++ gtk/checkbox-gtk.ui	2011-12-06 19:34:35 +0000
@@ -374,6 +374,43 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkBox" id="box_wait">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel" id="label_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkProgressBar" id="progressbar_wait">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+
+
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area">
             <property name="visible">True</property>
@@ -452,41 +489,4 @@
       <action-widget response="1">button_next</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkWindow" id="window_wait">
-    <property name="title" translatable="yes"></property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child>
-      <object class="GtkVBox" id="vbox_wait">
-        <property name="visible">True</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label_wait">
-            <property name="visible">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkProgressBar" id="progressbar_wait">
-            <property name="visible">True</property>
-            <property name="pulse_step">0.10000000149</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
 </interface>

=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2011-08-10 21:09:56 +0000
+++ jobs/input.txt.in	2011-12-06 19:34:35 +0000
@@ -1,6 +1,6 @@
 plugin: manual
 name: input/mouse
-requires: device.category == 'MOUSE'
+requires: device.category == 'MOUSE' or device.category == 'TOUCH'
 _description:
  Moving the mouse should move the cursor on the screen.
  .

=== modified file 'plugins/persist_info.py'
--- plugins/persist_info.py	2011-02-14 18:19:27 +0000
+++ plugins/persist_info.py	2011-12-06 19:34:35 +0000
@@ -35,7 +35,8 @@
         for (rt, rh) in [
              ("begin", self.begin),
              ("prompt-begin", self.begin),
-             ("prompt-job", self.save)]:
+             ("prompt-job", self.save),
+             ("report-job", self.save)]:
             self._manager.reactor.call_on(rt, rh, -100)
 
         # Save persist data last

=== modified file 'scripts/connect_wireless'
--- scripts/connect_wireless	2011-09-29 13:12:01 +0000
+++ scripts/connect_wireless	2011-12-06 19:34:35 +0000
@@ -8,7 +8,7 @@
 if [ $? -eq 0 ]
 then
     ap=$(echo $active_connection | awk -F\' '{print $2}')
-    conn=$(nmcli -t -f UUID,NAME con list | grep -e "$ap$" | awk -F\: '{print $1}')
+    conn=$(nmcli -t -f UUID,NAME,TYPE con list | grep wireless | grep -e "$ap$" | awk -F\: '{print $1}')
 else
     conn=$(nmcli -t -f UUID,TYPE con list | grep wireless | head -n 1 | awk -F\: '{print $1}')
 fi

=== modified file 'scripts/usb_test'
--- scripts/usb_test	2011-09-29 13:12:01 +0000
+++ scripts/usb_test	2011-12-06 19:34:35 +0000
@@ -68,9 +68,11 @@
         if not device_props.Get('org.freedesktop.UDisks.Device',"DeviceIsDrive"):
             if device_props.Get('org.freedesktop.UDisks.Device', "DriveConnectionInterface") == 'usb':
                 devFile = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceFile"))
-                print str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths"))
-                devPath = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")[0])
-                disks[devFile] = devPath
+
+                if len(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")) > 0:
+                    print str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths"))
+                    devPath = str(device_props.Get('org.freedesktop.UDisks.Device',"DeviceMountPaths")[0])
+                    disks[devFile] = devPath
         
     return disks