Merge lp:~robru/cordova-ubuntu-tests/keep-screen-on into lp:cordova-ubuntu-tests

[Robert Bruce Park]

Move the mouse around to keep the screen awake.

Cordova's is the only autopilot test I've ever seen that does not use any mouse/touch/pointer at all. As a result of this, the screen tends to blank during testing. I'm not entirely certain, but I think this screen blanking may result in some intermittent test failing.

So, here i just fiddle with the mouse at the start of each test, ensuring that the screen stays awake during the entire testsuite.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-armhf-ci/3

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cordova-ubuntu-tests-ci/26/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-ci/27/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-armhf-ci/4

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cordova-ubuntu-tests-ci/27/rebuild

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

This tests should also work on the desktop, where Touch is not available. Use this instead:

    @property
    def pointer(self):
        """ Return pointer """
        return Pointer(self.input_device_class.create())

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-tests-trusty-armhf-ci/6

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/cordova-ubuntu-tests-ci/29/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

No, that doesn't work, Victor. I'm not sure why it doesn't, but the screen sleeps with that code.

Try this branch with and without revision 32... revision 31 works fine on desktop, and keeps phones awake. With revision 32 (your pointer code), it doesn't keep the phone awake.

[lp:~robru/cordova-ubuntu-tests/keep-screen-on]

32. By Robert Bruce Park on 2013-11-07

Merge trunk.

[Robert Bruce Park (robru)]

With this branch as-is I am reliably getting mouse movement on both the device and the desktop, both of which are preventing sleep. Victor, I suspect your way only works with autopilot-1.4, because it gives me errors that input_device_class doesn't exist.

We should land this for now and then if there's any problems later (eg, after the autopilot 1.4 transition is complete), we can switch to your way.

review: Approve

[Víctor R. Ruiz (vrruiz)]

Touch is supposed to work only in the phone, not in the desktop, that's why you need the pointer property. Also, above is 1.3 code, but the class inherits UbuntuUIToolkitAppTestCase.

I didn't approve your merge proposal, because I'm trying to solve this in the correct way, which is fixing either autopilot-touch or phablet-tools. It seems it impacts other tests as well. Probably this code must be removed in the future.

review: Needs Fixing

=== modified file 'tests/autopilot/cordova_ubuntu/tests/__init__.py'
--- tests/autopilot/cordova_ubuntu/tests/__init__.py	2013-10-16 17:03:11 +0000
+++ tests/autopilot/cordova_ubuntu/tests/__init__.py	2013-11-07 20:18:44 +0000
@@ -21,6 +21,7 @@
 
 class CordovaUbuntuTestCase(AutopilotTestCase):
     """ Base class for Cordova Ubuntu Test Cases """
+    pointer = Pointer(Touch.create())
     LOCAL_CORDOVA_CONTAINER_PATH = os.path.abspath("%s/%s" % (os.path.dirname(os.path.realpath(__file__)),
         '../../tools/qml/main-local.qml'))
     INSTALLED_CORDOVA_CONTAINER_PATH = '/usr/share/cordova-ubuntu-tests/autopilot-tests/qml/main.qml'
@@ -53,6 +54,9 @@
 
     def tearDown(self):
         super(CordovaUbuntuTestCase, self).tearDown()
+        # Twiddle the mouse to keep the screen awake during testing.
+        self.pointer.move(150,150)
+        self.pointer.click()
 
     def pick_app_launcher(self, app_path):
         """ Force Qt app introspection """
 
=== modified file 'tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py'
--- tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py	2013-10-16 21:39:32 +0000
+++ tests/autopilot/cordova_ubuntu/tests/test_mobilespec.py	2013-11-07 20:18:44 +0000
@@ -12,7 +12,6 @@
 
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
-from unittest import skip
 
 from cordova_ubuntu.tests import CordovaUbuntuTestCase
 from unittest import skipIf
@@ -132,4 +131,3 @@
     @skipIf('arm' in ARCH, 'This feature not yet supported on ARM.')
     def test_whitelist(self):
         self.run_mobilespec('whitelist', 'TEST-whitelist.xml')
-