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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Terry
Approved revision: no longer in the source branch.
Merged at revision: 2318
Proposed branch: lp:~aacid/unity8/fixTutorialLeftUnstableTest
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/fixTutorialLeftUnstableTest
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+290319@code.launchpad.net

Commit message

Use tutorialLeftLoader instead of tutorialLeft

tutorialLeft goes away since it's unloaded so sometimes it will fail

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?
N/A

 * 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.
Revision history for this message
Michael Terry (mterry) wrote :

Yup, that's better. Thanks for catching that.

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2313
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/885/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1188
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1165
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1165
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1163
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1163/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1163/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1163
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1163/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1163/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1163
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1163/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1163/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/885/rebuild

review: Needs Fixing (continuous-integration)
2313. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

2314. By Michael Terry

Fix showing "Retry" in password prompt when turning on screen in tablet mode.
Approved by: Michał Sawicz, Albert Astals Cid

2315. By Michael Terry

Fix OOBE wizard not setting your name. Fixes: #1562872
Approved by: Albert Astals Cid

2316. By Lukáš Tinkl

Fix the last chance popup colors/theme
Approved by: Michael Terry

2317. By Michael Terry

Adjust text for desktop right edge tutorial to be accurate. Fixes: #1563103
Approved by: Daniel d'Andrada

2318. By Albert Astals Cid

Use tutorialLeftLoader instead of tutorialLeft

tutorialLeft goes away since it's unloaded so sometimes it will fail
Approved by: Michael Terry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
2--- tests/qmltests/Tutorial/tst_Tutorial.qml 2016-03-22 16:41:52 +0000
3+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2016-03-29 14:52:29 +0000
4@@ -408,7 +408,7 @@
5 ApplicationManager.startApplication("gallery-app");
6
7 var launcher = findChild(shell, "launcher");
8- var tutorialLeft = findChild(shell, "tutorialLeft");
9+ var tutorialLeft = findChild(shell, "tutorialLeftLoader");
10 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
11
12 tryCompare(tutorialLeft, "shown", false);

Subscribers

People subscribed via source and target branches