Skip to content

Commit 0dcbad3

Browse files
committed
qt, test: Clean settings after tests
A test suite should not leave any artifacts except for those explicitly expected. This change is easy to review with `git diff --ignore-all-space` command.
1 parent 49cf635 commit 0dcbad3

File tree

1 file changed

+28
-20
lines changed

1 file changed

+28
-20
lines changed

src/qt/test/test_main.cpp

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,45 @@ int main(int argc, char* argv[])
8585
setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */);
8686
#endif
8787

88-
BitcoinApplication app;
89-
app.setOrganizationName(QAPP_ORG_NAME);
90-
app.setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
91-
app.createNode(*init);
88+
89+
QCoreApplication::setOrganizationName(QAPP_ORG_NAME);
90+
QCoreApplication::setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
9291

9392
int num_test_failures{0};
9493

95-
AppTests app_tests(app);
96-
num_test_failures += QTest::qExec(&app_tests);
94+
{
95+
BitcoinApplication app;
96+
app.createNode(*init);
97+
98+
AppTests app_tests(app);
99+
num_test_failures += QTest::qExec(&app_tests);
97100

98-
OptionTests options_tests(app.node());
99-
num_test_failures += QTest::qExec(&options_tests);
101+
OptionTests options_tests(app.node());
102+
num_test_failures += QTest::qExec(&options_tests);
100103

101-
URITests test1;
102-
num_test_failures += QTest::qExec(&test1);
104+
URITests test1;
105+
num_test_failures += QTest::qExec(&test1);
103106

104-
RPCNestedTests test3(app.node());
105-
num_test_failures += QTest::qExec(&test3);
107+
RPCNestedTests test3(app.node());
108+
num_test_failures += QTest::qExec(&test3);
106109

107110
#ifdef ENABLE_WALLET
108-
WalletTests test5(app.node());
109-
num_test_failures += QTest::qExec(&test5);
111+
WalletTests test5(app.node());
112+
num_test_failures += QTest::qExec(&test5);
110113

111-
AddressBookTests test6(app.node());
112-
num_test_failures += QTest::qExec(&test6);
114+
AddressBookTests test6(app.node());
115+
num_test_failures += QTest::qExec(&test6);
113116
#endif
114117

115-
if (num_test_failures) {
116-
qWarning("\nFailed tests: %d\n", num_test_failures);
117-
} else {
118-
qDebug("\nAll tests passed.\n");
118+
if (num_test_failures) {
119+
qWarning("\nFailed tests: %d\n", num_test_failures);
120+
} else {
121+
qDebug("\nAll tests passed.\n");
122+
}
119123
}
124+
125+
QSettings settings;
126+
settings.clear();
127+
120128
return num_test_failures;
121129
}

0 commit comments

Comments
 (0)