Unity 8

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

  1. make_testPhoneStage_pass
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-08-12
Status: Merged
Approved by: Gerry Boland on 2015-08-12
Approved revision: 1908
Merged at revision: 1920
Proposed branch: lp:~aacid/unity8/make_testPhoneStage_pass
Merge into: lp:unity8
Diff against target: 11 lines (+1/-0)
1 file modified
tests/qmltests/Stages/tst_PhoneStage.qml (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/make_testPhoneStage_pass
Reviewer Review Type Date Requested Status
Gerry Boland 2015-08-12 Approve on 2015-08-12
PS Jenkins bot continuous-integration Needs Fixing on 2015-08-12
Review via email: mp+267830@code.launchpad.net

Commit Message

fix testPhoneStage

By making sure cleanup() cleans everything up, otherwise test_cantCloseWhileSnapping was made to fail by test_cantAccessPhoneStageWhileRightEdgeGesture running before it

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?
Yes

 * 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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
2--- tests/qmltests/Stages/tst_PhoneStage.qml 2015-07-06 12:52:08 +0000
3+++ tests/qmltests/Stages/tst_PhoneStage.qml 2015-08-12 15:16:45 +0000
4@@ -295,6 +295,7 @@
5 tryCompare(ApplicationManager, "count", oldCount - 1)
6 }
7 phoneStage.shellOrientationAngle = 0;
8+ phoneStage.select(ApplicationManager.get(0).appId);
9 }
10
11 function test_focusNewTopMostAppAfterFocusedOneClosesItself() {

Subscribers

People subscribed via source and target branches