Merge lp:~ralsina/ubuntuone-windows-installer/empty-folder-list into lp:ubuntuone-windows-installer

[Roberto Alsina]

Clean the items dict when cleaning the item list.

Clean the items dict when cleaning the item list.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Can you please add a test case validating this change? Thanks!

review: Needs Fixing

[Roberto Alsina (ralsina)]

> Can you please add a test case validating this change? Thanks!

I will try, but it's really tricky!

[Roberto Alsina (ralsina)]

Turns out it was not tricky at all :-)

Test added in revno 76

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite lp:~ralsina/ubuntuone-windows-installer/back-is-wrong has not yet been merged into lp:ubuntuone-windows-installer.

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-12 17:38:00 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-09-12 17:38:01 +0000
@@ -144,6 +144,7 @@
                     if volume[u'type'] == u"UDF":
                         self.folders_info.append(volume)
             self.ui.folder_list.clear()
+            self.items = {}
             for folder in self.folders_info:
                 if folder['subscribed']:
                     item = yield self.add_folder(

=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-12 17:38:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-12 17:38:01 +0000
@@ -284,6 +284,14 @@
         self.assertNotIn('shared', self.ui.items)
 
     @defer.inlineCallbacks
+    def test_get_info_twice(self):
+        """Calling initialize twice should be invariant."""
+        yield self.ui.get_info()
+        self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 4)
+        yield self.ui.get_info()
+        self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 4)
+
+    @defer.inlineCallbacks
     def test_subscribed_udf_checked(self):
         """Check that subscribed UDF items are created correctly."""
         yield self.ui.get_info()