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

Proposed by Albert Astals Cid on 2015-05-27
Status: Merged
Approved by: Michael Zanetti on 2015-05-28
Approved revision: 1793
Merged at revision: 1811
Proposed branch: lp:~aacid/unity8/make_try_no_cpu_usage
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/oxide_regression_workaround
Diff against target: 20 lines (+2/-1)
1 file modified
tests/utils/modules/Unity/Test/UnityTestCase.qml (+2/-1)
To merge this branch: bzr merge lp:~aacid/unity8/make_try_no_cpu_usage
Reviewer Review Type Date Requested Status
Michael Zanetti (community) 2015-05-27 Approve on 2015-05-28
PS Jenkins bot continuous-integration 2015-05-27 Approve on 2015-05-27
Review via email: mp+260314@code.launchpad.net

This proposal supersedes a proposal from 2015-05-27.

Commit Message

Bind 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

Description of the Change

 * 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

To post a comment you must log in.
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

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
Michael Zanetti (mzanetti) wrote :

Reapproving now that Jenkins has confirmed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
2--- tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-04-17 18:31:12 +0000
3+++ tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-05-27 14:22:15 +0000
4@@ -26,6 +26,7 @@
5 // This is needed for waitForRendering calls to return
6 // if the watched element already got rendered
7 Rectangle {
8+ id: rotatingRectangle
9 width: units.gu(1)
10 height: width
11 parent: testCase.parent
12@@ -35,7 +36,7 @@
13 visible: testCase.running
14
15 RotationAnimation on rotation {
16- running: parent.visible
17+ running: rotatingRectangle.visible
18 from: 0
19 to: 360
20 loops: Animation.Infinite

Subscribers

People subscribed via source and target branches