summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2018-01-03 10:43:41 +0100
committerLars Knoll <lars.knoll@qt.io>2018-01-03 10:44:39 +0100
commit0da37161ef304f9b8d45d1ebe396f7758700fe07 (patch)
tree2de46ac6f693be8c56bbb704deabe66a64cc2611 /tests
parentd64f8cf1e05ef792362879d8901411eaab4e895a (diff)
parent5a9dd81f260f320b5af108c1a6b3d0b82a04f15d (diff)
downloadqtwebchannel-0da37161ef304f9b8d45d1ebe396f7758700fe07.tar.gz
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I2e72cb69fb077e22571ce4bdc69abace00c37e7a
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/webchannel/tst_webchannel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 6d6fa55..96838a9 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -788,7 +788,7 @@ void TestWebChannel::testAsyncObject()
{
QSignalSpy spy(&obj, &TestObject::propChanged);
channel.d_func()->publisher->invokeMethod(&obj, method, args);
- QVERIFY(spy.wait());
+ QTRY_COMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString());
}
@@ -804,10 +804,10 @@ void TestWebChannel::testAsyncObject()
{
QSignalSpy spy(&obj, &TestObject::replay);
QMetaObject::invokeMethod(&obj, "fire");
- QVERIFY(spy.wait());
+ QTRY_COMPARE(spy.count(), 1);
channel.deregisterObject(&obj);
QMetaObject::invokeMethod(&obj, "fire");
- QVERIFY(spy.wait());
+ QTRY_COMPARE(spy.count(), 2);
}
thread.quit();