Merge lp:~facundo/ubuntuone-client/fix-failure-handling into lp:ubuntuone-client

[Facundo Batista]

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

Fix failure handling when creating a share.

Test included.

[dobey (dobey)]

Is there a bug filed for this? If not, could you please open one? And also please do commit --unchanged --fixes=lp:$bugnum to link the branch to it. Thanks.

review: Needs Information

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~facundo/ubuntuone-client/fix-failure-handling]

1255. By Facundo Batista on 2012-06-14

Fixes 1013180

[Facundo Batista (facundo)]

Rodney, done!

[dobey (dobey)]

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2012-06-12 16:28:38 +0000
+++ tests/syncdaemon/test_action_queue.py	2012-06-14 13:37:18 +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/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2012-06-12 18:56:00 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-06-14 13:37:18 +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."""