Unity 8

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

  1. fix_shell_tests_greeter_ddas
  2. Merge into trunk
Proposed by Albert Astals Cid on 2016-01-14
Status: Merged
Approved by: Michał Sawicz on 2016-01-26
Approved revision: 2137
Merged at revision: 2151
Proposed branch: lp:~aacid/unity8/fix_shell_tests_greeter_ddas
Merge into: lp:unity8
Diff against target: 19 lines (+1/-1)
1 file modified
tests/qmltests/tst_Shell.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/fix_shell_tests_greeter_ddas
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing on 2016-01-25
Michał Sawicz 2016-01-14 Approve on 2016-01-25
PS Jenkins bot continuous-integration Needs Fixing on 2016-01-14
Review via email: mp+282626@code.launchpad.net

Commit Message

Fix some test shells being unstable in the armhf builders

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.
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/75/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/76/
Executed test runs:

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

review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/unity8-ci/7072/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6033
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1777
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6044
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6044/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26668
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/231/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/485
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26670

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

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) 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.
Britney was happy with it, have started another Unity8 CI run.
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/197/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/tst_Shell.qml'
2--- tests/qmltests/tst_Shell.qml 2015-12-08 15:37:51 +0000
3+++ tests/qmltests/tst_Shell.qml 2016-01-14 16:41:53 +0000
4@@ -631,7 +631,6 @@
5 // again before interacting with it otherwise any
6 // DirectionalDragAreas in there won't be easily fooled by
7 // fake swipes.
8- removeTimeConstraintsFromDirectionalDragAreas(greeter);
9 swipeAwayGreeter();
10
11 compare(mainApp.requestedState, ApplicationInfoInterface.RequestedRunning);
12@@ -641,6 +640,7 @@
13 function swipeAwayGreeter() {
14 var greeter = findChild(shell, "greeter");
15 tryCompare(greeter, "fullyShown", true);
16+ removeTimeConstraintsFromDirectionalDragAreas(greeter);
17
18 var touchX = shell.width - (shell.edgeSize / 2);
19 var touchY = shell.height / 2;

Subscribers

People subscribed via source and target branches