highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-25 11:20:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #18563: test: Fix unregister_all_during_call cleanup

Browse Source 
13d2a33537a403ac47a989be92109d3214375b6a Fix unregister_all_during_call cleanup (Russell Yanofsky)

Pull request description:

  Use `TestingSetup` fixture to fix `unregister_all_during_call` test not calling `UnregisterBackgroundSignalScheduler`, which could trigger an assert in `RegisterBackgroundSignalScheduler` when called in later tests

  Failure reported by fanquake https://github.com/bitcoin/bitcoin/pull/18551#issuecomment-610974251

ACKs for top commit:
  MarcoFalke:
    ACK 13d2a33537a403ac47a989be92109d3214375b6a if appveyor unit tests pass

Tree-SHA512: d2ec8ff14c54d97903af50031abfac1f38ec1c3aabc90371cfd5b79481fa69d3d77f339bfdf7d2178fd85e83402f72eda7cf4d339e5bbfa7e6e1a68836643b93
This commit is contained in:
MarcoFalke 2020-04-08 23:24:41 +08:00
commit 2392566284
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/validationinterface_tests.cpp
View File

@ -3,14 +3,14 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <consensus/validation.h> #include <consensus/validation.h>
#include <primitives/block.h> #include <primitives/block.h>
#include <scheduler.h> #include <scheduler.h>
#include <test/util/setup_common.h>
#include <util/check.h> #include <util/check.h>
#include <validationinterface.h> #include <validationinterface.h>
BOOST_AUTO_TEST_SUITE(validationinterface_tests) BOOST_FIXTURE_TEST_SUITE(validationinterface_tests, TestingSetup)
class TestInterface : public CValidationInterface class TestInterface : public CValidationInterface
{ {
@ -43,9 +43,6 @@ public:
BOOST_AUTO_TEST_CASE(unregister_all_during_call) BOOST_AUTO_TEST_CASE(unregister_all_during_call)
{ {
bool destroyed = false; bool destroyed = false;
CScheduler scheduler;
GetMainSignals().RegisterBackgroundSignalScheduler(scheduler);
RegisterSharedValidationInterface(std::make_shared<TestInterface>( RegisterSharedValidationInterface(std::make_shared<TestInterface>(
[&] { [&] {
// First call should decrements reference count 2 -> 1 // First call should decrements reference count 2 -> 1