Merge lp:~mikemc/ubuntuone-control-panel/fix-1015825-reorder-reactor into lp:ubuntuone-control-panel

[Mike McCracken]

- On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

- On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

[lp:~mikemc/ubuntuone-control-panel/fix-1015825-reorder-reactor]

339. By Mike McCracken on 2012-06-28

Refactor and add tests for installing qt4reactor in main on darwin.

340. By Mike McCracken on 2012-06-28

fix pep8 complaints

[Mike McCracken (mikemc)]

Tests added using alecu's suggestion to make the import testable - encapsulate import & install into a patch-able function.

Patched sys.platform in these new tests so they work on all platforms.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

I've ran the ui and works prefectly, I'll +1.

review: Approve

=== modified file 'bin/ubuntuone-control-panel-qt'
--- bin/ubuntuone-control-panel-qt	2012-06-15 21:28:44 +0000
+++ bin/ubuntuone-control-panel-qt	2012-06-28 04:27:18 +0000
@@ -22,7 +22,7 @@
 import signal
 import sys
 
-if sys.platform in ('win32', 'darwin'):
+if sys.platform == 'win32':
     import qt4reactor
     qt4reactor.install()
 
@@ -31,4 +31,4 @@
 
 if __name__ == "__main__":
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    main.main(sys.argv)
+    main.main(sys.argv, install_reactor_darwin=True)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-15 22:02:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-28 04:27:18 +0000
@@ -61,7 +61,13 @@
     return result
 
 
-def main(args):
+def install_qt4reactor():
+    """Import and install the qt4reactor."""
+    import qt4reactor
+    qt4reactor.install()
+
+
+def main(args, install_reactor_darwin=False):
     """Start the Qt mainloop and open the main window."""
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
@@ -69,6 +75,12 @@
     args = ['ubuntuone-installer'] + args
     app = UniqueApplication(args, "ubuntuone-control-panel")
 
+    # on darwin, must install qt4reactor after UniqueApplication init.
+    # otherwise qt4reactor will create a QCoreApplication for us,
+    # instead of the QApplication we need
+    if install_reactor_darwin and sys.platform == 'darwin':
+        install_qt4reactor()
+
     # Install translator for standard dialogs.
     locale = unicode(QtCore.QLocale.system().name())
     translator = QtCore.QTranslator()

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-05-14 22:30:47 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-06-28 04:27:18 +0000
@@ -130,6 +130,15 @@
         self.patch(main.source, "main_start", lambda app: None)
         self.patch(QtCore, "QTranslator", lambda: self.translator)
 
+        self.qt4reactor_installed = False
+
+        def fake_install_qt4reactor():
+            """Record the install without importing."""
+            self.qt4reactor_installed = True
+
+        self.patch(main, "install_qt4reactor",
+                   fake_install_qt4reactor)
+
     def test_wm_class(self):
         """Test that we set the 1st argument, used for WM_CLASS, correctly."""
         main.main([sys.argv[0]])
@@ -200,3 +209,27 @@
         main.main([sys.argv[0]])
         self.assertEqual(self.app.new_instance.target,
             self.start.window.raise_)
+
+    def test_darwin_installs_qt4reactor(self):
+        """Ensure the qt4 reactor is installed when requested."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=True)
+        self.assertEqual(self.qt4reactor_installed, True)
+
+    def test_darwin_doesnt_install_qt4reactor(self):
+        """Ensure the qt4 reactor isn't installed by default."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]])
+        self.assertEqual(self.qt4reactor_installed, False)
+
+    def test_nondarwin_ignores_true_install_flag(self):
+        """Ensure the qt4 reactor isn't installed on non-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=True)
+        self.assertEqual(self.qt4reactor_installed, False)
+
+    def test_nondarwin_ignores_false_install_flag(self):
+        """Ensure the qt4 reactor isn't installed on non-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=False)
+        self.assertEqual(self.qt4reactor_installed, False)