Merge lp:~diegosarmentero/ubuntuone-client/deflated-size into lp:ubuntuone-client

[Diego Sarmentero]

- Using deflated_size instead of size (LP: #1062729).

[Mike McCracken (mikemc)]

Tests pass on ubuntu, and I know that this change works IRL on darwin, I tried it last Friday night.

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-10-10 14:54:49 +0000
+++ tests/status/test_aggregator.py	2012-10-11 15:12:23 +0000
@@ -829,7 +829,7 @@
     def test_file_uploading(self):
         """Check that it returns a list with the path, size, and progress."""
         fc = FakeCommand(path='testfile.txt')
-        fc.size = 200
+        fc.deflated_size = 200
         self.status_frontend.upload_started(fc)
         uploading = self.status_frontend.files_uploading()
         expected = [('testfile.txt', 200, 0)]
@@ -838,10 +838,10 @@
         self.assertEqual(menu_data,
             {UPLOADING: expected, RECENT_TRANSFERS: []})
 
-        fc.size = 1000
+        fc.deflated_size = 1000
         fc.n_bytes_written = 200
         fc2 = FakeCommand(path='testfile2.txt')
-        fc2.size = 2000
+        fc2.deflated_size = 2000
         fc2.n_bytes_written = 450
         self.status_frontend.upload_started(fc2)
         uploading = self.status_frontend.files_uploading()
@@ -852,6 +852,19 @@
         self.assertEqual(menu_data,
             {UPLOADING: expected, RECENT_TRANSFERS: []})
 
+    def test_files_uploading_empty(self):
+        """Check that empty files are ignored."""
+        fc = FakeCommand(path='testfile.txt')
+        fc.deflated_size = None
+        self.status_frontend.upload_started(fc)
+
+        fc2 = FakeCommand(path='testfile2.txt')
+        fc2.deflated_size = 0
+        fc2.n_bytes_written = 450
+        self.status_frontend.upload_started(fc2)
+        uploading = self.status_frontend.files_uploading()
+        self.assertEqual(uploading, [])
+
     def test_menu_data_full_response(self):
         """Check that listener.menu_data returns both uploading and recent."""
         self.patch(status_listener.action_queue, "Upload", FakeCommand)
@@ -859,7 +872,7 @@
         self.listener.handle_SYS_QUEUE_ADDED(fake_command)
         self.listener.handle_SYS_QUEUE_REMOVED(fake_command)
         fc = FakeCommand(path='testfile.txt')
-        fc.size = 1000
+        fc.deflated_size = 1000
         fc.n_bytes_written = 200
         self.status_frontend.upload_started(fc)
         uploading = self.status_frontend.files_uploading()

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-10-10 14:54:49 +0000
+++ ubuntuone/status/aggregator.py	2012-10-11 15:12:23 +0000
@@ -843,8 +843,8 @@
         """Return a list with the files being uploading."""
         uploading = []
         for upload in self.aggregator.files_uploading:
-            if upload.size != 0:
-                uploading.append((upload.path, upload.size,
+            if upload.deflated_size not in (0, None):
+                uploading.append((upload.path, upload.deflated_size,
                     upload.n_bytes_written))
         return uploading