From 29862231c0c7664aa945d5dbc67087354b45f578 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nicolas.pope@utu.fi>
Date: Tue, 10 May 2022 22:00:43 +0100
Subject: [PATCH] Remove use of onConnect in test
---
test/net_integration.cpp | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/test/net_integration.cpp b/test/net_integration.cpp
index c3879ca..b96b538 100644
--- a/test/net_integration.cpp
+++ b/test/net_integration.cpp
@@ -99,21 +99,11 @@ TEST_CASE("Listen and Connect", "[net]") {
auto p_connecting = ftl::connectNode(uri);
REQUIRE(p_connecting);
-
- bool disconnected_once = false;
- auto h = ftl::getSelf()->onConnect([&](const std::shared_ptr<ftl::protocol::Node> &p_listening) {
- if (!disconnected_once) {
- // disconnect on first connection
- disconnected_once = true;
- p_connecting->close(true);
- cv.notify_one();
- }
-
- return true;
- });
+ REQUIRE(p_connecting->waitConnection(5));
+ p_connecting->close(true);
- REQUIRE(cv.wait_for(lk, std::chrono::seconds(5)) == std::cv_status::no_timeout);
+ REQUIRE(p_connecting->status() != ftl::protocol::NodeStatus::kConnected);
REQUIRE(p_connecting->waitConnection(5));
}
--
GitLab