Skip to content

Commit 948bb36

Browse files
committed
Merge #2366: [test] validation_block_tests: Correcting BOOST_ASSERT_MSG usage for dynamic messages.
8ff6fa2 [test] validation_block_tests: New ASSERT_WITH_MSG to print dynamic error messages. (furszy) Pull request description: Bug discovered checking GA failing reason in #2314 --> [job](https://github.com/PIVX-Project/PIVX/pull/2314/checks?check_run_id=2509761057) Essentially, `BOOST_ASSERT_MSG` only prints static string messages. As we are inputting a dynamic message, the value isn't being printed if the test fails. So, have added a new function `ASSERT_WITH_MSG(cond, msg)` to support dynamic error messages. ACKs for top commit: random-zebra: ACK 8ff6fa2 and merging... (this means another rebase for #2360) Tree-SHA512: a47c8f94a497696a5bbb2b09b01f8dd1711b898a3d363211d12c79fd92b67a4f4d255a2c97ae192e17ccab706a604e16140a18bc7ea3f3539e8fad4559351902
2 parents d57c950 + 8ff6fa2 commit 948bb36

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/test/validation_block_tests.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include "validation.h"
1515
#include "validationinterface.h"
1616

17+
#define ASSERT_WITH_MSG(cond, msg) if (!cond) { BOOST_ERROR(msg); }
18+
1719
struct RegtestingSetup : public TestingSetup {
1820
RegtestingSetup() : TestingSetup(CBaseChainParams::REGTEST) {}
1921
};
@@ -157,7 +159,7 @@ BOOST_AUTO_TEST_CASE(processnewblock_signals_ordering)
157159
if (state.GetRejectReason() == "duplicate" ||
158160
state.GetRejectReason() == "prevblk-not-found" ||
159161
state.GetRejectReason() == "bad-prevblk") continue;
160-
BOOST_ASSERT_MSG(processed, ("Error: " + state.GetRejectReason()).c_str());
162+
ASSERT_WITH_MSG(!processed, ("Error: " + state.GetRejectReason()).c_str());
161163
}
162164
}
163165
});

0 commit comments

Comments
 (0)