Unity 8

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

  1. fixtestMainNavigation
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-05-04
Status: Merged
Approved by: Michael Zanetti on 2015-05-07
Approved revision: 1758
Merged at revision: 1787
Proposed branch: lp:~aacid/unity8/fixtestMainNavigation
Merge into: lp:unity8
Diff against target: 40 lines (+7/-2)
1 file modified
tests/qmltests/Dash/tst_DashContent.qml (+7/-2)
To merge this branch: bzr merge lp:~aacid/unity8/fixtestMainNavigation
Reviewer Review Type Date Requested Status
Michael Zanetti (community) 2015-05-04 Approve on 2015-05-07
PS Jenkins bot continuous-integration Needs Fixing on 2015-05-04
Review via email: mp+258173@code.launchpad.net

Commit Message

Make the DashContent::test_mainNavigation test more stable

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 :

FAILED: Continuous integration, rev:1757
http://jenkins.qa.ubuntu.com/job/unity8-ci/5674/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2623/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/839
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/839
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2271/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2621
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2621/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20167

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/fixtestMainNavigation updated on 2015-05-07
1758. By Albert Astals Cid on 2015-05-07

mzanetti needs a higher number here to trigger the horizontal movement

no idea why though :/

Michael Zanetti (mzanetti) wrote :

 * 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.

unrelated AP failures

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
2--- tests/qmltests/Dash/tst_DashContent.qml 2015-02-01 19:53:29 +0000
3+++ tests/qmltests/Dash/tst_DashContent.qml 2015-05-07 10:32:51 +0000
4@@ -142,7 +142,7 @@
5
6 var startX = dashContentList.width/2;
7 var startY = dashContentList.height/2;
8- touchFlick(dashContentList, startX - units.gu(2), startY, startX, startY);
9+ touchFlick(dashContentList, startX - units.gu(4), startY, startX, startY);
10 tryCompare(categoryListView, "contentY", units.gu(15) - categoryListView.pageHeader.height);
11 }
12
13@@ -153,7 +153,7 @@
14
15 tryCompare(scope, "status", Loader.Ready);
16
17- var categoryListView = findChild(dashContentList, "categoryListView");
18+ var categoryListView = findChild(scope, "categoryListView");
19 categoryListView.contentY = units.gu(10);
20
21 compare(dashContentList.currentItem.item.objectName, "MockScope1")
22@@ -353,6 +353,8 @@
23 compare(backButton.visible, true);
24
25 tryCompare(navigationList1.navigation, "loaded", true);
26+ tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);
27+ tryCompare(navigationList1, "height", navigationList1.implicitHeight);
28 navigation = findChild(dashNavigationButton, "navigation1child2");
29 mouseClick(navigation);
30 compare(dashNavigationButton.showList, false);
31@@ -386,6 +388,9 @@
32 mouseClick(dashNavigationButton);
33 compare(dashNavigationButton.showList, true);
34 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
35+ var navigationList0 = findChild(dashNavigationButton, "navigation0");
36+ tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
37+ tryCompare(navigationList0, "height", navigationList0.implicitHeight);
38 navigation = findChild(dashNavigationButton, "navigation0child2");
39 mouseClick(navigation);
40 compare(dashNavigationButton.showList, true);

Subscribers

People subscribed via source and target branches