Merge lp:~renatofilho/address-book-app/startup_time into lp:~fboucault/address-book-app/startup_time

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Merged at revision: 646
Proposed branch: lp:~renatofilho/address-book-app/startup_time
Merge into: lp:~fboucault/address-book-app/startup_time
Diff against target: 33 lines (+10/-0)
1 file modified
tests/qml/tst_ContactList.qml (+10/-0)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/startup_time
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Review via email: mp+310310@code.launchpad.net

Commit message

Fix tests.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/qml/tst_ContactList.qml'
--- tests/qml/tst_ContactList.qml 2015-10-26 13:18:11 +0000
+++ tests/qml/tst_ContactList.qml 2016-11-08 15:33:32 +0000
@@ -38,6 +38,7 @@
38 property string callbackApplication: ""38 property string callbackApplication: ""
39 property bool firstRun: true39 property bool firstRun: true
40 property bool disableOnlineAccounts: true40 property bool disableOnlineAccounts: true
41 property bool isOnline: false
4142
42 function elapsed()43 function elapsed()
43 {44 {
@@ -59,6 +60,12 @@
5960
60 MainView {61 MainView {
61 id: mainView62 id: mainView
63 pageStack: Item {
64 property var contactListPage: null
65 readonly property int columns: 1
66 readonly property bool hasKeyboard: false
67 }
68
62 anchors.fill: parent69 anchors.fill: parent
63 }70 }
6471
@@ -86,6 +93,9 @@
8693
87 function cleanup()94 function cleanup()
88 {95 {
96 //WORKAROUND: avoid problems with async object
97 //if the test run too fast it can cause problems with async objects
98 wait(1000)
89 root.contactListPageObj.destroy()99 root.contactListPageObj.destroy()
90 }100 }
91101

Subscribers

People subscribed via source and target branches