From 9b9f12d87e820ee50b97d17d97de650fd6fe86fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 8 Apr 2019 15:58:46 -0400
Subject: [PATCH] tests: accept null token if callback returns false
---
tests/dhtrunnertester.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/dhtrunnertester.cpp b/tests/dhtrunnertester.cpp
index 14e3f1db..87c43838 100644
--- a/tests/dhtrunnertester.cpp
+++ b/tests/dhtrunnertester.cpp
@@ -119,17 +119,16 @@ DhtRunnerTester::testListen() {
CPPUNIT_ASSERT(ftokenc.valid());
auto tokena = ftokena.get();
- auto tokenb = ftokenb.get();
auto tokenc = ftokenc.get();
+ // tokenb might be 0 since the callback returns false.
CPPUNIT_ASSERT(tokena);
- CPPUNIT_ASSERT(tokenb);
CPPUNIT_ASSERT(tokenc);
CPPUNIT_ASSERT_EQUAL(N + 1u, valueCount.load());
node1.cancelListen(a, tokena);
- node1.cancelListen(b, tokena);
- node1.cancelListen(c, tokena);
+ node1.cancelListen(b, std::move(ftokenb));
+ node1.cancelListen(c, tokenc);
}
} // namespace test
--
GitLab