diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-18 11:02:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 11:02:28 +0100 |
commit | 97d2deb55b854fd2b97efc0a5b41da28444c6e78 (patch) | |
tree | 145b4aa0d4c30fa744ec90782351806e0296d3ca /tests | |
parent | 6701ff310933ec33f9199b53d78299764f646387 (diff) | |
parent | 2661593df95b8a5a56af0a8fd22af5be7f7ea8fb (diff) | |
download | qtwebchannel-97d2deb55b854fd2b97efc0a5b41da28444c6e78.tar.gz |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: Ib5e52f5be22b5a6430c4dfe731b0a0fe74ba0617
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp index 602a101..436a38e 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(); |