Merge lp:~thomir-deactivatedaccount/window-mocker/make-windows-autopilot-compatible into lp:window-mocker

[Thomi Richards]

Make window-mocker windows introspectable from autopilot.

This branch adds a command line option '-testability' to the window-mocker process, making it compatible with the autopilot/Qt introspection plugin.

[Christopher Lee (veebers)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/window-mocker-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/window-mocker-raring-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/window-mocker-ci/1/rebuild

review: Approve (continuous-integration)

=== modified file 'bin/window-mocker'
--- bin/window-mocker	2013-02-07 16:41:10 +0000
+++ bin/window-mocker	2013-04-22 22:35:33 +0000
@@ -42,6 +42,10 @@
     parser.add_argument('-t', '--type', choices=get_registered_plugin_names(),
         default=get_default_plugin_name, help="""Select the application type."""
         )
+    parser.add_argument('-testability', action='store_true',
+        help="""Enable autopilot introspection. Only applies when the Qt plugin
+        is used."""
+        )
     return parser
 
 

=== modified file 'tests/test_app_functional.py'
--- tests/test_app_functional.py	2013-02-07 16:41:10 +0000
+++ tests/test_app_functional.py	2013-04-22 22:35:33 +0000
@@ -11,8 +11,9 @@
 import os.path
 import subprocess
 import tempfile
+from time import sleep
 from testtools import TestCase
-from testtools.matchers import Equals
+from testtools.matchers import Contains, Equals
 
 
 def get_app_path():
@@ -51,9 +52,19 @@
             shell=False
             )
 
+    stdout = stderr = ""
+    for i in range(10):
+        retcode = process.poll()
+        if retcode is not None:
+            break
+        if i == 5:
+            print "Killing process."
+            process.kill()
+        if i == 8:
+            print "Terminating process."
+            process.terminate()
+        sleep(1)
     stdout, stderr = process.communicate()
-    retcode = process.poll()
-
     return (retcode, stdout, stderr)
 
 
@@ -90,3 +101,8 @@
         self.assertThat(retcode, Equals(3))
         self.assertThat(stderr, Equals("Error: Unable to process request: No JSON object could be decoded\n"))
 
+    def test_accepts_testability_command_line_argument(self):
+        retcode, stdout, stderr = run_app_with_args("-help")
+
+        self.assertThat(stderr, Contains("-testability"))
+

=== modified file 'windowmocker/plugins/qt.py'
--- windowmocker/plugins/qt.py	2013-02-07 16:41:10 +0000
+++ windowmocker/plugins/qt.py	2013-04-22 22:35:33 +0000
@@ -22,7 +22,10 @@
     Name = "Qt4"
 
     def create_application(self):
-        self.app = QtGui.QApplication(sys.argv[:1])
+        args = sys.argv[:1]
+        if "-testability" in sys.argv:
+            args.append("-testability")
+        self.app = QtGui.QApplication(args)
 
     def create_window(self, window_spec):
         win = QtGui.QMainWindow()