Merge lp:~facundo/magicicada-protocol/callback-upload-offset into lp:magicicada-protocol

[Facundo Batista]

Callback on BEGIN_CONTENT also with offset.

Callback on BEGIN_CONTENT also with offset.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'tests/test_putcontent.py'
--- tests/test_putcontent.py	2012-04-27 13:02:32 +0000
+++ tests/test_putcontent.py	2016-10-11 19:04:38 +0000
@@ -45,9 +45,14 @@
 
 
 class TestOffset(unittest.TestCase):
-    """
-    Tests for BEGIN_CONTENT's offset attribute
-    """
+    """Tests for BEGIN_CONTENT's offset attribute."""
+
+    def setUp(self):
+        super(TestOffset, self).setUp()
+        transport = StringTransport()
+        self.protocol = StorageClient()
+        self.protocol.transport = transport
+
     def test_offset(self):
         """
         Test that, if the server's BEGIN_CONTENT message specifies an offset,
@@ -98,12 +103,28 @@
         pc.start()
         pc.processMessage(message)
 
+    def test_callback(self):
+        """Test that, if the server specify an offset, we call back with it."""
+        upload_id = 'foo'
+        offset = 123456
+        called = []
+        pc = PutContent(self.protocol, 'share', 'node', '', '', 0, 0, 0,
+                        StringIO(''), upload_id_cb=lambda *a: called.append(a))
+        message = protocol_pb2.Message()
+        message.type = protocol_pb2.Message.BEGIN_CONTENT
+        message.begin_content.upload_id = upload_id
+        message.begin_content.offset = offset
+        pc.start()
+        pc.processMessage(message)
+        self.assertEqual(len(called), 1)
+        self.assertEqual(called[0], (upload_id, offset))
+
 
 class TestUploadId(unittest.TestCase):
     """Tests for BEGIN_CONTENT and PUT_CONTENT upload_id attribute."""
 
     def setUp(self):
-        unittest.TestCase.setUp(self)
+        super(TestUploadId, self).setUp()
         transport = StringTransport()
         self.protocol = StorageClient()
         self.protocol.transport = transport
@@ -112,15 +133,16 @@
         """Test that, if the server specify an upload_id, we save it."""
         upload_id = "foo"
         called = []
-        pc = PutContent(self.protocol, 'share', 'node', '', '',
-                        0, 0, 0, StringIO(''), upload_id_cb=called.append)
+        pc = PutContent(self.protocol, 'share', 'node', '', '', 0, 0, 0,
+                        StringIO(''), upload_id_cb=lambda *a: called.append(a))
         message = protocol_pb2.Message()
         message.type = protocol_pb2.Message.BEGIN_CONTENT
         message.begin_content.upload_id = upload_id
+        message.begin_content.offset = 0
         pc.start()
         pc.processMessage(message)
         self.assertEqual(len(called), 1)
-        self.assertEqual(called[0], 'foo')
+        self.assertEqual(called[0], ('foo', 0))
 
     def test_server_upload_id_no_cb(self):
         """Test that, if the server specify an upload_id, we save it.

=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2016-09-19 02:00:32 +0000
+++ ubuntuone/storageprotocol/client.py	2016-10-11 19:04:38 +0000
@@ -1229,9 +1229,9 @@
         """Handle messages."""
         if message.type == protocol_pb2.Message.BEGIN_CONTENT:
             # call the upload_id_cb (if the upload_id it's in the message)
-            if message.begin_content.upload_id \
-               and self.upload_id_cb:
-                self.upload_id_cb(message.begin_content.upload_id)
+            if message.begin_content.upload_id and self.upload_id_cb:
+                self.upload_id_cb(message.begin_content.upload_id,
+                                  message.begin_content.offset)
             message_producer = BytesMessageProducer(
                 self, self.fd, message.begin_content.offset)
             self.registerProducer(message_producer, streaming=True)