diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -147,9 +147,6 @@ BOOST_REQUIRE(control.Wait()); if (FakeCheckCheckCompletion::n_calls != i) { BOOST_REQUIRE_EQUAL(FakeCheckCheckCompletion::n_calls, i); - BOOST_TEST_MESSAGE("Failure on trial " - << i << " expected, got " - << FakeCheckCheckCompletion::n_calls); } } tg.interrupt_all(); diff --git a/src/test/rcu_tests.cpp b/src/test/rcu_tests.cpp --- a/src/test/rcu_tests.cpp +++ b/src/test/rcu_tests.cpp @@ -131,6 +131,9 @@ tlock.join(); tsync.join(); } + + // Needed to suppress "Test case [...] did not check any assertions" + BOOST_CHECK(true); } BOOST_AUTO_TEST_CASE(cleanup_test) { diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -204,17 +204,17 @@ CDataStream ds(in, 0, 0); // read 0 bytes used to cause a segfault on some older systems. - ds.read(nullptr, 0); + BOOST_CHECK_NO_THROW(ds.read(nullptr, 0)); // Same goes for writing 0 bytes from a vector ... const std::vector vdata{'f', 'o', 'o', 'b', 'a', 'r'}; - ds.insert(ds.begin(), vdata.begin(), vdata.begin()); - ds.insert(ds.begin(), vdata.begin(), vdata.end()); + BOOST_CHECK_NO_THROW(ds.insert(ds.begin(), vdata.begin(), vdata.begin())); + BOOST_CHECK_NO_THROW(ds.insert(ds.begin(), vdata.begin(), vdata.end())); // ... or an array. const char adata[6] = {'f', 'o', 'o', 'b', 'a', 'r'}; - ds.insert(ds.begin(), &adata[0], &adata[0]); - ds.insert(ds.begin(), &adata[0], &adata[6]); + BOOST_CHECK_NO_THROW(ds.insert(ds.begin(), &adata[0], &adata[0])); + BOOST_CHECK_NO_THROW(ds.insert(ds.begin(), &adata[0], &adata[6])); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -60,7 +60,11 @@ fCheckBlockIndex = true; SelectParams(chainName); - noui_connect(); + static bool noui_connected = false; + if (!noui_connected) { + noui_connect(); + noui_connected = true; + } } BasicTestingSetup::~BasicTestingSetup() { diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp --- a/src/test/torcontrol_tests.cpp +++ b/src/test/torcontrol_tests.cpp @@ -19,7 +19,6 @@ static void CheckSplitTorReplyLine(std::string input, std::string command, std::string args) { - BOOST_TEST_MESSAGE(std::string("CheckSplitTorReplyLine(") + input + ")"); auto ret = SplitTorReplyLine(input); BOOST_CHECK_EQUAL(ret.first, command); BOOST_CHECK_EQUAL(ret.second, args); @@ -57,7 +56,6 @@ static void CheckParseTorReplyMapping(std::string input, std::map expected) { - BOOST_TEST_MESSAGE(std::string("CheckParseTorReplyMapping(") + input + ")"); auto ret = ParseTorReplyMapping(input); BOOST_CHECK_EQUAL(ret.size(), expected.size()); auto r_it = ret.begin(); @@ -167,7 +165,6 @@ // Special handling for null case // (needed because string comparison reads the null as end-of-string) - BOOST_TEST_MESSAGE(std::string("CheckParseTorReplyMapping(Null=\"\\0\")")); auto ret = ParseTorReplyMapping("Null=\"\\0\""); BOOST_CHECK_EQUAL(ret.size(), 1U); auto r_it = ret.begin(); diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -36,7 +36,11 @@ do { TRY_LOCK(cs, lockTest); - if (lockTest) break; + if (lockTest) { + // Needed to suppress "Test case [...] did not check any assertions" + BOOST_CHECK(true); + break; + } BOOST_ERROR("break was swallowed!"); } while (0); diff --git a/src/wallet/test/coinselector_tests.cpp b/src/wallet/test/coinselector_tests.cpp --- a/src/wallet/test/coinselector_tests.cpp +++ b/src/wallet/test/coinselector_tests.cpp @@ -148,7 +148,6 @@ ///////////////////////// // Known Outcome tests // ///////////////////////// - BOOST_TEST_MESSAGE("Testing known outcomes"); // Empty utxo pool BOOST_CHECK(!SelectCoinsBnB(GroupCoins(utxo_pool), 1 * CENT, CENT / 2,