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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1208
Merged at revision: 1220
Proposed branch: lp:~aacid/unity8/pageHeaderLabelTestValgrind
Merge into: lp:unity8
Diff against target: 21 lines (+3/-1)
1 file modified
tests/qmltests/Dash/tst_PageHeader.qml (+3/-1)
To merge this branch: bzr merge lp:~aacid/unity8/pageHeaderLabelTestValgrind
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+232420@code.launchpad.net

Commit message

Make the PageHeaderLabelTest pass under valgrind

Description of the change

 * 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

To post a comment you must log in.
1207. By Albert Astals Cid

Add verify

1208. By Albert Astals Cid

? -> ;

Revision history for this message
Michał Sawicz (saviq) wrote :

 * 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
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
2--- tests/qmltests/Dash/tst_PageHeader.qml 2014-08-13 11:56:16 +0000
3+++ tests/qmltests/Dash/tst_PageHeader.qml 2014-08-27 14:40:33 +0000
4@@ -94,7 +94,7 @@
5 typeString("humppa1")
6 pageHeader.resetSearch()
7
8- compare(pageHeader.searchHistory.count, 1)
9+ tryCompare(pageHeader.searchHistory, "count", 1)
10 compare(pageHeader.searchHistory.get(0).query, "humppa1")
11
12 pageHeader.triggerSearch()
13@@ -155,6 +155,8 @@
14 compare(searchTextField.focus, true);
15
16 var recentSearches = findChild(headerContainer.popover, "recentSearches");
17+ verify(recentSearches, "Could not find recent searches in the popover");
18+ waitForRendering(recentSearches);
19 mouseClick(recentSearches.itemAt(0), 0, 0);
20
21 compare(pageHeader.searchQuery, "Search2");

Subscribers

People subscribed via source and target branches