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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2697
Merged at revision: 2701
Proposed branch: lp:~aacid/unity8/fix_gsv_infite_loop
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
qml/Dash/GenericScopeView.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/fix_gsv_infite_loop
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+310973@code.launchpad.net

Commit message

[Hopefully] Fix infinite loop in some of the GSV tests

Potentially this could happen in real life too

Given rounding issues sometimes we ended up in a loop of showing the floatingSeeLess,
this makes the ScopeListView shorter which ends up in recalculation of whether floatingSeeLess
should be visible which then meant no and loop forever.

With this change i've run the test for 24 hours without it being stuck when previously it got stuck each 2 hours aprox

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

 * 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
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Time will tell.

 * Did CI run pass? If not, please explain why.
Waiting.

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

PASSED: Continuous integration, rev:2697
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2499/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3292
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1885
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3320
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3173/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3173
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3173/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/GenericScopeView.qml'
2--- qml/Dash/GenericScopeView.qml 2016-11-09 15:04:57 +0000
3+++ qml/Dash/GenericScopeView.qml 2016-11-16 08:48:48 +0000
4@@ -700,7 +700,7 @@
5
6 function updateVisibility() {
7 var companionPos = companionTo.mapToItem(floatingSeeLess, 0, 0);
8- showBecausePosition = companionPos.y > 0;
9+ showBecausePosition = Math.round(companionPos.y) > 0;
10
11 var posToBase = floatingSeeLess.mapToItem(companionBase, 0, -yOffset).y;
12 yOffset = Math.max(0, companionBase.item.collapsedHeight - posToBase);

Subscribers

People subscribed via source and target branches