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

[Albert Astals Cid]

Make sure the height it's the height it will have

Otherwise it can happen that we go to the next test and height is still growing and then we try to flick/click on things that are no longer where we thought they were

 * 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?
No, test change only

 * 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

[Mirco Müller (macslow)]

lgtm

Furthermore... 100 of 100 test-runs under xvfb passed without error.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1613
http://jenkins.qa.ubuntu.com/job/unity8-ci/5320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1357
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1355
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1355/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18055

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

review: Approve (continuous-integration)

=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
--- tests/qmltests/Notifications/tst_Notifications.qml	2015-02-06 15:15:37 +0000
+++ tests/qmltests/Notifications/tst_Notifications.qml	2015-02-13 11:40:27 +0000
@@ -563,6 +563,7 @@
                 verify(notification !== undefined, "notification wasn't found");
 
                 waitForRendering(notification);
+                tryCompare(notification, "height", notification.state === "contracted" ? units.gu(10) : notification.implicitHeight);
 
                 var icon = findChild(notification, "icon")
                 var centeredIcon = findChild(notification, "centeredIcon")
@@ -602,6 +603,13 @@
                 compare(bodyLabel.visible, data.bodyVisible, "body-text visibility is incorrect")
                 compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")
 
+                // After clicking the state of notifications can change so let's wait
+                // for their height animations to finish before continuing
+                for (var i = 0; i < mockModel.count; ++i) {
+                    var n = findChild(notifications, "notification" + i)
+                    tryCompare(n, "height", n.state === "contracted" ? units.gu(10) : n.implicitHeight);
+                }
+
                 if (data.hasSound) {
                     var audioItem = findInvisibleChild(notification, "sound")
                     compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")