Merge lp:~dandrader/unity8/stabilizeShellTest into lp:unity8

[Daniel d'Andrada]

Stabilize some Shell qml tests

As they might fail if the test runs too fast.

I also did some coding style fixes along the way (added some missing ";") and updated/refactored test_login to reflect what happens currently.

I also did some coding style fixes along the way (added some missing ";").

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

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

* 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?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

[Albert Astals Cid (aacid)]

Looks good to me and tests still pass for me, but let's wait for top approval and make sure still pass on CI too

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

 * Did CI run pass?
Waiting

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

review: Approve

[lp:~dandrader/unity8/stabilizeShellTest]

1637. By Daniel d'Andrada on 2015-02-25

Update tst_login and add a helper showLogin() function

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1636
http://jenkins.qa.ubuntu.com/job/unity8-ci/5359/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/524
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1355
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1522
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1522/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18335

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Still looks good, next wait for CI run over 1637

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/unity8-ci/5360/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/525
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1524
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1524/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18339

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-02-23 15:43:41 +0000
+++ tests/qmltests/tst_Shell.qml	2015-02-25 14:38:52 +0000
@@ -317,8 +317,7 @@
 
             var greeter = findChild(shell, "greeter");
             if (data.greeterShown) {
-                LightDM.Greeter.showGreeter();
-                tryCompare(greeter, "fullyShown", true);
+                showGreeter();
             }
 
             if (data.revealLauncher) {
@@ -375,7 +374,15 @@
             tryCompare(greeter, "fullyShown", true);
 
             // Swipe away greeter to focus app
+
+            // greeter unloads its internal components when hidden
+            // and reloads them when shown. Thus we have to do this
+            // again before interacting with it otherwise any
+            // DirectionalDragAreas in there won't be easily fooled by
+            // fake swipes.
+            removeTimeConstraintsFromDirectionalDragAreas(greeter);
             swipeAwayGreeter();
+
             tryCompare(ApplicationManager, "suspended", false);
             compare(mainApp.state, ApplicationInfoInterface.Running);
             tryCompare(ApplicationManager, "focusedApplicationId", mainAppId);
@@ -593,11 +600,25 @@
                 && itemRectInShell.y + itemRectInShell.height <= shell.height;
         }
 
+        function showGreeter() {
+            var greeter = findChild(shell, "greeter");
+            LightDM.Greeter.showGreeter();
+            waitForRendering(greeter);
+            tryCompare(greeter, "fullyShown", true);
+
+            // greeter unloads its internal components when hidden
+            // and reloads them when shown. Thus we have to do this
+            // again before interacting with it otherwise any
+            // DirectionalDragAreas in there won't be easily fooled by
+            // fake swipes.
+            removeTimeConstraintsFromDirectionalDragAreas(greeter);
+        }
+
         function test_greeterDoesNotChangeIndicatorProfile() {
             var panel = findChild(shell, "panel");
             tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
 
-            LightDM.Greeter.showGreeter();
+            showGreeter();
             tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
 
             LightDM.Greeter.hideGreeter();
@@ -632,8 +653,7 @@
 
             waitUntilDashIsFocused();
 
-            LightDM.Greeter.showGreeter();
-            tryCompare(greeter, "fullyShown", true);
+            showGreeter();
 
             // The main point of this test
             ApplicationManager.requestFocusApplication("dialer-app");
@@ -664,15 +684,13 @@
             tryCompare(greeter, "shown", false)
         }
 
-        function test_login() {
-            var greeter = findChild(shell, "greeter")
-            waitForRendering(greeter)
-            LightDM.Greeter.showGreeter();
-            tryCompare(greeter, "fullyShown", true)
-
+        function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
             sessionSpy.clear();
-            swipeAwayGreeter()
-            tryCompare(sessionSpy, "count", 1)
+            verify(sessionSpy.valid);
+
+            showGreeter();
+
+            tryCompare(sessionSpy, "count", 1);
         }
 
         function test_fullscreen() {