Merge lp:~aacid/unity8/make_try_no_cpu_usage into lp:unity8

[Albert Astals Cid]

Anchor running to the proper object.visible

The parent of that rotationAnimation is not the rotatingRectangle even if you'd expect it to be

Fixes continous CPU usage on make tryXXX

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Test change only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

 * Did you have a look at the warnings when running tests?
No new warnings

[Michael Zanetti (mzanetti)]

Yes!

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

not yet, sure it will

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[lp:~aacid/unity8/make_try_no_cpu_usage]

1793. By Albert Astals Cid on 2015-05-27

Merge oxide_regression_workaround

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1792
http://jenkins.qa.ubuntu.com/job/unity8-ci/5776/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/39
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/54/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/55
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20768

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5776/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-05-18 23:04:19 +0000
+++ tests/qmltests/CMakeLists.txt	2015-05-27 14:21:44 +0000
@@ -93,4 +93,4 @@
 add_qml_test(Stages WindowMoveResizeArea)
 add_qml_test(Stages Splash)
 add_qml_test(Tutorial Tutorial)
-add_qml_test(Wizard Wizard)
+add_qml_test(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-04-17 18:31:12 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-05-27 14:21:44 +0000
@@ -26,6 +26,7 @@
     // This is needed for waitForRendering calls to return
     // if the watched element already got rendered
     Rectangle {
+        id: rotatingRectangle
         width: units.gu(1)
         height: width
         parent: testCase.parent
@@ -35,7 +36,7 @@
         visible: testCase.running
 
         RotationAnimation on rotation {
-            running: parent.visible
+            running: rotatingRectangle.visible
             from: 0
             to: 360
             loops: Animation.Infinite