diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-09-06 10:10:47 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-09-06 10:11:31 +0200 |
| commit | de4e125aff5aa9feb2a6a36c22047d354df0cf94 (patch) | |
| tree | 6fa6a0641d47d09d4325dd511a2576c4804664e7 /tests/auto/declarative_core | |
| parent | ffbdf2cf0517cc773a012dc07f17532297e03d8d (diff) | |
| parent | ffb10da5ad4d3ff200fbca9438538cc5102296e3 (diff) | |
| download | qtlocation-de4e125aff5aa9feb2a6a36c22047d354df0cf94.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ia305efe8c4b616ed70309dfcae47f39cd1a4c4da
Diffstat (limited to 'tests/auto/declarative_core')
| -rw-r--r-- | tests/auto/declarative_core/tst_routing.qml | 9 |
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) |