Unity 8

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

  1. make_testShellWithPin_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: 1919
Proposed branch: lp:~aacid/unity8/make_testShellWithPin_pass
Merge into: lp:unity8
Diff against target: 33 lines (+5/-4)
1 file modified
tests/qmltests/tst_ShellWithPin.qml (+5/-4)
To merge this branch: bzr merge lp:~aacid/unity8/make_testShellWithPin_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+267821@code.launchpad.net

Commit Message

Make the test pass again after rework of appmanager

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.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) wrote :

Test now passes, ack

review: Approve
Gerry Boland (gerboland) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Waiting?
 * Did you make sure that the branch does not contain spurious tags?
Y

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
2--- tests/qmltests/tst_ShellWithPin.qml 2015-08-03 13:47:44 +0000
3+++ tests/qmltests/tst_ShellWithPin.qml 2015-08-12 14:12:08 +0000
4@@ -498,12 +498,13 @@
5
6 function test_suspend() {
7 var greeter = findChild(shell, "greeter");
8+ var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")
9
10 // Put it to sleep
11 Powerd.status = Powerd.Off;
12
13- // If locked, ApplicationManager.suspended should be true
14- tryCompare(ApplicationManager, "suspended", true);
15+ // If locked, applicationsDisplayLoader.item.suspended should be true
16+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
17
18 // And wake up
19 Powerd.status = Powerd.On;
20@@ -513,12 +514,12 @@
21 swipeAwayGreeter(true);
22
23 // We have a lockscreen, make sure we're still suspended
24- tryCompare(ApplicationManager, "suspended", true);
25+ tryCompare(applicationsDisplayLoader.item, "suspended", true);
26
27 enterPin("1234")
28
29 // Now that the lockscreen has gone too, make sure we're waking up
30- tryCompare(ApplicationManager, "suspended", false);
31+ tryCompare(applicationsDisplayLoader.item, "suspended", false);
32
33 }
34

Subscribers

People subscribed via source and target branches