Use common SetDataDir method to create temp directory in tests.

winder · furszy · commit 48801a9008ff · 2021-05-15T11:24:43.000-03:00
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
@@ -24,7 +24,7 @@ BOOST_FIXTURE_TEST_SUITE(dbwrapper_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(dbwrapper)
 {
     {
-        fs::path ph = fs::temp_directory_path() / fs::unique_path();
+        fs::path ph = SetDataDir(std::string("dbwrapper"));
         CDBWrapper dbw(ph, (1 << 20), true, false);
         char key = 'k';
         uint256 in = GetRandHash();
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_basic_data)
 BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 {
     {
-        fs::path ph = fs::temp_directory_path() / fs::unique_path();
+        fs::path ph = SetDataDir(std::string("dbwrapper_batch"));
         CDBWrapper dbw(ph, (1 << 20), true, false);
 
         char key = 'i';
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)
 BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
 {
     {
-        fs::path ph = fs::temp_directory_path() / fs::unique_path();
+        fs::path ph = SetDataDir(std::string("dbwrapper_iterator"));
         CDBWrapper dbw(ph, (1 << 20), true, false);
 
         // The two keys are intentionally chosen for ordering
diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp
@@ -39,29 +39,38 @@ std::ostream& operator<<(std::ostream& os, const uint256& num)
 }
 
 BasicTestingSetup::BasicTestingSetup(const std::string& chainName)
+    : m_path_root(fs::temp_directory_path() / "test_pivx" / strprintf("%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(1 << 30))))
 {
-        ECC_Start();
-        SetupEnvironment();
-        InitSignatureCache();
-        fCheckBlockIndex = true;
-        SelectParams(chainName);
-        evoDb.reset(new CEvoDB(1 << 20, true, true));
-        deterministicMNManager.reset(new CDeterministicMNManager(*evoDb));
+    ECC_Start();
+    SetupEnvironment();
+    InitSignatureCache();
+    fCheckBlockIndex = true;
+    SelectParams(chainName);
+    evoDb.reset(new CEvoDB(1 << 20, true, true));
+    deterministicMNManager.reset(new CDeterministicMNManager(*evoDb));
 }
+
 BasicTestingSetup::~BasicTestingSetup()
 {
-        ECC_Stop();
-        g_connman.reset();
-        deterministicMNManager.reset();
-        evoDb.reset();
+    fs::remove_all(m_path_root);
+    ECC_Stop();
+    g_connman.reset();
+    deterministicMNManager.reset();
+    evoDb.reset();
+}
+
+fs::path BasicTestingSetup::SetDataDir(const std::string& name)
+{
+    fs::path ret = m_path_root / name;
+    fs::create_directories(ret);
+    gArgs.ForceSetArg("-datadir", ret.string());
+    return ret;
 }
 
 TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
 {
+        SetDataDir("tempdir");
         ClearDatadirCache();
-        pathTemp = fs::temp_directory_path() / strprintf("test_pivx_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
-        fs::create_directories(pathTemp);
-        gArgs.ForceSetArg("-datadir", pathTemp.string());
 
         // Start the lightweight task scheduler thread
         CScheduler::Function serviceLoop = std::bind(&CScheduler::serviceQueue, &scheduler);
@@ -110,7 +119,6 @@ TestingSetup::~TestingSetup()
         delete pblocktree;
         delete zerocoinDB;
         delete pSporkDB;
-        fs::remove_all(pathTemp);
 }
 
 // Test chain only available on regtest
diff --git a/src/test/test_pivx.h b/src/test/test_pivx.h
@@ -38,6 +38,11 @@ struct BasicTestingSetup {
 
     BasicTestingSetup(const std::string& chainName = CBaseChainParams::MAIN);
     ~BasicTestingSetup();
+
+    fs::path SetDataDir(const std::string& name);
+
+private:
+    const fs::path m_path_root;
 };
 
 /** Testing setup that configures a complete environment.
@@ -47,7 +52,6 @@ struct BasicTestingSetup {
 class CConnman;
 struct TestingSetup: public BasicTestingSetup {
     CCoinsViewDB *pcoinsdbview;
-    fs::path pathTemp;
     boost::thread_group threadGroup;
     CConnman* connman;
     CScheduler scheduler;
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -412,6 +412,8 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
     SetMockTime(KEY_TIME);
     coinbaseTxns.emplace_back(*CreateAndProcessBlock({}, GetScriptForRawPubKey(coinbaseKey.GetPubKey())).vtx[0]);
 
+    std::string backup_file = (SetDataDir("importwallet_rescan") / "wallet.backup").string();
+
     // Import key into wallet and call dumpwallet to create backup file.
     {
         CWallet wallet;
@@ -423,7 +425,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
 
         JSONRPCRequest request;
         request.params.setArray();
-        request.params.push_back((pathTemp / "wallet.backup").string());
+        request.params.push_back(backup_file);
         ::pwalletMain = &wallet;
         ::dumpwallet(request);
     }
@@ -435,7 +437,7 @@ BOOST_FIXTURE_TEST_CASE(importwallet_rescan, TestChain100Setup)
 
         JSONRPCRequest request;
         request.params.setArray();
-        request.params.push_back((pathTemp / "wallet.backup").string());
+        request.params.push_back(backup_file);
         ::pwalletMain = &wallet;
         ::importwallet(request);
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ BOOST_FIXTURE_TEST_SUITE(dbwrapper_tests, BasicTestingSetup)`
`24`	`24`	`BOOST_AUTO_TEST_CASE(dbwrapper)`
`25`	`25`	`{`
`26`	`26`	`{`
`27`		`- fs::path ph = fs::temp_directory_path() / fs::unique_path();`
	`27`	`+ fs::path ph = SetDataDir(std::string("dbwrapper"));`
`28`	`28`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`29`	`29`	`char key = 'k';`
`30`	`30`	`uint256 in = GetRandHash();`
`@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_basic_data)`
`114`	`114`	`BOOST_AUTO_TEST_CASE(dbwrapper_batch)`
`115`	`115`	`{`
`116`	`116`	`{`
`117`		`- fs::path ph = fs::temp_directory_path() / fs::unique_path();`
	`117`	`+ fs::path ph = SetDataDir(std::string("dbwrapper_batch"));`
`118`	`118`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`119`	`119`
`120`	`120`	`char key = 'i';`
`@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_batch)`
`149`	`149`	`BOOST_AUTO_TEST_CASE(dbwrapper_iterator)`
`150`	`150`	`{`
`151`	`151`	`{`
`152`		`- fs::path ph = fs::temp_directory_path() / fs::unique_path();`
	`152`	`+ fs::path ph = SetDataDir(std::string("dbwrapper_iterator"));`
`153`	`153`	`CDBWrapper dbw(ph, (1 << 20), true, false);`
`154`	`154`
`155`	`155`	`// The two keys are intentionally chosen for ordering`