Merge lp:~mikemc/ubuntu-sso-client/fix-1017672-delayed-reaction-in-tcpactivation into lp:ubuntu-sso-client

[Mike McCracken]

- delay importing twisted.internet.reactor to avoid creating default reactor when we need qt4reactor ( lp #1017672 )

- delay importing twisted.internet.reactor to avoid creating default reactor when we need qt4reactor ( lp #1017672 )

on darwin and windows, we need the qt4reactor to be installed, but only after the QApplication is initialized. however, UniqueApplication eventually imports tcpactivation, which imports twisted.internet.reactor, creating a default reactor instead of the qt4reactor.

Here we delay the import to the functions that use 'reactor' to avoid its undesirable side effect.

[Brian Curtin (brian.curtin)]

review: Approve

[Manuel de la Peña (mandel)]

I'm got a feeling that this was due to my tcpactivation changes, good catch! but lint does not like you :(

ubuntu_sso/utils/tests/test_tcpactivation.py:
    438: [W0621, server_test] Redefining name 'reactor' from outer scope (line 39)
    473: [W0621, client_test] Redefining name 'reactor' from outer scope (line 39)
    39: [W0611] Unused import reactor

review: Needs Fixing

[lp:~mikemc/ubuntu-sso-client/fix-1017672-delayed-reaction-in-tcpactivation]

977. By Mike McCracken on 2012-06-26

remove unused reactor import at top

[Manuel de la Peña (mandel)]

Passes in all platforms!

review: Approve

=== modified file 'ubuntu_sso/utils/tcpactivation.py'
--- ubuntu_sso/utils/tcpactivation.py	2012-06-08 12:01:37 +0000
+++ ubuntu_sso/utils/tcpactivation.py	2012-06-26 15:51:17 +0000
@@ -30,7 +30,7 @@
 
 import subprocess
 
-from twisted.internet import defer, error, protocol, reactor
+from twisted.internet import defer, error, protocol
 from twisted.internet.endpoints import clientFromString
 
 LOCALHOST = "127.0.0.1"
@@ -43,6 +43,7 @@
 
 def async_sleep(delay):
     """Fire the returned deferred after some specified delay."""
+    from twisted.internet import reactor
     d = defer.Deferred()
     # pylint: disable=E1101
     reactor.callLater(delay, d.callback, None)
@@ -118,6 +119,7 @@
     @defer.inlineCallbacks
     def is_already_running(self):
         """Check if the instance is already running."""
+        from twisted.internet import reactor
         factory = PortDetectFactory()
         client = clientFromString(reactor, self.config.description.client)
         try:

=== modified file 'ubuntu_sso/utils/tests/test_tcpactivation.py'
--- ubuntu_sso/utils/tests/test_tcpactivation.py	2012-06-19 16:14:01 +0000
+++ ubuntu_sso/utils/tests/test_tcpactivation.py	2012-06-26 15:51:17 +0000
@@ -35,7 +35,8 @@
 # this test module access a few protected members (starting with _)
 # pylint: disable=W0212
 
-from twisted.internet import defer, protocol, reactor, task
+import twisted.internet
+from twisted.internet import defer, protocol, task
 from twisted.trial.unittest import TestCase
 
 # pylint: disable=W0611
@@ -106,7 +107,7 @@
         yield super(AsyncSleepTestCase, self).setUp()
         self.test_timeout = 5.0
         self.clock = task.Clock()
-        self.patch(tcpactivation, "reactor", self.clock)
+        self.patch(twisted.internet, "reactor", self.clock)
         self.d = tcpactivation.async_sleep(self.test_timeout)
 
     def test_async_sleep_not_fired_immediately(self):
@@ -330,7 +331,7 @@
         """Test the _wait_server_active method."""
         ac = ActivationClient(self.config)
         clock = task.Clock()
-        self.patch(tcpactivation, "reactor", clock)
+        self.patch(twisted.internet, "reactor", clock)
         self.patch(ac, "is_already_running", lambda: defer.succeed(False))
 
         d = ac._wait_server_active()
@@ -346,7 +347,7 @@
         """If the server takes too long to start then timeout."""
         ac = ActivationClient(self.config)
         clock = task.Clock()
-        self.patch(tcpactivation, "reactor", clock)
+        self.patch(twisted.internet, "reactor", clock)
         self.patch(ac, "is_already_running", lambda: defer.succeed(False))
         d = ac._wait_server_active()
         clock.pump([tcpactivation.DELAY_BETWEEN_CHECKS] *
@@ -434,6 +435,7 @@
 
 def server_test(config):
     """An IRL test of the server."""
+    from twisted.internet import reactor
 
     def got_description(description):
         """The description was found."""
@@ -468,6 +470,7 @@
 
 def client_test(config):
     """An IRL test of the client."""
+    from twisted.internet import reactor
     print "starting the client."
     ac = ActivationClient(config)
     d = ac.get_active_client_description()