Unity 8

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

  1. more_stable_lvwpht
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1756
Merged at revision: 1768
Proposed branch: lp:~aacid/unity8/more_stable_lvwpht
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/use_dbus_test_runner
Diff against target: 21 lines (+8/-2)
1 file modified
tests/plugins/Dash/listviewwithpageheadertest.cpp (+8/-2)
To merge this branch: bzr merge lp:~aacid/unity8/more_stable_lvwpht
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+257749@code.launchpad.net

Commit message

Make the test more stable

The test was unstable because scrolling vs creation time is not always stable so at some point we were scrolling "too fast" and when deciding if the new item is out of viewport or in sometimes it went the other way.

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
Prerequisie

 * 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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1754
http://jenkins.qa.ubuntu.com/job/unity8-ci/5637/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2523
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/802
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/802
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2521
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2521/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20018

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/more_stable_lvwpht updated
1755. By Albert Astals Cid

Merge lp:~aacid/unity8/use_dbus_test_runner

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1755
http://jenkins.qa.ubuntu.com/job/unity8-ci/5640/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/803
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/805
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2528
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20028

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/more_stable_lvwpht updated
1756. By Albert Astals Cid

Merge use_dbus_test_runner

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1756
http://jenkins.qa.ubuntu.com/job/unity8-ci/5673/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2622
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/838
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/838/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/838/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2620
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20165

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

review: Needs Fixing (continuous-integration)
Revision history for this message
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 test failure, the touched test is passing fine in CI now.

 * 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/plugins/Dash/listviewwithpageheadertest.cpp'
2--- tests/plugins/Dash/listviewwithpageheadertest.cpp 2015-03-17 15:54:27 +0000
3+++ tests/plugins/Dash/listviewwithpageheadertest.cpp 2015-05-04 10:35:21 +0000
4@@ -973,9 +973,15 @@
5 QCOMPARE(lvwph->contentY(), 1258.);
6 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
7
8- changeContentY(-1700);
9-
10+ changeContentY(-800);
11+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 5);
12+ changeContentY(-400);
13+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 8);
14+ changeContentY(-200);
15+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 10);
16+ changeContentY(-300);
17 QTRY_COMPARE(lvwph->m_visibleItems.count(), 12);
18+
19 QCOMPARE(lvwph->m_firstVisibleIndex, 0);
20 verifyItem(0, -308., 75., true);
21 verifyItem(1, -233., 75., true);

Subscribers

People subscribed via source and target branches