Unity 8

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

  1. faster_testWindowResizeArea
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 2746
Merged at revision: 2759
Proposed branch: lp:~aacid/unity8/faster_testWindowResizeArea
Merge into: lp:unity8
Prerequisite: lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2160
Diff against target: 63 lines (+7/-9)
1 file modified
tests/qmltests/Stage/tst_WindowResizeArea.qml (+7/-9)
To merge this branch: bzr merge lp:~aacid/unity8/faster_testWindowResizeArea
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Daniel d'Andrada (community) Approve
Review via email: mp+313715@code.launchpad.net

Commit message

tst_WindowResizeArea: Use default values for mouseFlick speed and iterations

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
Daniel d'Andrada (dandrader) wrote :

Maybe we should increase the default number of iterations from 5 to 10...

The number of iterations were being specified there probably as a way to make them more stable in CI.

Revision history for this message
Daniel d'Andrada (dandrader) :
review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

> Maybe we should increase the default number of iterations from 5 to 10...
>
> The number of iterations were being specified there probably as a way to make
> them more stable in CI.

Given how the code has changed (i.e actual waiting happens now) i am not sure any old "we did this to make CI happier" applies at all.

But let's wait for CI :D

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

PASSED: Continuous integration, rev:2746
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2762/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3620
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2071
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2071
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3648
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3494/artifact/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:2746
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2778/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3638
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2080
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2080
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3666
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3511/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3511/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3511/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3511/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3511/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3511
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3511/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2778/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 'tests/qmltests/Stage/tst_WindowResizeArea.qml'
2--- tests/qmltests/Stage/tst_WindowResizeArea.qml 2016-11-23 12:13:09 +0000
3+++ tests/qmltests/Stage/tst_WindowResizeArea.qml 2016-12-21 16:23:28 +0000
4@@ -264,7 +264,7 @@
5
6 var startDragX = initialWindowX + initialWindowWidth + 1
7 var startDragY = initialWindowY + initialWindowHeight + 1
8- mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
9+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
10
11 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, fakeWindow.resizeAreaMinWidth));
12 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, fakeWindow.resizeAreaMinHeight));
13@@ -290,7 +290,7 @@
14
15 var startDragX = initialWindowX - 1
16 var startDragY = initialWindowY - 1
17- mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
18+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
19
20 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, fakeWindow.resizeAreaMinWidth));
21 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, fakeWindow.resizeAreaMinHeight));
22@@ -318,10 +318,10 @@
23
24 var startDragX = initialWindowX + data.startX
25 var startDragY = initialWindowY + data.startY
26- mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false, units.gu(.05), 10);
27+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false);
28 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - Math.abs(data.dx), fakeWindow.resizeAreaMinWidth));
29 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - Math.abs(data.dy), fakeWindow.resizeAreaMinHeight));
30- mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true, units.gu(.05), 10);
31+ mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true);
32 tryCompare(fakeWindow, "width", initialWindowWidth);
33 tryCompare(fakeWindow, "height", initialWindowHeight);
34 }
35@@ -385,7 +385,7 @@
36 windowRequestedHeightSpy.clear();
37 verify(windowRequestedHeightSpy.valid);
38
39- mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY, true, true, units.gu(.5), 10);
40+ mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY);
41
42 compare(windowRequestedWidthSpy.count, 1);
43 compare(fakeWindow.width, initialWindowWidth + fakeWindow.widthIncrement);
44@@ -416,8 +416,7 @@
45 var endDragX = (fakeWindow.maximumWidth * 2) + 1;
46 var endDragY = (fakeWindow.maximumHeight * 2) + 1;
47
48- mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,
49- true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
50+ mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
51
52 compare(fakeWindow.requestedWidth, fakeWindow.maximumWidth);
53 compare(fakeWindow.requestedHeight, fakeWindow.maximumHeight);
54@@ -446,8 +445,7 @@
55 var endDragX = (fakeWindow.minimumWidth * 0.5) + 1;
56 var endDragY = (fakeWindow.minimumHeight * 0.5) + 1;
57
58- mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,
59- true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
60+ mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
61
62 compare(fakeWindow.requestedWidth, fakeWindow.minimumWidth);
63 compare(fakeWindow.requestedHeight, fakeWindow.minimumHeight);

Subscribers

People subscribed via source and target branches