Merge lp:~mzanetti/unity8/stabilize-swipeAwayGreeter into lp:unity8

[Michael Zanetti]

stabilize swipeAwayGreeter()

so far it was only used after loadShell() which calls
waitForGreeterToStabilize(). That however is not a requirement,
so let's call that on our own in swipeAwayGreeter();

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

there's a prereq

 * 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

[Daniel d'Andrada (dandrader)]

Then can you please remove the explicit waitForGreeterToStabilize() call from there?

"""
        function test_launchedAppHasActiveFocus(data) {
            loadShell(data.formFactor);
            shell.usageScenario = data.usageScenario;
            waitForGreeterToStabilize();
            swipeAwayGreeter();
"""

[lp:~mzanetti/unity8/stabilize-swipeAwayGreeter]

2203. By Michael Zanetti on 2016-02-16

drop now obsolete waitForGreeterToStabilize()

[Michael Zanetti (mzanetti)]

> Then can you please remove the explicit waitForGreeterToStabilize() call from
> there?
>
> """
> function test_launchedAppHasActiveFocus(data) {
> loadShell(data.formFactor);
> shell.usageScenario = data.usageScenario;
> waitForGreeterToStabilize();
> swipeAwayGreeter();
> """

done. couldn't find any other usages of waitForGreeterToStabilize() any more, except the ones that we really want in other helpers

[Daniel d'Andrada (dandrader)]

Thanks

* Did you perform an exploratory manual test run of the code change and any related functionality?
Not applicable

* Did CI run pass? If not, please explain why.
tst_Shell still pass in my machine, which is the only test that matters in this case

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2202
http://jenkins.qa.ubuntu.com/job/unity8-ci/7314/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6507
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/729/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1914
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1914
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27646
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/377/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/727
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27645

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

I saw a bunch of "shown" failures in tst_OrientedShell.qml as well in this log https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-vivid-ci-train-ppa-service-landing-050/vivid/amd64/u/unity8/20160301_070407@/log.gz

Does tst_OrientedShell.qml need an update too?

review: Needs Information

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-02-16 15:53:50 +0000
+++ tests/qmltests/tst_Shell.qml	2016-02-16 15:53:50 +0000
@@ -659,6 +659,7 @@
         function swipeAwayGreeter() {
             var greeter = findChild(shell, "greeter");
             tryCompare(greeter, "fullyShown", true);
+            waitForGreeterToStabilize();
             removeTimeConstraintsFromDirectionalDragAreas(greeter);
 
             var touchX = shell.width - (shell.edgeSize / 2);
@@ -833,7 +834,6 @@
         function test_launchedAppHasActiveFocus(data) {
             loadShell(data.formFactor);
             shell.usageScenario = data.usageScenario;
-            waitForGreeterToStabilize();
             swipeAwayGreeter();
 
             var webApp = ApplicationManager.startApplication("webbrowser-app");