Merge lp:~dobey/ubuntuone-client/installer-not-panel into lp:ubuntuone-client

[dobey]

Update the messaging indicator integration to launch ubuntuone-installer
Avoid passing time() to the Indicator API which expects GTimeVal now
Update the tests for the changes

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

I'm getting this

===============================================================================
[ERROR]
Traceback (most recent call last):
Failure: twisted.trial.util.DirtyReactorAggregateError: Reactor was unclean.
DelayedCalls: (set twisted.internet.base.DelayedCall.debug = True to debug)
<DelayedCall 0x6dad050 [0.0997607707977s] called=0 cancelled=0 GIReactor.callFromThread(<bound method C.push of <tests.syncdaemon.test_hashqueue.C object at 0x6d9a390>>, 'HQ_HASH_ERROR', mdid='mdid')>

tests.syncdaemon.test_hashqueue.HashQueueTests.test_being_hashed

does not seem related... but perhaps you know why I'm getting that?

review: Needs Information

[Natalia Bidart (nataliabidart)]

Seems like the test us buggy, see bug #935568. Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client/installer-not-panel into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.68
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.3
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking how to print strings... printf
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking how ...

=== modified file 'tests/platform/linux/test_messaging.py'
--- tests/platform/linux/test_messaging.py	2012-01-25 22:42:17 +0000
+++ tests/platform/linux/test_messaging.py	2012-02-29 18:58:21 +0000
@@ -83,12 +83,7 @@
         if message_count is not None:
             mock_indicator.set_property("count", str(message_count))
         else:
-            if message_time is None:
-                mock_time = self.mocker.replace("time.time")
-                mock_time()
-                self.mocker.result(FAKE_TIME2)
-                mock_indicator.set_property_time("time", FAKE_TIME2)
-            else:
+            if message_time is not None:
                 mock_indicator.set_property_time("time", message_time)
         mock_indicator.set_property("draw-attention", "true")
         if update_count:

=== modified file 'ubuntuone/platform/linux/messaging.py'
--- ubuntuone/platform/linux/messaging.py	2012-01-26 18:09:46 +0000
+++ ubuntuone/platform/linux/messaging.py	2012-02-29 18:58:21 +0000
@@ -21,20 +21,20 @@
 # of them are available, we should fall back to silently discarding
 # messages.
 
-import dbus
-import subprocess
 import sys
 
-from time import time
-
 indicate = None
+glib = None
 if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
     import indicate as pyindicate
+    import glib as GLib
     indicate = pyindicate
+    glib = GLib
     using_gi = False
 else:
-    from gi.repository import Indicate
+    from gi.repository import Indicate, GLib
     indicate = Indicate
+    glib = GLib
     using_gi = True
 
 DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
@@ -43,34 +43,15 @@
 TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
 
 from ubuntuone.status.messaging import AbstractMessaging
-from ubuntuone.status.logger import logger
-
-
-# pylint: disable=W0613
+
+
 def open_volumes():
     """Open the control panel to the shares tab."""
-    bus = dbus.SessionBus()
-    obj = bus.get_object(DBUS_BUS_NAME, DBUS_PATH)
-    service = dbus.Interface(obj, dbus_interface=DBUS_IFACE_GUI)
-
-    def error_handler(*args, **kwargs):
-        """Log errors when calling D-Bus methods in a async way."""
-        logger.error(
-            'Dbus call to com.ubuntuone.controlpanel.gui failed: %r %r', args,
-            kwargs)
-
-    def reply_handler(*args, **kwargs):
-        """Exit when done."""
-        pass
-
-    service.switch_to_alert(
-        'volumes', True, reply_handler=reply_handler,
-        error_handler=error_handler)
-
+    _server_callback(None)
 
 def _server_callback(the_indicator, message_time=None):
     """Open the control panel to the shares tab."""
-    subprocess.Popen(['ubuntuone-control-panel-gtk'])
+    glib.spawn_command_line_async('ubuntuone-installer')
 # pylint: enable=W0613
 
 
@@ -78,6 +59,7 @@
     """Notification of the end user."""
 
     def __init__(self, server_callback=_server_callback):
+        self.server_callback = server_callback
         self.indicators = []
         if using_gi:
             self.server = indicate.Server.ref_default()
@@ -107,9 +89,8 @@
         if message_count is not None:
             indicator.set_property("count", str(message_count))
         else:
-            if message_time is None:
-                message_time = time()
-            indicator.set_property_time("time", message_time)
+            if message_time is not None:
+                indicator.set_property_time("time", message_time)
         indicator.set_property("draw-attention", "true")
         indicator.show()
         self.indicators.append(indicator)