From 19a4729bf2d07f481f41004ee35315966840147d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 14 Apr 2022 20:12:17 -0400
Subject: [PATCH] test/dhtrunner: use random port, add more assertions
---
tests/dhtrunnertester.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tests/dhtrunnertester.cpp b/tests/dhtrunnertester.cpp
index 9354ec55..13cc458b 100644
--- a/tests/dhtrunnertester.cpp
+++ b/tests/dhtrunnertester.cpp
@@ -36,8 +36,8 @@ DhtRunnerTester::setUp() {
config.dht_config.node_config.max_peer_req_per_sec = -1;
config.dht_config.node_config.max_req_per_sec = -1;
- node1.run(42222, config);
- node2.run(42232, config);
+ node1.run(0, config);
+ node2.run(0, config);
node2.bootstrap(node1.getBound());
}
@@ -54,15 +54,17 @@ DhtRunnerTester::tearDown() {
node1.shutdown(shutdown);
node2.shutdown(shutdown);
std::unique_lock<std::mutex> lk(cv_m);
- CPPUNIT_ASSERT(cv.wait_for(lk, 12s, [&]{ return done == 2; }));
+ CPPUNIT_ASSERT(cv.wait_for(lk, 30s, [&]{ return done == 2u; }));
node1.join();
node2.join();
}
void
DhtRunnerTester::testConstructors() {
- CPPUNIT_ASSERT(node1.getBoundPort() == 42222);
- CPPUNIT_ASSERT(node2.getBoundPort() == 42232);
+ CPPUNIT_ASSERT(node1.getBoundPort());
+ CPPUNIT_ASSERT_EQUAL(node1.getBoundPort(), node1.getBound().getPort());
+ CPPUNIT_ASSERT(node2.getBoundPort());
+ CPPUNIT_ASSERT_EQUAL(node2.getBoundPort(), node2.getBound().getPort());
dht::DhtRunner::Config config {};
dht::DhtRunner::Context context {};
--
GitLab