Merge lp:~saviq/unity8/workaround-lp1238417 into lp:unity8

[Michał Sawicz]

Work around Mir not delivering input to shell after restart, if the device isn't reinitialized.

[Michael Zanetti (mzanetti)]

tested, works

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/unity8-ci/1361/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4940/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2836/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/384
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1361/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1360
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1115/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/815
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/815/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2838/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2360
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2400/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1361/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2013-10-09 20:57:00 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2013-10-11 10:05:22 +0000
@@ -87,6 +87,12 @@
         self._proxy = None
         self._lightdm_mock_type = None
         self._qml_mock_enabled = True
+
+        #### FIXME: This is a work around re: lp:1238417 ####
+        from autopilot.input import _uinput
+        _uinput._touch_device = _uinput.create_touch_device()
+        ####
+
         self.touch = Touch.create()
         self._setup_display_details()