From 7d7540991020d6824eaef861c68ea655b5d3314b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Mon, 28 Jun 2021 08:48:00 -0400 Subject: [PATCH] test: listen for announced not registered Change-Id: I64cdedb5f3a5131cab4ae85b8eaf3dd46102952e --- test/unitTest/conversation/conversation.cpp | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/unitTest/conversation/conversation.cpp b/test/unitTest/conversation/conversation.cpp index 904a45ed6d..3a67e1248d 100644 --- a/test/unitTest/conversation/conversation.cpp +++ b/test/unitTest/conversation/conversation.cpp @@ -951,8 +951,8 @@ ConversationTest::testSendMessageToMultipleParticipants() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -1344,8 +1344,8 @@ ConversationTest::testMemberBanNoBadFile() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -2190,8 +2190,8 @@ ConversationTest::testMemberCannotBanOther() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -2313,8 +2313,8 @@ ConversationTest::testCheckAdminFakeAVoteIsDetected() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -2395,8 +2395,8 @@ ConversationTest::testVoteNonEmpty() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -2630,8 +2630,8 @@ ConversationTest::testNoBadFileInInitialCommit() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } @@ -2773,8 +2773,8 @@ ConversationTest::testVoteNoBadFile() DRing::exportable_callback<DRing::ConfigurationSignal::VolatileDetailsChanged>( [&](const std::string&, const std::map<std::string, std::string>&) { auto details = carlaAccount->getVolatileAccountDetails(); - auto daemonStatus = details[DRing::Account::ConfProperties::Registration::STATUS]; - if (daemonStatus == "REGISTERED") { + auto deviceAnnounced = details[DRing::Account::VolatileProperties::DEVICE_ANNOUNCED]; + if (deviceAnnounced == "true") { carlaConnected = true; cv.notify_one(); } -- GitLab