Merge lp:~ralsina/ubuntu-sso-client/testability into lp:ubuntu-sso-client

[Roberto Alsina]

 - Enable -testability option through the TESTABILITY environment variable (Fixes LP:984964).

Enables -testability through a environment variable.

To test IRL you need the testability driver and start ussoc like this:

PYTHONPATH=. TESTABILITY=1 bin/ubuntu-sso-login

[lp:~ralsina/ubuntu-sso-client/testability]

957. By Roberto Alsina on 2012-05-09

oops

[Diego Sarmentero (diegosarmentero)]

ubuntu_sso/qt/main/tests/test_main.py:
    155: [C0322, BasicTestCase.test_no_testability] Operator not preceded by a space
                environ['TESTABILITY']=''

review: Needs Fixing

[lp:~ralsina/ubuntu-sso-client/testability]

958. By Roberto Alsina on 2012-05-09

lint

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~ralsina/ubuntu-sso-client/testability]

959. By Roberto Alsina on 2012-05-09

lint

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2012-04-09 17:38:24 +0000
+++ bin/ubuntu-sso-login	2012-05-09 18:03:18 +0000
@@ -49,11 +49,14 @@
 #     val = globals()[globalname]
 # KeyError: 'ROUND_CEiLiNG'
 
+import os
 import sys
 
 if sys.platform == 'win32':
     from PyQt4 import QtGui
     # need to create the QApplication before installing the reactor
+    if os.environ.get('TESTABILITY', False):
+        sys.argv.append('-testability')
     QtGui.QApplication(sys.argv)
 
     # pylint: disable=F0401

=== modified file 'ubuntu_sso/qt/main/__init__.py'
--- ubuntu_sso/qt/main/__init__.py	2012-04-18 10:52:46 +0000
+++ ubuntu_sso/qt/main/__init__.py	2012-05-09 18:03:18 +0000
@@ -28,6 +28,7 @@
 # files in the program, then also delete it here.
 """Main module to open the QT UI."""
 
+import os
 import sys
 
 from PyQt4 import QtGui, QtCore
@@ -52,6 +53,9 @@
 
 def main(**kwargs):
     """Start the QT mainloop and open the main window."""
+    if os.environ.get('TESTABILITY', False) and \
+        '-testability' not in sys.argv:
+        sys.argv.append('-testability')
     app = QtGui.QApplication(sys.argv)
 
     source.main(app)

=== modified file 'ubuntu_sso/qt/main/tests/test_main.py'
--- ubuntu_sso/qt/main/tests/test_main.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/qt/main/tests/test_main.py	2012-05-09 18:03:18 +0000
@@ -28,6 +28,10 @@
 # files in the program, then also delete it here.
 """Tests for the main module."""
 
+from copy import copy
+import os
+import sys
+
 from PyQt4 import QtCore
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
@@ -120,6 +124,7 @@
         self.patch(main.source, 'main_start',
             lambda *arg, **kw: called_ui('main_start', *arg, **kw))
         self.patch(main.QtGui, 'QApplication', FakeApplication)
+        FakeApplication.called['args'] = []
 
     def test_main(self):
         """Calling main.main() a UI instance is created."""
@@ -132,6 +137,29 @@
             ('main_start', (FakeApplication.instance(),), {})]
         self.assertEqual(self.called, expected)
 
+    def test_testability(self):
+        """Calling main.main() with TESTABILITY=1, adds -testability."""
+        environ = copy(os.environ)
+        environ['TESTABILITY'] = '1'
+        self.patch(os, 'environ', environ)
+        self.patch(sys, 'argv', [])
+        kwargs = dict(app_name='APP_NAME', foo='foo', bar='bar',
+            baz='yadda', yadda=0)
+        main.main(**kwargs)
+        self.assertIn('-testability', FakeApplication.called['args'])
+
+    def test_no_testability(self):
+        """Calling main.main() with TESTABILITY unset."""
+        environ = copy(os.environ)
+        if 'TESTABILITY' in environ:
+            environ['TESTABILITY'] = ''
+        self.patch(os, 'environ', environ)
+        self.patch(sys, 'argv', [])
+        kwargs = dict(app_name='APP_NAME', foo='foo', bar='bar',
+            baz='yadda', yadda=0)
+        main.main(**kwargs)
+        self.assertNotIn('-testability', FakeApplication.called['args'])
+
     def test_check_close_callback(self):
         """Check that the close callback is main_quit."""