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

[Albert Astals Cid]

Make the PageHeaderLabelTest pass under valgrind

 * 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?
It's only test change.

 * 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/pageHeaderLabelTestValgrind]

1207. By Albert Astals Cid on 2014-08-27

Add verify

1208. By Albert Astals Cid on 2014-08-27

? -> ;

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Waiting

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1207
http://jenkins.qa.ubuntu.com/job/unity8-ci/4140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4125
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12217

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
--- tests/qmltests/Dash/tst_PageHeader.qml	2014-08-13 11:56:16 +0000
+++ tests/qmltests/Dash/tst_PageHeader.qml	2014-08-27 14:40:33 +0000
@@ -94,7 +94,7 @@
             typeString("humppa1")
             pageHeader.resetSearch()
 
-            compare(pageHeader.searchHistory.count, 1)
+            tryCompare(pageHeader.searchHistory, "count", 1)
             compare(pageHeader.searchHistory.get(0).query, "humppa1")
 
             pageHeader.triggerSearch()
@@ -155,6 +155,8 @@
             compare(searchTextField.focus, true);
 
             var recentSearches = findChild(headerContainer.popover, "recentSearches");
+            verify(recentSearches, "Could not find recent searches in the popover");
+            waitForRendering(recentSearches);
             mouseClick(recentSearches.itemAt(0), 0, 0);
 
             compare(pageHeader.searchQuery, "Search2");