Merge lp:~mandel/ubuntuone-dev-tools/use_correct_reactor into lp:ubuntuone-dev-tools

[Manuel de la Peña]

Added code to select the correct reactor according to the platform so that u1trial can be used in platforms that do not have glib by default to fix lp:692507

Added code to select the correct reactor according to the platform so that u1trial can be used in platforms that do not have glib by default to fix lp:692507

[dobey (dobey)]

This is a bit backwards from what is being done in the ubuntuone projects, where dbus is getting used on non-Windows platforms. There will also have to be more work to be able to do this, as tests that use the DBus runner are going to require the glib reactor for doing async calls. So I guess we also need to have some way to check that the reactor and service runners are compatible in some way, otherwise you will get lots of weird errors running the tests on something other than Linux.

review: Needs Fixing

[lp:~mandel/ubuntuone-dev-tools/use_correct_reactor]

16. By Manuel de la Peña on 2010-12-20

Check if the OS is not windows since on windows we do not have the glib reactor.

17. By Manuel de la Peña on 2010-12-20

Added darwin to the list of platforms where the glib reactor is not present.

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

It's ok.

review: Approve

=== modified file 'bin/u1trial'
--- bin/u1trial	2010-12-20 15:32:15 +0000
+++ bin/u1trial	2010-12-20 16:41:55 +0000
@@ -33,14 +33,26 @@
 sys.path.insert(0, os.path.abspath("."))
 
 
-class TestRunner(TrialRunner):
-    """The test runner implementation."""
-
-    def __init__(self):
+def _install_reactor():
+    """Install the correct reactor according to the platform."""
+    # the select reactor seems to be the most stable one in darwin
+    # and win32, we will just install a reactor for windows and use
+    # the default one for the other platforms.
+    platform = sys.platform
+    if platform not in ['win32', 'darwin']:
         # install the glib2reactor before any import of the reactor to avoid
         # using the default SelectReactor and be able to run the dbus tests
         from twisted.internet import glib2reactor
         glib2reactor.install()
+        
+class TestRunner(TrialRunner):
+    """The test runner implementation."""
+    
+    def __init__(self):
+        # install the correct reactor accrding to the platform, do
+        # this to ensure that we can instantiate the best reactor per
+        # platform
+        _install_reactor()
         from twisted.trial.reporter import TreeReporter
 
         # setup a custom XDG_CACHE_HOME and create the logs directory