From 89dffe860698ff2330ae576a507f67b41feff570 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 9 Nov 2011 13:49:39 +1000 Subject: Reduce flakiness of QNmeaPositionInfoSource unit test Change-Id: Id7f734c7933e2436ba345e1ac2d789da85fcbd56 Reviewed-by: Alex --- tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index cc35a2f3..1d97ac61 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -371,7 +371,13 @@ void TestQGeoPositionInfoSource::lastKnownPosition() if (positionValid) { QCOMPARE(info.coordinate(), lastPositioninfo.coordinate()); - QCOMPARE(info.timestamp(), lastPositioninfo.timestamp()); + // On some CI machines the above evenloop code is not sufficient as positionUpdated + // still fires causing last know position and last update to be out of sync. + // To accommodate we check that the time stamps are no more than 1s apart + // ideally they should be the same + // doesn't work: QCOMPARE(info.timestamp(), lastPositioninfo.timestamp()); + const qint64 diff = qAbs(info.timestamp().msecsTo(lastPositioninfo.timestamp())); + QCOMPARE(diff < 1000, true); QCOMPARE(info.hasAttribute(QGeoPositionInfo::HorizontalAccuracy), lastPositioninfo.hasAttribute(QGeoPositionInfo::HorizontalAccuracy)); -- cgit v1.2.1