Merge lp:~alecu/ubuntu-sso-client/fix-disconnected-removal into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Do not remove a dead IPC client while iterating the list of clients. (LP: #834224).

Do not remove a dead IPC client while iterating the list of clients. (LP: #834224)

[Natalia Bidart (nataliabidart)]

Looks great!

Before landing, please change "Returns" by "Return" in:

"""Returns a succeed."""

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntu-sso-client/fix-disconnected-removal into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

Running test suite for ubuntu_sso
ubuntu_sso.xdg_base_directory.tests.test_common
  TestBaseDirectory
    test_load_config_paths_filter ... [OK]
    test_save_config_path ... [OK]
    test_xdg_cache_home_is_bytes ... [OK]
    test_xdg_data_home_is_bytes ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_gui
  BasicTestCase
    runTest ... [OK]
  BasicUbuntuSSOClientTestCase
    test_app_name_is_stored ...
/usr/lib/python2.7/dist-packages/gtk-2.0/gtk/__init__.py:57: GtkWarning: could not open display
  warnings.warn(str(e), _gtk.Warning)
./run-tests: line 57: 21480 Floating point exception(core dumped) `which xvfb-run` u1trial -p "$QT_TESTS_PATH" -i "test_windows.py" "$MODULE"

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-07-25 14:45:33 +0000
+++ run-tests.bat	2011-08-26 04:35:30 +0000
@@ -55,7 +55,7 @@
 "%PYTHONEXEPATH%\python.exe" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -c ubuntu_sso -i "test_gui.py, test_linux.py, test_txsecrets.py" --reactor=qt4 --gui
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -c ubuntu_sso -i "test_gui.py, test_linux.py, test_txsecrets.py" --reactor=qt4 --gui %*
 :: Clean the build from the setupt.py
 ECHO Cleaning the generated code before running the style checks...
 "%PYTHONEXEPATH%\python.exe" setup.py clean

=== modified file 'ubuntu_sso/main/tests/test_windows.py'
--- ubuntu_sso/main/tests/test_windows.py	2011-08-22 16:21:36 +0000
+++ ubuntu_sso/main/tests/test_windows.py	2011-08-26 04:35:30 +0000
@@ -163,6 +163,18 @@
         raise DeadReferenceError("Calling Stale Broker")
 
 
+class FakeAliveRemoteClient(object):
+    """A fake alive remote client."""
+
+    def __init__(self):
+        self.called = False
+
+    def callRemote(self, signal_name, *args, **kwargs):
+        """Returns a succeed."""
+        self.called = True
+        return defer.succeed(None)
+
+
 class SignalBroadcasterTestCase(TestCase):
     """Test the SignalBroadcaster class."""
 
@@ -175,6 +187,16 @@
         sb.emit_signal("sample_signal")
         self.assertNotIn(fake_remote_client, sb.clients)
 
+    def test_emit_signal_some_dead_some_not(self):
+        """Test a clean reference after a dead one."""
+        fake_dead_remote = FakeDeadRemoteClient()
+        fake_alive_remote = FakeAliveRemoteClient()
+        sb = SignalBroadcaster()
+        sb.remote_register_to_signals(fake_dead_remote)
+        sb.remote_register_to_signals(fake_alive_remote)
+        sb.emit_signal("sample_signal")
+        self.assertTrue(fake_alive_remote.called, "The alive must be called.")
+
 
 class SSOLoginTestCase(TestCase):
     """Test the login class."""

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2011-08-24 14:39:52 +0000
+++ ubuntu_sso/main/windows.py	2011-08-26 04:35:30 +0000
@@ -171,12 +171,15 @@
 
     def emit_signal(self, signal_name, *args, **kwargs):
         """Emit the given signal to the clients."""
+        dead_clients = []
         for current_client in self.clients:
             try:
                 d = current_client.callRemote(signal_name, *args, **kwargs)
                 d.addErrback(self._emit_failure)
             except DeadReferenceError:
-                self.remote_unregister_to_signals(current_client)
+                dead_clients.append(current_client)
+        for client in dead_clients:
+            self.remote_unregister_to_signals(client)
 
 
 class SSOLogin(Referenceable, SignalBroadcaster):