Skip to content

Commit 4d8189f

Browse files
kiminuokiminuo
committed
scripted-diff: Change ArgsManager.GetDataDirPath() to ArgsManager.GetDataDirBase() in tests
-BEGIN VERIFY SCRIPT- git ls-files src/test/*_tests.cpp src/test/util/setup_common.cpp | xargs sed -i 's/.GetDataDirPath()/.GetDataDirBase()/g'; -END VERIFY SCRIPT-
1 parent 0f53df4 commit 4d8189f

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎src/test/dbwrapper_tests.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper)
2626
{
2727
// Perform tests both obfuscated and non-obfuscated.
2828
for (const bool obfuscate : {false, true}) {
29-
fs::path ph = m_args.GetDataDirPath() / (obfuscate ? "dbwrapper_obfuscate_true" : "dbwrapper_obfuscate_false");
29+
fs::path ph = m_args.GetDataDirBase() / (obfuscate ? "dbwrapper_obfuscate_true" : "dbwrapper_obfuscate_false");
3030
CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
3131
char key = 'k';
3232
uint256 in = InsecureRand256();
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_basic_data)
4545
{
4646
// Perform tests both obfuscated and non-obfuscated.
4747
for (bool obfuscate : {false, true}) {
48-
fs::path ph = m_args.GetDataDirPath() / (obfuscate ? "dbwrapper_1_obfuscate_true" : "dbwrapper_1_obfuscate_false");
48+
fs::path ph = m_args.GetDataDirBase() / (obfuscate ? "dbwrapper_1_obfuscate_true" : "dbwrapper_1_obfuscate_false");
4949
CDBWrapper dbw(ph, (1 << 20), false, true, obfuscate);
5050

5151
uint256 res;
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
126126
{
127127
// Perform tests both obfuscated and non-obfuscated.
128128
for (const bool obfuscate : {false, true}) {
129-
fs::path ph = m_args.GetDataDirPath() / (obfuscate ? "dbwrapper_batch_obfuscate_true" : "dbwrapper_batch_obfuscate_false");
129+
fs::path ph = m_args.GetDataDirBase() / (obfuscate ? "dbwrapper_batch_obfuscate_true" : "dbwrapper_batch_obfuscate_false");
130130
CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
131131

132132
char key = 'i';
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
162162
{
163163
// Perform tests both obfuscated and non-obfuscated.
164164
for (const bool obfuscate : {false, true}) {
165-
fs::path ph = m_args.GetDataDirPath() / (obfuscate ? "dbwrapper_iterator_obfuscate_true" : "dbwrapper_iterator_obfuscate_false");
165+
fs::path ph = m_args.GetDataDirBase() / (obfuscate ? "dbwrapper_iterator_obfuscate_true" : "dbwrapper_iterator_obfuscate_false");
166166
CDBWrapper dbw(ph, (1 << 20), true, false, obfuscate);
167167

168168
// The two keys are intentionally chosen for ordering
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
202202
BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
203203
{
204204
// We're going to share this fs::path between two wrappers
205-
fs::path ph = m_args.GetDataDirPath() / "existing_data_no_obfuscate";
205+
fs::path ph = m_args.GetDataDirBase() / "existing_data_no_obfuscate";
206206
create_directories(ph);
207207

208208
// Set up a non-obfuscated wrapper to write some initial data.
@@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate)
243243
BOOST_AUTO_TEST_CASE(existing_data_reindex)
244244
{
245245
// We're going to share this fs::path between two wrappers
246-
fs::path ph = m_args.GetDataDirPath() / "existing_data_reindex";
246+
fs::path ph = m_args.GetDataDirBase() / "existing_data_reindex";
247247
create_directories(ph);
248248

249249
// Set up a non-obfuscated wrapper to write some initial data.
@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex)
278278

279279
BOOST_AUTO_TEST_CASE(iterator_ordering)
280280
{
281-
fs::path ph = m_args.GetDataDirPath() / "iterator_ordering";
281+
fs::path ph = m_args.GetDataDirBase() / "iterator_ordering";
282282
CDBWrapper dbw(ph, (1 << 20), true, false, false);
283283
for (int x=0x00; x<256; ++x) {
284284
uint8_t key = x;
@@ -358,7 +358,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering)
358358
{
359359
char buf[10];
360360

361-
fs::path ph = m_args.GetDataDirPath() / "iterator_string_ordering";
361+
fs::path ph = m_args.GetDataDirBase() / "iterator_string_ordering";
362362
CDBWrapper dbw(ph, (1 << 20), true, false, false);
363363
for (int x=0x00; x<10; ++x) {
364364
for (int y = 0; y < 10; y++) {
@@ -404,7 +404,7 @@ BOOST_AUTO_TEST_CASE(unicodepath)
404404
// On Windows this test will fail if the directory is created using
405405
// the ANSI CreateDirectoryA call and the code page isn't UTF8.
406406
// It will succeed if created with CreateDirectoryW.
407-
fs::path ph = m_args.GetDataDirPath() / "test_runner_₿_🏃_20191128_104644";
407+
fs::path ph = m_args.GetDataDirBase() / "test_runner_₿_🏃_20191128_104644";
408408
CDBWrapper dbw(ph, (1 << 20));
409409

410410
fs::path lockPath = ph / "LOCK";

‎src/test/denialofservice_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(stale_tip_peer_management)
208208
BOOST_AUTO_TEST_CASE(peer_discouragement)
209209
{
210210
const CChainParams& chainparams = Params();
211-
auto banman = std::make_unique<BanMan>(m_args.GetDataDirPath() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
211+
auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
212212
auto connman = std::make_unique<CConnmanTest>(0x1337, 0x1337, *m_node.addrman);
213213
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(),
214214
*m_node.scheduler, *m_node.chainman, *m_node.mempool, false);
@@ -302,7 +302,7 @@ BOOST_AUTO_TEST_CASE(peer_discouragement)
302302
BOOST_AUTO_TEST_CASE(DoS_bantime)
303303
{
304304
const CChainParams& chainparams = Params();
305-
auto banman = std::make_unique<BanMan>(m_args.GetDataDirPath() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
305+
auto banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
306306
auto connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman);
307307
auto peerLogic = PeerManager::make(chainparams, *connman, *m_node.addrman, banman.get(),
308308
*m_node.scheduler, *m_node.chainman, *m_node.mempool, false);

‎src/test/flatfile_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BOOST_FIXTURE_TEST_SUITE(flatfile_tests, BasicTestingSetup)
1414

1515
BOOST_AUTO_TEST_CASE(flatfile_filename)
1616
{
17-
const auto data_dir = m_args.GetDataDirPath();
17+
const auto data_dir = m_args.GetDataDirBase();
1818

1919
FlatFilePos pos(456, 789);
2020

@@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(flatfile_filename)
2727

2828
BOOST_AUTO_TEST_CASE(flatfile_open)
2929
{
30-
const auto data_dir = m_args.GetDataDirPath();
30+
const auto data_dir = m_args.GetDataDirBase();
3131
FlatFileSeq seq(data_dir, "a", 16 * 1024);
3232

3333
std::string line1("A purely peer-to-peer version of electronic cash would allow online "
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(flatfile_open)
8888

8989
BOOST_AUTO_TEST_CASE(flatfile_allocate)
9090
{
91-
const auto data_dir = m_args.GetDataDirPath();
91+
const auto data_dir = m_args.GetDataDirBase();
9292
FlatFileSeq seq(data_dir, "a", 100);
9393

9494
bool out_of_space;
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(flatfile_allocate)
108108

109109
BOOST_AUTO_TEST_CASE(flatfile_flush)
110110
{
111-
const auto data_dir = m_args.GetDataDirPath();
111+
const auto data_dir = m_args.GetDataDirBase();
112112
FlatFileSeq seq(data_dir, "a", 100);
113113

114114
bool out_of_space;

‎src/test/fs_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BOOST_FIXTURE_TEST_SUITE(fs_tests, BasicTestingSetup)
1313

1414
BOOST_AUTO_TEST_CASE(fsbridge_fstream)
1515
{
16-
fs::path tmpfolder = m_args.GetDataDirPath();
16+
fs::path tmpfolder = m_args.GetDataDirBase();
1717
// tmpfile1 should be the same as tmpfile2
1818
fs::path tmpfile1 = tmpfolder / "fs_tests_₿_🏃";
1919
fs::path tmpfile2 = tmpfolder / "fs_tests_₿_🏃";

‎src/test/settings_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ BOOST_FIXTURE_TEST_SUITE(settings_tests, BasicTestingSetup)
4545

4646
BOOST_AUTO_TEST_CASE(ReadWrite)
4747
{
48-
fs::path path = m_args.GetDataDirPath() / "settings.json";
48+
fs::path path = m_args.GetDataDirBase() / "settings.json";
4949

5050
WriteText(path, R"({
5151
"string": "string",

‎src/test/util/setup_common.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
195195
}
196196

197197
m_node.addrman = std::make_unique<CAddrMan>();
198-
m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirPath() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
198+
m_node.banman = std::make_unique<BanMan>(m_args.GetDataDirBase() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
199199
m_node.connman = std::make_unique<CConnman>(0x1337, 0x1337, *m_node.addrman); // Deterministic randomness for tests.
200200
m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman,
201201
m_node.banman.get(), *m_node.scheduler, *m_node.chainman,

‎src/test/util_tests.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@ BOOST_AUTO_TEST_CASE(util_datadir)
5353
ArgsManager args;
5454
args.ForceSetArg("-datadir", m_path_root.string());
5555

56-
const fs::path dd_norm = args.GetDataDirPath();
56+
const fs::path dd_norm = args.GetDataDirBase();
5757

5858
args.ForceSetArg("-datadir", dd_norm.string() + "/");
5959
args.ClearPathCache();
60-
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
60+
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase());
6161

6262
args.ForceSetArg("-datadir", dd_norm.string() + "/.");
6363
args.ClearPathCache();
64-
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
64+
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase());
6565

6666
args.ForceSetArg("-datadir", dd_norm.string() + "/./");
6767
args.ClearPathCache();
68-
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
68+
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase());
6969

7070
args.ForceSetArg("-datadir", dd_norm.string() + "/.//");
7171
args.ClearPathCache();
72-
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirPath());
72+
BOOST_CHECK_EQUAL(dd_norm, args.GetDataDirBase());
7373
}
7474

7575
BOOST_AUTO_TEST_CASE(util_check)
@@ -1159,10 +1159,10 @@ BOOST_AUTO_TEST_CASE(util_ReadWriteSettings)
11591159
// Test error logging, and remove previously written setting.
11601160
{
11611161
ASSERT_DEBUG_LOG("Failed renaming settings file");
1162-
fs::remove(args1.GetDataDirPath() / "settings.json");
1163-
fs::create_directory(args1.GetDataDirPath() / "settings.json");
1162+
fs::remove(args1.GetDataDirBase() / "settings.json");
1163+
fs::create_directory(args1.GetDataDirBase() / "settings.json");
11641164
args2.WriteSettingsFile();
1165-
fs::remove(args1.GetDataDirPath() / "settings.json");
1165+
fs::remove(args1.GetDataDirBase() / "settings.json");
11661166
}
11671167
}
11681168

@@ -1810,7 +1810,7 @@ static constexpr char ExitCommand = 'X';
18101810

18111811
BOOST_AUTO_TEST_CASE(test_LockDirectory)
18121812
{
1813-
fs::path dirname = m_args.GetDataDirPath() / "lock_dir";
1813+
fs::path dirname = m_args.GetDataDirBase() / "lock_dir";
18141814
const std::string lockname = ".lock";
18151815
#ifndef WIN32
18161816
// Revert SIGCHLD to default, otherwise boost.test will catch and fail on
@@ -1899,7 +1899,7 @@ BOOST_AUTO_TEST_CASE(test_LockDirectory)
18991899
BOOST_AUTO_TEST_CASE(test_DirIsWritable)
19001900
{
19011901
// Should be able to write to the data dir.
1902-
fs::path tmpdirname = m_args.GetDataDirPath();
1902+
fs::path tmpdirname = m_args.GetDataDirBase();
19031903
BOOST_CHECK_EQUAL(DirIsWritable(tmpdirname), true);
19041904

19051905
// Should not be able to write to a non-existent dir.

0 commit comments

Comments
 (0)