summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-09-25 11:48:21 (GMT)
committermread <qt-info@nokia.com>2009-09-25 11:53:16 (GMT)
commit5b6799dffbd8ffc0c5943bf7dc35c945db0ae5ec (patch)
tree1338eb1f4e6eef5c2ba85c5b0fb3fc55d7da3b71
parent5897e2b3eb54eee3b04c9d949890e254e20152d4 (diff)
downloadQt-5b6799dffbd8ffc0c5943bf7dc35c945db0ae5ec.zip
Qt-5b6799dffbd8ffc0c5943bf7dc35c945db0ae5ec.tar.gz
Qt-5b6799dffbd8ffc0c5943bf7dc35c945db0ae5ec.tar.bz2
tst_qfilesystemwatcher directory changed test relaxed
The polling watcher was generating two events for directory content deletion on Symbian emulator. 1 for content change, 1 for time change. Seems within the bounds of reason for a poller, so test relaxed to allow it. Reviewed-by: Liang QI
-rw-r--r--tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 32cbed3..88bf229 100644
--- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -515,7 +515,9 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory()
timer.start(3000);
eventLoop.exec();
QCOMPARE(fileChangedSpy.count(), 0);
- QCOMPARE(dirChangedSpy.count(), 1);
+ // polling watcher has generated separate events for content and time change
+ // on Symbian emulator, so allow possibility of 2 events
+ QVERIFY(dirChangedSpy.count() == 1 || dirChangedSpy.count() == 2);
QVERIFY(QDir().rmdir("testDir"));
}