Merge lp:~robertcarr/mir/android-test-powerd-cli into lp:mir/0.1

[Robert Carr]

Use powerd-cli to ensure we have not suspended the display while running mir tests.

A pragmatic fix for: https://bugs.launchpad.net/mir/+bug/1239955 in light of https://code.launchpad.net/~chris.gagnon/mir/enabled-arm-tests/+merge/191991

As documented in the bug, in some sense this is not a mir bug, merely mir fails when the system has been put in to earlysuspend mode by some other component. See the bug for more detailed documentation.

This isn't a problem in the Unity8 scenario, as Unity8 speaks with powerd (it seems, unity-system-compositor will need to do the same).

I think as such, it's reasonable to simply ensure the system is active during our packaging test runs.

It's still potentially confusing for developers: adb shell in to phablet, but everything is off (because you stopped unity8 while the screen was blanked) and mir doesn't work. Maybe this is best solved at a different level.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/mir-ci/1606/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/19
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/4/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1606/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/mir/android-test-powerd-cli]

1165. By Robert Carr on 2013-10-28

Fix spacing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1165
http://jenkins.qa.ubuntu.com/job/mir-ci/1607/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/5/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1607/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robertcarr/mir/android-test-powerd-cli]

1166. By Robert Carr on 2013-10-28

Do not enable android tests yet

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1166
http://jenkins.qa.ubuntu.com/job/mir-ci/1608/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-ci/1608/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Please target for development-branch.

review: Needs Resubmitting

[Kevin DuBois (kdub)]

We're adding a dependency in order to make sure that another program doesn't come and mess up the environment we need for adding a test? seems like we should set up pbuilder to do this, or negotiate something in the system architecture to talk to powerd directly.

Unmerged revisions

1166. By Robert Carr on 2013-10-28

Do not enable android tests yet

1165. By Robert Carr on 2013-10-28

Fix spacing

1164. By Robert Carr on 2013-10-28

Only depend on powerd-cli on armhf

1163. By Robert Carr on 2013-10-28

Build android gtest discovery

1162. By Robert Carr on 2013-10-28

Build tests on android

=== modified file 'debian/control'
--- debian/control	2013-10-21 16:02:28 +0000
+++ debian/control	2013-10-28 17:55:33 +0000
@@ -35,6 +35,7 @@
                libudev-dev,
                google-mock (>= 1.6.0+svn437),
                valgrind [!arm64],
+               powerd [armhf]
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/mir
 # If you aren't a member of ~mir-team but need to upload packaging changes,

=== modified file 'debian/rules'
--- debian/rules	2013-09-23 13:52:58 +0000
+++ debian/rules	2013-10-28 17:55:33 +0000
@@ -11,6 +11,9 @@
 
 #overrding dh_auto_test to get rid of --parallel during testing
 override_dh_auto_test:
+ifeq ($(DEB_HOST_ARCH),armhf)
+	powerd-cli active &
+endif
 	GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1
 
 COMMON_CONFIGURE_OPTIONS = \
@@ -23,8 +26,8 @@
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DMIR_PLATFORM=android \
 	  -DMIR_ENABLE_UNIT_TESTS=NO \
-	  -DMIR_ENABLE_ACCEPTANCE_TESTS=NO \
-	  -DMIR_ENABLE_INTEGRATION_TESTS=NO
+	  -DMIR_ENABLE_INTEGRATION_TESTS=NO \
+	  -DMIR_ENABLE_ACCEPTANCE_TESTS=NO
 else
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	dh_auto_configure -- \