Merge lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-fix-tests into lp:ubuntuone-client

[Diego Sarmentero]

- Fixed failing test (LP: #1061100).

[dobey (dobey)]

review: Approve

[Vincent Ladeuil (vila)]

May I suggest:

15 # The menu should only show 5 current transfers.

Your change makes this 5 a 6.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-client/ubuntuone-client-fix-tests]

1331. By Diego Sarmentero on 2012-10-05

fix comment

[Diego Sarmentero (diegosarmentero)]

> May I suggest:
>
> 15 # The menu should only show 5 current transfers.
>
> Your change makes this 5 a 6.

comment updated

[Vincent Ladeuil (vila)]

thanks, it was worth updating the comment, I wouldn't have thought about a separator...

review: Approve

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2012-10-01 13:32:57 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-10-05 15:17:24 +0000
@@ -334,7 +334,6 @@
         self.assertEqual(len(children), 5)
         data_current.reverse()
         for item in children[6:]:
-            print repr(item)
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
             self.assertIn(text, uploading_data)
             size, written = uploading_data[text]
@@ -363,13 +362,17 @@
         self.status_frontend.uploading_data = data_current
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
-        # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 5)
-        for i, item in enumerate(children):
+        # The menu should only show 5 current transfers and a separator item.
+        self.assertEqual(len(children), 6)
+        i = 0
+        for item in children:
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            if text is None:
+                continue
             percentage = item.property_get_int(
                 linux.SyncMenu.PROGRESS_MENUITEM_PROP_PERCENT_DONE)
             name, size, written = expected[i]
+            i += 1
             percentage_expected = written * 100 / size
             self.assertEqual(text, name)
             self.assertEqual(percentage, percentage_expected)