mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

test: Setup networking globally

Browse Source
This commit is contained in:
Hennadii Stepanov 2023-11-28 19:11:52 +00:00
parent 31ce305d46
commit fd4c6a10f2
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/system.h
View File

@ -21,7 +21,7 @@
int64_t GetStartupTime(); int64_t GetStartupTime();
void SetupEnvironment(); void SetupEnvironment();
bool SetupNetworking(); [[nodiscard]] bool SetupNetworking();
#ifndef WIN32 #ifndef WIN32
std::string ShellEscape(const std::string& arg); std::string ShellEscape(const std::string& arg);
#endif #endif

11
src/test/util/setup_common.cpp
View File

@ -49,6 +49,7 @@
#include <txdb.h> #include <txdb.h>
#include <txmempool.h> #include <txmempool.h>
#include <util/chaintype.h> #include <util/chaintype.h>
#include <util/check.h>
#include <util/rbf.h> #include <util/rbf.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/string.h> #include <util/string.h>
@ -88,6 +89,15 @@ std::ostream& operator<<(std::ostream& os, const uint256& num)
return os; return os;
} }
struct NetworkSetup
{
NetworkSetup()
{
Assert(SetupNetworking());
}
};
static NetworkSetup g_networksetup_instance;
BasicTestingSetup::BasicTestingSetup(const ChainType chainType, const std::vector<const char*>& extra_args) BasicTestingSetup::BasicTestingSetup(const ChainType chainType, const std::vector<const char*>& extra_args)
: m_path_root{fs::temp_directory_path() / "test_common_" PACKAGE_NAME / g_insecure_rand_ctx_temp_path.rand256().ToString()}, : m_path_root{fs::temp_directory_path() / "test_common_" PACKAGE_NAME / g_insecure_rand_ctx_temp_path.rand256().ToString()},
m_args{} m_args{}
@ -130,7 +140,6 @@ BasicTestingSetup::BasicTestingSetup(const ChainType chainType, const std::vecto
LogInstance().StartLogging(); LogInstance().StartLogging();
m_node.kernel = std::make_unique<kernel::Context>(); m_node.kernel = std::make_unique<kernel::Context>();
SetupEnvironment(); SetupEnvironment();
SetupNetworking();
ValidationCacheSizes validation_cache_sizes{}; ValidationCacheSizes validation_cache_sizes{};
ApplyArgsManOptions(*m_node.args, validation_cache_sizes); ApplyArgsManOptions(*m_node.args, validation_cache_sizes);

3
src/test/util_tests.cpp
View File

@ -1218,6 +1218,9 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
// has released the lock as we would expect by probing it. // has released the lock as we would expect by probing it.
int processstatus; int processstatus;
BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1); BOOST_CHECK_EQUAL(write(fd[1], &LockCommand, 1), 1);
// The following line invokes the ~CNetCleanup dtor without
// a paired SetupNetworking call. This is acceptable as long as
// ~CNetCleanup is a no-op for non-Windows platforms.
BOOST_CHECK_EQUAL(write(fd[1], &ExitCommand, 1), 1); BOOST_CHECK_EQUAL(write(fd[1], &ExitCommand, 1), 1);
BOOST_CHECK_EQUAL(waitpid(pid, &processstatus, 0), pid); BOOST_CHECK_EQUAL(waitpid(pid, &processstatus, 0), pid);
BOOST_CHECK_EQUAL(processstatus, 0); BOOST_CHECK_EQUAL(processstatus, 0);