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
=== modified file 'tests/qmltests/Stage/tst_WindowResizeArea.qml'
--- tests/qmltests/Stage/tst_WindowResizeArea.qml 2016-11-23 12:13:09 +0000
+++ tests/qmltests/Stage/tst_WindowResizeArea.qml 2016-12-21 16:23:28 +0000
@@ -264,7 +264,7 @@
264264
265 var startDragX = initialWindowX + initialWindowWidth + 1265 var startDragX = initialWindowX + initialWindowWidth + 1
266 var startDragY = initialWindowY + initialWindowHeight + 1266 var startDragY = initialWindowY + initialWindowHeight + 1
267 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);267 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
268268
269 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, fakeWindow.resizeAreaMinWidth));269 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, fakeWindow.resizeAreaMinWidth));
270 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, fakeWindow.resizeAreaMinHeight));270 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, fakeWindow.resizeAreaMinHeight));
@@ -290,7 +290,7 @@
290290
291 var startDragX = initialWindowX - 1291 var startDragX = initialWindowX - 1
292 var startDragY = initialWindowY - 1292 var startDragY = initialWindowY - 1
293 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);293 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy);
294294
295 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, fakeWindow.resizeAreaMinWidth));295 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, fakeWindow.resizeAreaMinWidth));
296 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, fakeWindow.resizeAreaMinHeight));296 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, fakeWindow.resizeAreaMinHeight));
@@ -318,10 +318,10 @@
318318
319 var startDragX = initialWindowX + data.startX319 var startDragX = initialWindowX + data.startX
320 var startDragY = initialWindowY + data.startY320 var startDragY = initialWindowY + data.startY
321 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false, units.gu(.05), 10);321 mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, false);
322 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - Math.abs(data.dx), fakeWindow.resizeAreaMinWidth));322 tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - Math.abs(data.dx), fakeWindow.resizeAreaMinWidth));
323 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - Math.abs(data.dy), fakeWindow.resizeAreaMinHeight));323 tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - Math.abs(data.dy), fakeWindow.resizeAreaMinHeight));
324 mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true, units.gu(.05), 10);324 mouseFlick(root, startDragX + data.dx, startDragY + data.dy, startDragX, startDragY, false, true);
325 tryCompare(fakeWindow, "width", initialWindowWidth);325 tryCompare(fakeWindow, "width", initialWindowWidth);
326 tryCompare(fakeWindow, "height", initialWindowHeight);326 tryCompare(fakeWindow, "height", initialWindowHeight);
327 }327 }
@@ -385,7 +385,7 @@
385 windowRequestedHeightSpy.clear();385 windowRequestedHeightSpy.clear();
386 verify(windowRequestedHeightSpy.valid);386 verify(windowRequestedHeightSpy.valid);
387387
388 mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY, true, true, units.gu(.5), 10);388 mouseFlick(root, startDragX, startDragY, startDragX + deltaX, startDragY + deltaY);
389389
390 compare(windowRequestedWidthSpy.count, 1);390 compare(windowRequestedWidthSpy.count, 1);
391 compare(fakeWindow.width, initialWindowWidth + fakeWindow.widthIncrement);391 compare(fakeWindow.width, initialWindowWidth + fakeWindow.widthIncrement);
@@ -416,8 +416,7 @@
416 var endDragX = (fakeWindow.maximumWidth * 2) + 1;416 var endDragX = (fakeWindow.maximumWidth * 2) + 1;
417 var endDragY = (fakeWindow.maximumHeight * 2) + 1;417 var endDragY = (fakeWindow.maximumHeight * 2) + 1;
418418
419 mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,419 mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
420 true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
421420
422 compare(fakeWindow.requestedWidth, fakeWindow.maximumWidth);421 compare(fakeWindow.requestedWidth, fakeWindow.maximumWidth);
423 compare(fakeWindow.requestedHeight, fakeWindow.maximumHeight);422 compare(fakeWindow.requestedHeight, fakeWindow.maximumHeight);
@@ -446,8 +445,7 @@
446 var endDragX = (fakeWindow.minimumWidth * 0.5) + 1;445 var endDragX = (fakeWindow.minimumWidth * 0.5) + 1;
447 var endDragY = (fakeWindow.minimumHeight * 0.5) + 1;446 var endDragY = (fakeWindow.minimumHeight * 0.5) + 1;
448447
449 mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY,448 mouseFlick(fakeWindow, startDragX, startDragY, endDragX, endDragY);
450 true/*pressMouse*/, true/*releaseMouse*/, units.gu(.5)/*speed*/, 20/*iterations*/);
451449
452 compare(fakeWindow.requestedWidth, fakeWindow.minimumWidth);450 compare(fakeWindow.requestedWidth, fakeWindow.minimumWidth);
453 compare(fakeWindow.requestedHeight, fakeWindow.minimumHeight);451 compare(fakeWindow.requestedHeight, fakeWindow.minimumHeight);

Subscribers

People subscribed via source and target branches