Parcourir la source

Stop test_bitcoin-qt touching ~/.bitcoin

tags/v0.16.1
MeshCollider il y a 4 ans
Parent
révision
dea086f498
2 fichiers modifiés avec 6 ajouts et 7 suppressions
  1. 0
    7
      src/qt/test/rpcnestedtests.cpp
  2. 6
    0
      src/qt/test/test_main.cpp

+ 0
- 7
src/qt/test/rpcnestedtests.cpp Voir le fichier

@@ -37,11 +37,6 @@ void RPCNestedTests::rpcNestedTests()
// do some test setup
// could be moved to a more generic place when we add more tests on QT level
tableRPC.appendCommand("rpcNestedTest", &vRPCCommands[0]);
ClearDatadirCache();
std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
QDir dir(QString::fromStdString(path));
dir.mkpath(".");
gArgs.ForceSetArg("-datadir", path);
//mempool.setSanityCheck(1.0);

TestingSetup test;
@@ -136,6 +131,4 @@ void RPCNestedTests::rpcNestedTests()
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,abc)"), std::runtime_error); //don't tollerate empty arguments when using ,
QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using ,
#endif

fs::remove_all(fs::path(path));
}

+ 6
- 0
src/qt/test/test_main.cpp Voir le fichier

@@ -53,6 +53,10 @@ int main(int argc, char *argv[])
SetupNetworking();
SelectParams(CBaseChainParams::MAIN);
noui_connect();
ClearDatadirCache();
fs::path pathTemp = fs::temp_directory_path() / strprintf("test_bitcoin-qt_%lu_%i", (unsigned long)GetTime(), (int)GetRand(100000));
fs::create_directories(pathTemp);
gArgs.ForceSetArg("-datadir", pathTemp.string());

bool fInvalid = false;

@@ -97,5 +101,7 @@ int main(int argc, char *argv[])
}
#endif

fs::remove_all(pathTemp);

return fInvalid;
}

Chargement…
Annuler
Enregistrer