Merge lp:~dobey/ubuntuone-client/update-3-0 into lp:ubuntuone-client/stable-3-0

[dobey]

[Facundo Batista]

    Fix failure handling when creating a share (LP: #1013180).

[Roberto Alsina]

    - Added .goutputstream files to the ignore list (Fixes LP:1012620).

[Alejandro Cura]

    - Give the tunnel process a bit more time to account for dns resolving. (LP: #1006899)

[Rodney Dawes]

    - Use dbus.Dictionary to specify signature when using empty dicts for SSO calls. (LP: #711162)

[Roberto Alsina (ralsina)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[lp:~dobey/ubuntuone-client/update-3-0]

1194. By dobey on 2012-06-14

[Facundo Batista]

    Fix failure handling when creating a share (LP: #1013180).

[Roberto Alsina]

    - Added .goutputstream files to the ignore list (Fixes LP:1012620).

[Alejandro Cura]

    - Give the tunnel process a bit more time to account for dns resolving. (LP: #1006899)

[Rodney Dawes]

    - Use dbus.Dictionary to specify signature when using empty dicts for SSO calls. (LP: #711162)

=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2012-06-06 20:55:28 +0000
+++ data/syncdaemon.conf	2012-06-14 19:37:24 +0000
@@ -84,6 +84,7 @@
                  \A.*\.swpx\Z
                  \A\..*\.tmp\Z
                  \A\.~lock\..*#\Z
+                 \A\.goutputstream-.*\Z
  
 use_trash.default = True
 use_trash.parser = bool

=== modified file 'tests/platform/linux/test_credentials.py'
--- tests/platform/linux/test_credentials.py	2012-04-09 20:07:05 +0000
+++ tests/platform/linux/test_credentials.py	2012-06-14 19:37:24 +0000
@@ -402,6 +402,32 @@
         self.assertEqual(self.sso_server._args, params)
 
 
+class DictSignatureTestCase(DBusTestCase):
+    """Test the errors with dict signatures."""
+
+    def verify(self, app_name, options_dict, reply_handler, error_handler):
+        """Verify that the options_dict is a dbus.Dictionary."""
+        self.assertIsInstance(options_dict, dbus.Dictionary)
+
+    def test_find_credentials_dict_signature(self):
+        """Test for find_credentials."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "find_credentials", self.verify)
+        creds_man.find_credentials()
+
+    def test_find_credentials_sync_dict_signature(self):
+        """Test for find_credentials_sync."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "find_credentials_sync", self.verify)
+        creds_man.find_credentials_sync()
+
+    def test_clear_credentials_dict_signature(self):
+        """Test for clear_credentials."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "clear_credentials", self.verify)
+        creds_man.clear_credentials()
+
+
 class SameAppNoErrorTestCase(CredentialsManagementTestCase):
     """Test case when the app_name matches APP_NAME and there was no error."""
 

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2012-06-13 14:49:56 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-06-14 19:37:24 +0000
@@ -3764,6 +3764,18 @@
         cmd._acquire_pathlock()
         self.assertEqual(t, [('foo', 'bar'), {'logger': None}])
 
+    def test_handle_failure_push_event(self):
+        """Test AQ_CREATE_SHARE_ERROR is pushed on failure."""
+        msg = 'Something went wrong'
+        failure = Failure(DefaultException(msg))
+        cmd = CreateShare(self.request_queue, NODE, 'share_to',
+                          'share_name', ACCESS_LEVEL_RO, 'marker_id',
+                          os.path.join('foo', 'bar'))
+        cmd.handle_failure(failure=failure)
+        events = [('AQ_CREATE_SHARE_ERROR',
+                  {'marker': 'marker_id', 'error': msg})]
+        self.assertEqual(events, cmd.action_queue.event_queue.events)
+
 
 class DeleteShareTestCase(ConnectedBaseTestCase):
     """Test for DeleteShare ActionQueueCommand."""

=== modified file 'ubuntuone/platform/credentials/linux.py'
--- ubuntuone/platform/credentials/linux.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/credentials/linux.py	2012-06-14 19:37:24 +0000
@@ -30,6 +30,7 @@
 # files in the program, then also delete it here.
 """Ubuntu One credentials management dbus service."""
 
+import dbus
 import dbus.service
 import ubuntu_sso
 
@@ -181,7 +182,8 @@
     def find_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
         """Ask the Ubuntu One credentials."""
         self.ref_count += 1
-        self.sso_proxy.find_credentials(APP_NAME, {},
+        self.sso_proxy.find_credentials(APP_NAME,
+                                        dbus.Dictionary({}, signature='ss'),
             reply_handler=reply_handler, error_handler=error_handler)
 
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,
@@ -205,7 +207,9 @@
             self.ref_count -= 1
 
         self.ref_count += 1
-        self.sso_proxy.find_credentials_sync(APP_NAME, {},
+        self.sso_proxy.find_credentials_sync(
+            APP_NAME,
+            dbus.Dictionary({}, signature='ss'),
             reply_handler=decrease_counter_success,
             error_handler=decrease_counter_error)
 
@@ -214,7 +218,8 @@
     def clear_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
         """Clear the Ubuntu One credentials."""
         self.ref_count += 1
-        self.sso_proxy.clear_credentials(APP_NAME, {},
+        self.sso_proxy.clear_credentials(APP_NAME,
+                                         dbus.Dictionary({}, signature='ss'),
             reply_handler=reply_handler, error_handler=error_handler)
 
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,

=== modified file 'ubuntuone/proxy/tunnel_client.py'
--- ubuntuone/proxy/tunnel_client.py	2012-04-09 20:08:42 +0000
+++ ubuntuone/proxy/tunnel_client.py	2012-06-14 19:37:24 +0000
@@ -143,7 +143,7 @@
 class TunnelProcessProtocol(protocol.ProcessProtocol):
     """The dialog thru stdout with the tunnel server."""
 
-    timeout = 5
+    timeout = 30
 
     def __init__(self, client_d):
         """Initialize this protocol."""

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2012-06-13 14:49:56 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-06-14 19:37:24 +0000
@@ -1853,7 +1853,7 @@
         """It didn't work! Push the event."""
         self.action_queue.event_queue.push('AQ_CREATE_SHARE_ERROR',
                                            marker=self.marker,
-                                           error=failure.value[1])
+                                           error=failure.getErrorMessage())
 
     def _acquire_pathlock(self):
         """Acquire pathlock."""