Merge lp:~nataliabidart/ubuntu-sso-client/no-more-no into lp:ubuntu-sso-client

[Natalia Bidart]

- Stop using is_reactor_installed since is buggy (LP: #933644).

[Manuel de la Peña (mandel)]

Great work! Done an IRL test with proxy support an everything went smoothly.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/utils/runner/__init__.py'
--- ubuntu_sso/utils/runner/__init__.py	2012-02-08 02:13:03 +0000
+++ ubuntu_sso/utils/runner/__init__.py	2012-02-23 13:21:19 +0000
@@ -37,6 +37,10 @@
 def is_qt4_main_loop_installed():
     """Check if the Qt4 main loop is installed."""
     result = False
+
+    if not 'PyQt4' in sys.modules:
+        return result
+
     try:
         from PyQt4.QtCore import QCoreApplication
         result = QCoreApplication.instance() is not None
@@ -46,13 +50,7 @@
     return result
 
 
-def is_twisted_reactor_installed():
-    """Check if the Twisted reactor is installed."""
-    result = 'twisted.internet.reactor' in sys.modules
-    return result
-
-
-def spawn_program(args):
+def spawn_program(args, use_reactor=False):
     """Spawn the program specified by 'args'.
 
     - 'args' should be a sequence of program arguments, the program to execute
@@ -67,10 +65,10 @@
     logger.debug('spawn_program: requested to spawn %r.', repr(args))
     d = defer.Deferred()
 
-    if is_twisted_reactor_installed():
+    if use_reactor:
         from ubuntu_sso.utils.runner import tx
         source = tx
-    elif 'PyQt4' in sys.modules and is_qt4_main_loop_installed():
+    elif is_qt4_main_loop_installed():
         from ubuntu_sso.utils.runner import qt
         source = qt
     else:

=== modified file 'ubuntu_sso/utils/runner/tests/test_glib.py'
--- ubuntu_sso/utils/runner/tests/test_glib.py	2012-02-17 19:33:51 +0000
+++ ubuntu_sso/utils/runner/tests/test_glib.py	2012-02-23 13:21:19 +0000
@@ -106,7 +106,6 @@
         # GLib.spawn_async and fake the conditions so the glib runner is chosen
         self.process = FakedProcess()
         self.patch(glib, 'GLib', self.process)
-        self.patch(runner, 'is_twisted_reactor_installed', lambda: False)
         self.patch(runner, 'is_qt4_main_loop_installed', lambda: False)
 
     # Access to a protected member _flags, _argv of a client class

=== modified file 'ubuntu_sso/utils/runner/tests/test_qt.py'
--- ubuntu_sso/utils/runner/tests/test_qt.py	2012-02-18 14:10:58 +0000
+++ ubuntu_sso/utils/runner/tests/test_qt.py	2012-02-23 13:21:19 +0000
@@ -99,7 +99,6 @@
         # QProcess and fake the conditions so the qt runner is chosen
         self.process = FakedProcess()
         self.patch(QtCore, 'QProcess', lambda: self.process)
-        self.patch(runner, 'is_twisted_reactor_installed', lambda: False)
         self.patch(runner, 'is_qt4_main_loop_installed', lambda: True)
 
     @defer.inlineCallbacks

=== modified file 'ubuntu_sso/utils/runner/tests/test_runner.py'
--- ubuntu_sso/utils/runner/tests/test_runner.py	2012-02-17 20:58:53 +0000
+++ ubuntu_sso/utils/runner/tests/test_runner.py	2012-02-23 13:21:19 +0000
@@ -31,9 +31,10 @@
 class SpawnProgramTestCase(TestCase):
     """The test suite for the spawn_program method."""
 
-    timeout = 3
     args = (u'python', u'-c',
             u'import os; os.system("mkdir %s")' % TEST_ME_DIR)
+    use_reactor = True
+    timeout = 3
 
     @defer.inlineCallbacks
     def setUp(self):
@@ -44,7 +45,7 @@
 
     def spawn_fn(self, args):
         """The target function to test."""
-        return runner.spawn_program(args)
+        return runner.spawn_program(args, use_reactor=self.use_reactor)
 
     def assert_command_was_run(self):
         """The spawnned commnad was correctly run."""