Merge lp:~mikemc/ubuntuone-client/fix-signal-exceptions into lp:ubuntuone-client

[Mike McCracken]

- Fix twisted IPC exceptions for syncdaemon status signals. (LP: #902189)

- Fix twisted IPC exceptions for syncdaemon status signals. (LP: #902189)

Added a test in tests/platform/ipc/test_perspective_broker.py to check method signature matches for ipc_client endpoints.
This reproduces the error seen when on_download_finished raises a TypeError on windows in the bug, and now on mac also.

Fixed several bugs that that test revealed:
- arg signatures for on_{down/up}load_{finished/file_progress}
- missing ipc_client endpoints for RequestQueueAdded and RequestQueueRemoved

All tests pass on linux.

Test pass on macos if you just run the changed tests:
% ./run-mac-tests tests/platform/ipc/

Tested IRL on mac by uploading to web interface and noticing no annoying errors when syncdaemon downloaded it, just this:
2012-09-06 15:37:32,191 - ubuntuone.SyncDaemon.Pb - DEBUG - emitting 'on_download_finished' to all (1) connected clients.

[Roberto Alsina (ralsina)]

YES!

review: Approve

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-client/fix-signal-exceptions 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.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
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 how to create a ustar tar archive... gnutar
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... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-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 s...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-client/fix-signal-exceptions 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.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
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 how to create a ustar tar archive... gnutar
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... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-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 s...

=== modified file 'tests/platform/ipc/test_perspective_broker.py'
--- tests/platform/ipc/test_perspective_broker.py	2012-08-29 12:37:23 +0000
+++ tests/platform/ipc/test_perspective_broker.py	2012-09-06 22:52:21 +0000
@@ -500,6 +500,32 @@
         for signal_name, args in self.signal_mapping:
             self.assert_remote_signal(signal_name, *args)
 
+    def test_remote_signal_calling(self):
+        """Call client functions directly, test for TypeErrors."""
+        if self.client_name is None:
+            return
+
+        def fake_remote_cb(*args, **kwargs):
+            return (args, kwargs)
+
+        client = getattr(self, self.client_name)
+        remote_client = self.client_class(FakeRemoteObject())
+        for signal_name, args in self.signal_mapping:
+
+            remote_client_func_name = client.signal_mapping[signal_name]
+            remote_cb_name = "%s_cb" % remote_client_func_name
+            setattr(remote_client, remote_cb_name, fake_remote_cb)
+            self.addCleanup(delattr, remote_client, remote_cb_name)
+
+            remote_client_func = getattr(remote_client, 
+                                         remote_client_func_name)
+
+            result = remote_client_func(*args)
+
+            # add empty kwargs because signal wrapper will add them:
+            expected = (args, {})
+            self.assertEqual(expected, result)
+
 
 class StatusTestCase(IPCTestCase):
     """Test the status client class."""

=== modified file 'ubuntuone/platform/ipc/ipc_client.py'
--- ubuntuone/platform/ipc/ipc_client.py	2012-08-29 09:07:32 +0000
+++ ubuntuone/platform/ipc/ipc_client.py	2012-09-06 22:52:21 +0000
@@ -234,11 +234,11 @@
         """Emit DownloadStarted."""
 
     @signal
-    def on_download_file_progress(self, download, **info):
+    def on_download_file_progress(self, download, info):
         """Emit DownloadFileProgress."""
 
     @signal
-    def on_download_finished(self, download, **info):
+    def on_download_finished(self, download, info):
         """Emit DownloadFinished."""
 
     @signal
@@ -246,11 +246,11 @@
         """Emit UploadStarted."""
 
     @signal
-    def on_upload_file_progress(self, upload, **info):
+    def on_upload_file_progress(self, upload, info):
         """Emit UploadFileProgress."""
 
     @signal
-    def on_upload_finished(self, upload, *info):
+    def on_upload_finished(self, upload, info):
         """Emit UploadFinished."""
 
     @signal
@@ -261,6 +261,14 @@
     def on_metaqueue_changed(self):
         """Emit MetaQueueChanged."""
 
+    @signal
+    def on_request_queue_added(self, op_name, op_id, data):
+        """Emit RequestQueueAdded."""
+
+    @signal
+    def on_request_queue_removed(self, op_name, op_id, data):
+        """Emit RequestQueueRemoved."""
+
 
 class EventsClient(RemoteClient, Referenceable):
     """Client use to access the status api."""

=== modified file 'ubuntuone/platform/ipc/perspective_broker.py'
--- ubuntuone/platform/ipc/perspective_broker.py	2012-08-16 12:00:12 +0000
+++ ubuntuone/platform/ipc/perspective_broker.py	2012-09-06 22:52:21 +0000
@@ -305,7 +305,7 @@
         """Fire a signal to notify about a download progress."""
 
     @signal
-    def DownloadFinished(self, path, *info):
+    def DownloadFinished(self, path, info):
         """Fire a signal to notify that a download has finished."""
 
     @signal
@@ -317,7 +317,7 @@
         """Fire a signal to notify about an upload progress."""
 
     @signal
-    def UploadFinished(self, path, *info):
+    def UploadFinished(self, path, info):
         """Fire a signal to notify that an upload has finished."""
 
     @signal