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

[Michał Sawicz]

Remove the activity indicator from tests

Now that its animation runs in the render thread instead of in the main (GUI) one.

This fixes the problem were qml tests would take 100% CPU and fail at some point.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1658
http://jenkins.qa.ubuntu.com/job/unity8-ci/5438/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/603
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1772
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18839

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1659
http://jenkins.qa.ubuntu.com/job/unity8-ci/5440/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1777
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/605
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1775
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18842

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code looks ok and fixes the issue, but it contains spurious tags!

"""
Deleted activity-workaround//8.01.1+15.04.20141112.1~rtm-0ubuntu1
Deleted activity-workaround//8.01.1+15.04.20141111~rtm-0ubuntu1
Deleted activity-workaround//8.01.1+14.10.20141105.2~rtm-0ubuntu1
Deleted activity-workaround//8.02+15.04.20150113~rtm-0ubuntu1
Deleted activity-workaround//8.02+15.04.20141218~rtm-0ubuntu1
Deleted activity-workaround//8.02+15.04.20141216~rtm-0ubuntu1
Deleted activity-workaround//8.00+14.10.20141015.4~rtm-0ubuntu1
Deleted activity-workaround//8.01.1+15.04.20141208~rtm-0ubuntu1
Deleted activity-workaround//8.02+15.04.20150107~rtm-0ubuntu1
Deleted activity-workaround//8.00+14.10.20141017-0ubuntu1
"""

review: Needs Fixing

[Michał Sawicz (saviq)]

> Code looks ok and fixes the issue, but it contains spurious tags!

Oh noes! thanks for checking.

Cleaned.

[Daniel d'Andrada (dandrader)]

good to go

review: Approve

[Daniel d'Andrada (dandrader)]

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

* Did CI run pass? If not, please explain why.
Solves the qmltest issues it's supposed to fix

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

review: Approve

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-02-17 15:06:33 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-03-13 15:21:35 +0000
@@ -23,12 +23,22 @@
     id: testCase
     TestUtil {id:util}
 
-    ActivityIndicator {
-        visible: testCase.running
-        anchors.centerIn: parent
-        Component.onCompleted: parent = testCase.parent
-        z: 100
-        running: visible
+    // This is needed for waitForRendering calls to return
+    // if the watched element already got rendered
+    Rectangle {
+        width: units.gu(1)
+        height: width
+        parent: testCase.parent
+        border { width: units.dp(1); color: "black" }
+        opacity: 0.6
+
+        RotationAnimation on rotation {
+            running: true
+            from: 0
+            to: 360
+            loops: Animation.Infinite
+            duration: 1000
+        }
     }
 
     // Fake implementation to be provided to items under test