summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-09-01 14:53:18 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-09-03 05:30:28 +0000
commit79dc087b3dcc151c1571f7628f5b0e1d7bf9fc84 (patch)
tree23a0896a102dbabda266a406e96c450ac3daccaf
parent2898098f65d1ddb5f4ceeedac06786c2cda8a611 (diff)
Harden the Routing QML testv5.6.0-alpha1
We cannot rely on the CI to respond on time after small timeouts like 200ms. Change-Id: I6569e0288e204a5e2096833abd086f3f61020239 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
-rw-r--r--tests/auto/declarative_core/tst_routing.qml9
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/declarative_core/tst_routing.qml b/tests/auto/declarative_core/tst_routing.qml
index f29c7dd3..3567bc1a 100644
--- a/tests/auto/declarative_core/tst_routing.qml
+++ b/tests/auto/declarative_core/tst_routing.qml
@@ -622,8 +622,7 @@ Item {
compare (routeModelSlack.count, 0)
// Check that results are cleared
routeModelSlack.update()
- wait (300)
- compare (routeModelSlack.count, 3) // numberALternativeRoutes
+ tryCompare(routeModelSlack, "count", 3) // numberALternativeRoutes
routeModelSlack.reset()
compare (routeModelSlack.count, 0)
// Check that changing plugin resets any ongoing requests
@@ -716,8 +715,7 @@ Item {
wait (100)
compare (testRoutesSlackSpy.count, 0)
compare (testCountSlackSpy.count, 0)
- wait (200)
- compare (testRoutesSlackSpy.count, 1)
+ tryCompare(testRoutesSlackSpy, "count", 1)
compare (testCountSlackSpy.count, 1)
compare(routeModelSlack.count, 1)
compare (routeModelSlack.get(0).path.length, 5)
@@ -743,8 +741,7 @@ Item {
wait (100)
compare(testRoutesSlackSpy.count, 0)
compare(testCountSlackSpy.count, 0)
- wait (200)
- compare (testRoutesSlackSpy.count, 1)
+ tryCompare(testRoutesSlackSpy, "count", 1)
compare(testCountSlackSpy.count, 1)
compare(routeModelSlack.count, 1)