Merge lp:~facundo/ubuntuone-client/reset-written-bytes into lp:ubuntuone-client

[Facundo Batista]

Reset the written values in Upload to 0 when re-run (LP: #724532)

Reset the written values in Upload to 0 when re-run

The command can be interrupted and tried again, so needs to reset the values on each _run(). Note that they are reset to 0, but if the Upload is multipart it will then adjust the values in UploadProgressWrapper.seek().

Also, moved the responsibility of the reset to UploadProgressWrapper, because it already was handling these values.

Test included.

[Lucio Torre (lucio.torre)]

review: Approve

[Guillermo Gonzalez (verterok)]

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-03-07 16:54:25 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-03-09 14:56:59 +0000
@@ -3037,6 +3037,23 @@
 class UploadProgressWrapperTestCase(BaseTwistedTestCase):
     """Test for the UploadProgressWrapper helper class."""
 
+    def test_reset(self):
+        """Reset the values at start."""
+        f = StringIO("x" * 10  + "y" * 5)
+        cmd = FakeCommand()
+
+        # first time
+        UploadProgressWrapper(f, cmd)
+        self.assertEqual(cmd.n_bytes_written, 0)
+        self.assertEqual(cmd.n_bytes_written_last, 0)
+
+        # fake as it worked a little, was interrupted, and tried again
+        cmd.n_bytes_written_last = 1234
+        cmd.n_bytes_written = 1248
+        UploadProgressWrapper(f, cmd)
+        self.assertEqual(cmd.n_bytes_written, 0)
+        self.assertEqual(cmd.n_bytes_written_last, 0)
+
     def test_read(self):
         """Test the read method."""
         class FakeCommand(object):

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-03-07 16:54:25 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-03-09 14:56:59 +0000
@@ -570,6 +570,8 @@
     def __init__(self, fd, command):
         self.fd = fd
         self.command = command
+        self.command.n_bytes_written = 0
+        self.command.n_bytes_written_last = 0
 
     def read(self, size=None):
         """Read at most size bytes from the file-like object.
@@ -2401,7 +2403,6 @@
 
         if getattr(self.tempfile, 'name', None) is not None:
             self.tempfile = open(self.tempfile.name)
-        self.n_bytes_written_last = 0
         f = UploadProgressWrapper(self.tempfile, self)
 
         # access here the magic hash value, don't log anywhere, and