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

[Albert Astals Cid]

Make the test more stable

was failing in some cases because the reset animation had not finished yet

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

 * 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

[lp:~aacid/unity8/even_more_stable_page_header_test]

1905. By Albert Astals Cid on 2015-08-06

;; -> ;

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1905
http://jenkins.qa.ubuntu.com/job/unity8-ci/6158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/397/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/398/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/504/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
ci fails these days
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

[lp:~aacid/unity8/even_more_stable_page_header_test]

1906. By Albert Astals Cid on 2015-08-13

Merge unity8

1907. By Albert Astals Cid on 2015-08-13

no ; here

[Andrea Cimitan (cimi)]

review: Approve

=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
--- tests/qmltests/Dash/tst_PageHeader.qml	2015-07-14 08:32:35 +0000
+++ tests/qmltests/Dash/tst_PageHeader.qml	2015-08-13 14:20:26 +0000
@@ -33,13 +33,18 @@
 
         property alias searchEnabled : pageHeader.searchEntryEnabled
         property alias searchQuery : pageHeader.searchQuery
+        property var headerContainer: findChild(pageHeader, "headerContainer")
 
         function doTypeString(text) {
-            var headerContainer = findChild(pageHeader, "headerContainer");
             tryCompare(headerContainer, "contentY", 0);
             typeString(text);
         }
 
+        function doResetSearch() {
+            pageHeader.resetSearch();
+            tryCompare(headerContainer, "contentY", headerContainer.height);
+        }
+
         function init() {
             searchEnabled = true;
 
@@ -49,14 +54,13 @@
             pageHeader.searchHistory.clear();
 
             // Check initial state
-            var headerContainer = findChild(pageHeader, "headerContainer");
             tryCompareFunction(function() { return headerContainer.popover === null; }, true);
             compare(pageHeader.searchHistory.count, 0);
         }
 
         function test_search_disabled() {
             searchEnabled = false
-            pageHeader.resetSearch()
+            doResetSearch();
 
             pageHeader.triggerSearch()
             keyClick(Qt.Key_S)
@@ -66,7 +70,7 @@
 
         function test_search_enable() {
             searchEnabled = true
-            pageHeader.resetSearch()
+            doResetSearch();
 
             pageHeader.triggerSearch()
             doTypeString("test")
@@ -84,42 +88,42 @@
 
         function test_reset_search() {
             searchEnabled = true
-            pageHeader.resetSearch()
+            doResetSearch();
 
             pageHeader.triggerSearch()
             keyClick(Qt.Key_S)
 
             compare(searchQuery, "s", "Could not type in TextField.")
 
-            pageHeader.resetSearch()
+            doResetSearch();
             compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
         }
 
         function test_history() {
             pageHeader.triggerSearch()
             doTypeString("humppa1")
-            pageHeader.resetSearch()
+            doResetSearch();
 
             tryCompare(pageHeader.searchHistory, "count", 1)
             compare(pageHeader.searchHistory.get(0).query, "humppa1")
 
             pageHeader.triggerSearch()
             doTypeString("humppa2")
-            pageHeader.resetSearch()
+            doResetSearch();
 
             compare(pageHeader.searchHistory.count, 2)
             compare(pageHeader.searchHistory.get(0).query, "humppa2")
 
             pageHeader.triggerSearch()
             doTypeString("humppa3")
-            pageHeader.resetSearch()
+            doResetSearch();
 
             compare(pageHeader.searchHistory.count, 3)
             compare(pageHeader.searchHistory.get(0).query, "humppa3")
 
             pageHeader.triggerSearch()
             doTypeString("humppa4")
-            pageHeader.resetSearch()
+            doResetSearch();
 
             compare(pageHeader.searchHistory.count, 3)
             compare(pageHeader.searchHistory.get(0).query, "humppa4")
@@ -139,7 +143,7 @@
         }
 
         function cleanup() {
-            pageHeader.resetSearch();
+            doResetSearch();
         }
 
         function test_popover() {
@@ -223,7 +227,7 @@
             tryCompare(headerContainer, "showSearch", !data.hideSearch);
             tryCompareFunction(function() { return headerContainer.popover === null; }, true);
 
-            pageHeader.resetSearch();
+            doResetSearch();
         }
 
         function test_search_change_shows_search() {