Merge lp:~diegosarmentero/ubuntuone-control-panel/remove-button into lp:ubuntuone-control-panel

[Diego Sarmentero]

Fixed: two remove buttons (LP: #904551).

Fixed: two remove buttons (LP: #904551).

[Natalia Bidart (nataliabidart)]

Need a test! ;-)

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-control-panel/remove-button]

251. By Diego Sarmentero on 2012-01-04

changed close to deleteLater

252. By Diego Sarmentero on 2012-01-04

Adding test

253. By Diego Sarmentero on 2012-01-04

adding assert

254. By Diego Sarmentero on 2012-01-05

Adding show for the devices widget.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

== Python Lint Notices ==

ubuntuone/controlpanel/gui/qt/tests/test_devices.py:
    100: [C0111, DevicesPanelTestCase.test_remove_device_and_check_layout_state.delete_later] Missing docstring
    101: [W0201, DevicesPanelTestCase.test_remove_device_and_check_layout_state.delete_later] Attribute 'executed' defined outside __init__

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-control-panel/remove-button]

255. By Diego Sarmentero on 2012-01-05

Fixing lint issues.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-11-28 15:06:18 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2012-01-05 15:28:23 +0000
@@ -81,6 +81,7 @@
         for i in reversed(range(children)):
             widget = box.itemAt(i).widget()
             box.removeWidget(widget)
+            widget.deleteLater()
 
     def update_device_info(self, device_info):
         """Update one device."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-11-28 15:06:18 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-01-05 15:28:23 +0000
@@ -35,6 +35,7 @@
     innerclass_ui = gui.devices_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.DevicesPanel
+    executed = False
 
     @defer.inlineCallbacks
     def setUp(self):
@@ -88,6 +89,27 @@
             device = self.ui.ui.list_devices.itemWidget(item)
             self.assertEqual(device.text(), remote_device['name'])
 
+    def test_remove_device_and_check_layout_state(self):
+        """Test if the widget is properly removed."""
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+        self.ui.show()
+
+        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
+        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
+        self.executed = False
+
+        def delete_later(reference=None):
+            """Fake delete later."""
+            self.executed = True
+        self.patch(local_device, "deleteLater", delete_later)
+        self.ui.clear_device_info(self.ui.ui.local_device_box)
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
+        local_device2 = self.ui.ui.local_device_box.itemAt(0).widget()
+        self.assertNotEqual(local_device, local_device2)
+        self.assertTrue(self.executed)
+        self.assertFalse(local_device.isVisible())
+
     def test_process_info_twice(self):
         """The widget is updated with the info."""
         self.test_process_info()