Merge lp:~veebers/ubuntu-keyboard/restarting-maliit-for-tests into lp:ubuntu-keyboard

[Christopher Lee]

For ease of testing the ubuntu-keyboard testsuite takes care of restarting maliit-server with testability for the duration of the tests.

For ease of testing the ubuntu-keyboard testsuite takes care of restarting maliit-server with testability for the duration of the tests.

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

You should be aware that doing this:

66 + open(UbuntuKeyboardTests.maliit_override_file, 'w').write(
67 + "exec maliit-server -testability"
68 + )

Will probably work in CPython, but does not do what you think it does in any other python implementation (CPython is the *only* python implementation that uses reference counting to control object lifetimes). A better way is like:

with open(UbuntuKeyboardTests.maliit_override_file, 'w') as override_file:
    override_file.write("exec maliit-server -testability")

Otherwise, looks good, although a better solution would be to use a test fixture.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/149

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/149/rebuild

review: Approve (continuous-integration)

[lp:~veebers/ubuntu-keyboard/restarting-maliit-for-tests]

67. By Christopher Lee on 2013-10-20

Merge trunk.

68. By Christopher Lee on 2013-10-22

Cleanup, no longer need to write to file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/173/rebuild

review: Approve (continuous-integration)

[lp:~veebers/ubuntu-keyboard/restarting-maliit-for-tests]

69. By Christopher Lee on 2013-10-30

Merge trunk

70. By Christopher Lee on 2013-11-04

Remove un-needed config string

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/31

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/203/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

review: Approve

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2013-10-14 04:55:00 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2013-11-04 09:00:10 +0000
@@ -18,6 +18,7 @@
 #
 
 import os
+import subprocess
 
 from testtools.matchers import Equals
 import tempfile
@@ -31,8 +32,72 @@
 from ubuntu_keyboard.emulators.keyboard import Keyboard
 from ubuntu_keyboard.emulators.keypad import KeyPadState
 
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+def _get_maliit_server_status():
+    try:
+        return subprocess.check_output([
+            'initctl',
+            'status',
+            'maliit-server'
+        ])
+    except subprocess.CalledProcessError as e:
+        e.args += ("maliit-server appears to be an unknown service.", )
+        raise
+
+
+def _stop_maliit_server():
+    status = _get_maliit_server_status()
+    if "start/" in status:
+        try:
+            logger.debug("Stopping maliit server")
+            subprocess.check_call(['initctl', 'stop', 'maliit-server'])
+        except subprocess.CalledProcessError as e:
+            e.args += ("Unable to stop mallit server",)
+            raise
+    else:
+        logger.debug("No need to stop server.")
+
+
+def _start_maliit_server(args):
+    status = _get_maliit_server_status()
+    if "stop/" in status:
+        try:
+            logger.debug(
+                "Starting maliit-server with the args: '%s'" % ",".join(args)
+            )
+            subprocess.check_call(
+                ['initctl', 'start', 'maliit-server'] + args
+            )
+        except subprocess.CalledProcessError as e:
+            e.args += ("Unable to start mallit server",)
+            raise
+    else:
+        raise RuntimeError(
+            "Unable to start maliit-server: server is currently running."
+        )
+
+
+def _restart_maliit_server(args=None):
+    if args is None:
+        args = []
+    _stop_maliit_server()
+    _start_maliit_server(args)
+
 
 class UbuntuKeyboardTests(AutopilotTestCase):
+    @classmethod
+    def setUpClass(cls):
+        _restart_maliit_server(['QT_LOAD_TESTABILITY=1'])
+
+    @classmethod
+    def tearDownClass(cls):
+        _restart_maliit_server()
+
     def setUp(self):
         super(UbuntuKeyboardTests, self).setUp()
         self.pointer = Pointer(Touch.create())