Merge lp:~roadmr/checkbox/804369-808423 into lp:checkbox

[Daniel Manrique]

Fixes two bugs that cropped up in test scripts:

- keyboard_test used GTK and failed because it hadn't been properly converted to PyGI.

- sleep_test assumed the status codes from NetworkManager, used to validate the connection is active upon wakeup, were organized in an array (contiguous, 0-indexed). NM 0.9 uses arbitrary integers to indicate connection statuses, breaking the assumption. I structured the connected statuses list so that it's easy to account for changes in NM, and if it changes, the test will just exit cleanly and innocently after a sensible timeout, instead of dying horribly with a scary backtrace.

As is the code should work fine on both Natty and Oneiric, though I guess going forward it's only going to be used in Oneiric.

[Marc Tardif (cr3)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-11 15:54:26 +0000
+++ debian/changelog	2011-07-12 19:36:11 +0000
@@ -1,11 +1,16 @@
 checkbox (0.12.4) oneiric; urgency=low
+ 
+  * scripts/keyboard_test modified to account for pygi-related GTK API
+    changes. (LP: #804369)
+  * scripts/sleep_test: improve handling of NetworkManager DBus API
+    changes. (LP: #808423)
 
   [ Brendan Donegan]
   * Refactored job definition files.
   * Fixed dependencies and test naming.
   * Added Online CPU before/after suspend test.
 
- -- Daniel Manrique <[e-mail]>  Mon, 11 Jul 2011 11:42:10 -0400
+ -- Daniel Manrique <[e-mail]>  Tue, 12 Jul 2011 15:25:57 -0400
 
 checkbox (0.12.3) oneiric; urgency=low
 

=== modified file 'scripts/keyboard_test'
--- scripts/keyboard_test	2011-05-17 06:15:31 +0000
+++ scripts/keyboard_test	2011-07-12 19:36:11 +0000
@@ -31,16 +31,19 @@
         termios.tcsetattr(fileno, termios.TCSANOW, saved_attributes)
 
 def gtk_prompt():
-    from gi.repository import Gtk
+    from gi.repository import Gtk,Gdk
 
     # create a new window
-    window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+    window = Gtk.Window()
+    window.set_type_hint(Gdk.WindowType.TOPLEVEL)
     window.set_size_request(200, 100)
     window.set_resizable(False)
     window.set_title(_("Type Text"))
     window.connect("delete_event", lambda w,e: Gtk.main_quit())
 
-    vbox = Gtk.VBox(False, 0)
+    vbox = Gtk.VBox()
+    vbox.set_homogeneous(False)
+    vbox.set_spacing(0)
     window.add(vbox)
     vbox.show()
 
@@ -49,7 +52,9 @@
     vbox.pack_start(entry, True, True, 0)
     entry.show()
 
-    hbox = Gtk.HBox(False, 0)
+    hbox = Gtk.HBox()
+    hbox.set_homogeneous(False)
+    hbox.set_spacing(0)
     vbox.add(hbox)
     hbox.show()
 

=== modified file 'scripts/sleep_test'
--- scripts/sleep_test	2011-06-06 14:58:22 +0000
+++ scripts/sleep_test	2011-07-12 19:36:11 +0000
@@ -2,7 +2,7 @@
 '''
 Program to automate system entering and resuming from sleep states
 
-Copyright (C) 2010 Canonical Ltd.
+Copyright (C) 2010,2011 Canonical Ltd.
 
 Author:
     Jeff Lane <[e-mail]>
@@ -44,10 +44,10 @@
 TO DO:
 * remove workaround once we get a fix for the pm scripts issue that causes the
   wakealarm and alarm_IRQ entries to not be reset after resume from S4
-* Add in post-resume check to determine of network has resumed
 * Add in checks to factor in the consumer-test hibernate/suspend test cases
 
 Changelog:
+v1.1:   Added handling of NetworkManager 0.9 status codes. 
 v1.0:   Added code to support Hibernate (S4) and allow choice between S3 and S4
         at run-time.
         Created mechanism in SuspendTest() class to check /proc/driver/rtc as a
@@ -299,18 +299,13 @@
     HAL_INTERFACE = "org.freedesktop.Hal.Manager"
     HAL_INTERFACE_DEVICE = "org.freedesktop.Hal.Device"
 
-    STATE_UNKNOWN = "unknown"
-    STATE_ASLEEP = "asleep"
-    STATE_CONNECTING = "connecting"
-    STATE_CONNECTED = "connected"
-    STATE_DISCONNECTED = "disconnected"
 
-    _state_table = [
-        STATE_UNKNOWN,
-        STATE_ASLEEP,
-        STATE_CONNECTING,
-        STATE_CONNECTED,
-        STATE_DISCONNECTED]
+    #http://projects.gnome.org/NetworkManager/developers/
+    #NetworkManager D-Bus API Specifications, look for the
+    #NM_STATE enumeration to see which statuses indicate connection
+    #established and put them in this list. "3" works for NM 0.7 
+    #and 0.8, while "60" and "70" work for NM 0.9.
+    STATES_CONNECTED = [3, 60, 70]
 
     def __init__(self):
         try:
@@ -325,10 +320,9 @@
         except dbus.exceptions.DBusException:
             raise NetworkManagerException, "Failed to connect to dbus service"
 
-    def get_state(self):
+    def is_connected(self):
         state = self.nm_service.state()
-        return self._state_table[state]
-
+        return state in self.STATES_CONNECTED
 
 def check_network():
     try:
@@ -339,7 +333,7 @@
     start = datetime.now()
     logging.debug("Waiting 60 seconds for NetworkManager to reconnect.")
     while True:
-        if nm.get_state() == nm.STATE_CONNECTED:
+        if nm.is_connected():
             return True
         # give 60 seconds to NetworkManager to get to a CONNECTED state, then give up
         if datetime.now() - start > timedelta(seconds=60):