StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

test: Fix signal spy mixup for core_online_test

Browse Source 
* Fix statusMessage -> userName mixup in change_status_message
* Create named constant for sleep interval waiting for friend's message to arrive
* Elaborate on comments around the sleeps a bit more, I was confused by them still
* Increase bootstrap timeout to 120s, it expired in CI at 65s
This commit is contained in:
Anthony Bilinski 2022-02-26 07:56:27 -08:00
parent e2d0472a9f
commit 12b3b05217
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/core/core_online_test.cpp
View File

@ -94,8 +94,9 @@ QList<DhtServer> MockNodeListGenerator::getBootstrapnodes() const {
} }
namespace { namespace {
const int network_timeout = 60000; // timeout for operations happening online const int bootstrap_timeout = 120000; // timeout for bootstrapping
const int local_timeout = 500; // timeout for operations happening offline const int local_timeout = 500; // timeout for operations happening offline
const int connected_message_timeout = 15000; // timeout for alice and bob messaging
} }
class TestCoreOnline : public QObject class TestCoreOnline : public QObject
@ -134,7 +135,7 @@ void TestCoreOnline::init()
bob->start(); bob->start();
// Wait for both instances coming online // Wait for both instances coming online
QTRY_VERIFY_WITH_TIMEOUT(spyAliceOnline.count() >= 1 && spyBobOnline.count() >= 1, network_timeout); QTRY_VERIFY_WITH_TIMEOUT(spyAliceOnline.count() >= 1 && spyBobOnline.count() >= 1, bootstrap_timeout);
// Make a friend request from alice to bob // Make a friend request from alice to bob
const QLatin1String friendMsg{"Test Invite Message"}; const QLatin1String friendMsg{"Test Invite Message"};
@ -143,8 +144,8 @@ void TestCoreOnline::init()
QSignalSpy spyAliceFriendMsg(alice.get(), &Core::requestSent); QSignalSpy spyAliceFriendMsg(alice.get(), &Core::requestSent);
alice->requestFriendship(bob->getSelfId(), friendMsg); alice->requestFriendship(bob->getSelfId(), friendMsg);
// Wait for both instances coming online // Wait for friend message to be received
QTRY_VERIFY_WITH_TIMEOUT(spyBobFriendMsg.count() == 1 && spyAliceFriendMsg.count() == 1, network_timeout); QTRY_VERIFY_WITH_TIMEOUT(spyBobFriendMsg.count() == 1 && spyAliceFriendMsg.count() == 1, bootstrap_timeout);
// Check for expected signal content // Check for expected signal content
QVERIFY(qvariant_cast<ToxPk>(spyBobFriendMsg[0][0]) == alice->getSelfPublicKey()); QVERIFY(qvariant_cast<ToxPk>(spyBobFriendMsg[0][0]) == alice->getSelfPublicKey());
@ -160,9 +161,7 @@ void TestCoreOnline::init()
QSignalSpy spyAliceFriendOnline(alice.get(), &Core::friendStatusChanged); QSignalSpy spyAliceFriendOnline(alice.get(), &Core::friendStatusChanged);
QSignalSpy spyBobFriendOnline(bob.get(), &Core::friendStatusChanged); QSignalSpy spyBobFriendOnline(bob.get(), &Core::friendStatusChanged);
// FIXME: Check if this is reliable even with CoreExt QTRY_VERIFY_WITH_TIMEOUT(spyAliceFriendOnline.count() >= 1 && spyBobFriendOnline.count() >= 1, bootstrap_timeout);
// Wait for both instances being online
QTRY_VERIFY_WITH_TIMEOUT(spyAliceFriendOnline.count() >= 1 && spyBobFriendOnline.count() >= 1, network_timeout);
// Check for expected signal content // Check for expected signal content
QVERIFY(spyAliceFriendOnline[0][0].toInt() == static_cast<int>(Status::Status::Online)); QVERIFY(spyAliceFriendOnline[0][0].toInt() == static_cast<int>(Status::Status::Online));
@ -192,14 +191,14 @@ void TestCoreOnline::change_name()
local_timeout); local_timeout);
QTRY_VERIFY_WITH_TIMEOUT(bobUsernameChangeReceived.count() == 1 && QTRY_VERIFY_WITH_TIMEOUT(bobUsernameChangeReceived.count() == 1 &&
bobUsernameChangeReceived[0][1].toString() == aliceName, network_timeout); bobUsernameChangeReceived[0][1].toString() == aliceName, connected_message_timeout);
// Setting the username again to the same value shoud NOT trigger any signals // Setting the username again to the same value shoud NOT trigger any signals
alice->setUsername(aliceName); alice->setUsername(aliceName);
// Need to sleep here, because QTRY_VERIFY_WITH_TIMEOUT would immideatly trigger // Need to sleep here, because we're testing that these don't increase based on
QTest::qSleep(1000); // Alice re-setting her username, so QTRY_VERIFY_WITH_TIMEOUT would return immediately.
QTest::qSleep(connected_message_timeout);
QVERIFY(aliceSaveRequest.count() == 1); QVERIFY(aliceSaveRequest.count() == 1);
QVERIFY(aliceUsernameChanged.count() == 1); QVERIFY(aliceUsernameChanged.count() == 1);
QVERIFY(bobUsernameChangeReceived.count() == 1); QVERIFY(bobUsernameChangeReceived.count() == 1);
@ -211,8 +210,8 @@ void TestCoreOnline::change_status_message()
const QLatin1String aliceStatusMsg{"Testing a lot"}; const QLatin1String aliceStatusMsg{"Testing a lot"};
QSignalSpy aliceSaveRequest(alice.get(), &Core::saveRequest); QSignalSpy aliceSaveRequest(alice.get(), &Core::saveRequest);
QSignalSpy aliceStatusMsgChanged(alice.get(), &Core::usernameSet); QSignalSpy aliceStatusMsgChanged(alice.get(), &Core::statusMessageSet);
QSignalSpy bobStatusMsgChangeReceived(bob.get(), &Core::friendUsernameChanged); QSignalSpy bobStatusMsgChangeReceived(bob.get(), &Core::friendStatusMessageChanged);
alice->setStatusMessage(aliceStatusMsg); alice->setStatusMessage(aliceStatusMsg);
@ -222,14 +221,14 @@ void TestCoreOnline::change_status_message()
local_timeout); local_timeout);
QTRY_VERIFY_WITH_TIMEOUT(bobStatusMsgChangeReceived.count() == 1 && QTRY_VERIFY_WITH_TIMEOUT(bobStatusMsgChangeReceived.count() == 1 &&
bobStatusMsgChangeReceived[0][1].toString() == aliceStatusMsg, network_timeout); bobStatusMsgChangeReceived[0][1].toString() == aliceStatusMsg, connected_message_timeout);
// Setting the status message again to the same value shoud NOT trigger any signals // Setting the status message again to the same value shoud NOT trigger any signals
alice->setStatusMessage(aliceStatusMsg); alice->setStatusMessage(aliceStatusMsg);
// Need to sleep here, because QTRY_VERIFY_WITH_TIMEOUT would immideatly trigger // Need to sleep here, because we're testing that these don't increase based on
QTest::qSleep(1000); // Alice re-setting her status message, so QTRY_VERIFY_WITH_TIMEOUT would return immediately.
QTest::qSleep(connected_message_timeout);
QVERIFY(aliceSaveRequest.count() == 1); QVERIFY(aliceSaveRequest.count() == 1);
QVERIFY(aliceStatusMsgChanged.count() == 1); QVERIFY(aliceStatusMsgChanged.count() == 1);
QVERIFY(bobStatusMsgChangeReceived.count() == 1); QVERIFY(bobStatusMsgChangeReceived.count() == 1);
@ -250,7 +249,7 @@ void TestCoreOnline::change_status()
QTRY_VERIFY_WITH_TIMEOUT(bobStatusChangeReceived.count() == 1 && QTRY_VERIFY_WITH_TIMEOUT(bobStatusChangeReceived.count() == 1 &&
qvariant_cast<Status::Status>(bobStatusChangeReceived[0][1]) == Status::Status::Away, qvariant_cast<Status::Status>(bobStatusChangeReceived[0][1]) == Status::Status::Away,
network_timeout); connected_message_timeout);
// Setting the status message again to the same value again triggers all signals // Setting the status message again to the same value again triggers all signals
alice->setStatus(Status::Status::Away); alice->setStatus(Status::Status::Away);
@ -261,8 +260,9 @@ void TestCoreOnline::change_status()
qvariant_cast<Status::Status>(aliceStatusChanged[1][0]) == Status::Status::Away, qvariant_cast<Status::Status>(aliceStatusChanged[1][0]) == Status::Status::Away,
local_timeout); local_timeout);
// Toxcore will filter these, even though we set it // Need to sleep here, because we're testing that we don't get a new signal for the re-set but
QTest::qSleep(1000); // unchanged status, so QTRY_VERIFY_WITH_TIMEOUT would return immediately.
QTest::qSleep(connected_message_timeout);
QVERIFY(bobStatusChangeReceived.count() == 1); QVERIFY(bobStatusChangeReceived.count() == 1);
} }