gui tests: Limit life-time of dummy testing setup

Its only purpose is to create a directory. So instead of keeping it
alive, use it only to get the path of the directory and then create it
explicitly.
This commit is contained in:
MarcoFalke committed 2020-07-09 13:07:35 +02:00
1 parent fa28a61897
commit fa6c186436
1 file changed
+5 -3
+5 -3
View File
@@ -62,9 +62,10 @@ void AppTests::appTests()
} }
#endif #endif
BasicTestingSetup test{CBaseChainParams::REGTEST}; // Create a temp data directory to backup the gui settings to fs::create_directories([] {
ECC_Stop(); // Already started by the common test setup, so stop it to avoid interference BasicTestingSetup test{CBaseChainParams::REGTEST}; // Create a temp data directory to backup the gui settings to
LogInstance().DisconnectTestLogger(); return GetDataDir() / "blocks";
}());
m_app.parameterSetup(); m_app.parameterSetup();
m_app.createOptionsModel(true /* reset settings */); m_app.createOptionsModel(true /* reset settings */);
@@ -80,6 +81,7 @@ void AppTests::appTests()
m_app.exec(); m_app.exec();
// Reset global state to avoid interfering with later tests. // Reset global state to avoid interfering with later tests.
LogInstance().DisconnectTestLogger();
AbortShutdown(); AbortShutdown();
UnloadBlockIndex(); UnloadBlockIndex();
WITH_LOCK(::cs_main, g_chainman.Reset()); WITH_LOCK(::cs_main, g_chainman.Reset());