Skip to content

Commit c2c6a7d

Browse files
committed
Merge #803: test: Set organization name
0dcbad3 qt, test: Clean settings after tests (Hennadii Stepanov) 49cf635 qt, test: Set organization name (Hennadii Stepanov) Pull request description: From Qt [docs](https://doc.qt.io/qt-5/qsettings.html#QSettings-4): > If [`QCoreApplication::setOrganizationName()`](https://doc.qt.io/qt-5/qcoreapplication.html#organizationName-prop) and [`QCoreApplication::setApplicationName()`](https://doc.qt.io/qt-5/qcoreapplication.html#applicationName-prop) has not been previously called, the `QSettings` object will not be able to read or write any settings, and [`status()`](https://doc.qt.io/qt-5/qsettings.html#status) will return [`AccessError`](https://doc.qt.io/qt-5/qsettings.html#Status-enum). Fixes #799. ACKs for top commit: pablomartin4btc: utACK 0dcbad3 Tree-SHA512: d5ac160f17cc358f0c1b89097193cd5adfd25f5531955c211f3e0994fc084e0a2b8d3aeddebe38f3a8ab5333edef5aa92b18915885c9e58b33f2e5786f31c600
2 parents 59567d7 + 0dcbad3 commit c2c6a7d

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

src/qt/test/optiontests.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@ void OptionTests::migrateSettings()
5050

5151
settings.sync();
5252

53+
QVERIFY(settings.contains("nDatabaseCache"));
54+
QVERIFY(settings.contains("nThreadsScriptVerif"));
55+
QVERIFY(settings.contains("fUseUPnP"));
56+
QVERIFY(settings.contains("fListen"));
57+
QVERIFY(settings.contains("bPrune"));
58+
QVERIFY(settings.contains("nPruneSize"));
59+
QVERIFY(settings.contains("fUseProxy"));
60+
QVERIFY(settings.contains("addrProxy"));
61+
QVERIFY(settings.contains("fUseSeparateProxyTor"));
62+
QVERIFY(settings.contains("addrSeparateProxyTor"));
63+
5364
OptionsModel options{m_node};
5465
bilingual_str error;
5566
QVERIFY(options.Init(error));

src/qt/test/test_main.cpp

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <interfaces/init.h>
1010
#include <interfaces/node.h>
1111
#include <qt/bitcoin.h>
12+
#include <qt/guiconstants.h>
1213
#include <qt/test/apptests.h>
1314
#include <qt/test/optiontests.h>
1415
#include <qt/test/rpcnestedtests.h>
@@ -24,6 +25,7 @@
2425
#include <QApplication>
2526
#include <QDebug>
2627
#include <QObject>
28+
#include <QSettings>
2729
#include <QTest>
2830

2931
#include <functional>
@@ -83,36 +85,45 @@ int main(int argc, char* argv[])
8385
setenv("QT_QPA_PLATFORM", "minimal", 0 /* overwrite */);
8486
#endif
8587

86-
BitcoinApplication app;
87-
app.setApplicationName("Bitcoin-Qt-test");
88-
app.createNode(*init);
88+
89+
QCoreApplication::setOrganizationName(QAPP_ORG_NAME);
90+
QCoreApplication::setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
8991

9092
int num_test_failures{0};
9193

92-
AppTests app_tests(app);
93-
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);
94100

95-
OptionTests options_tests(app.node());
96-
num_test_failures += QTest::qExec(&options_tests);
101+
OptionTests options_tests(app.node());
102+
num_test_failures += QTest::qExec(&options_tests);
97103

98-
URITests test1;
99-
num_test_failures += QTest::qExec(&test1);
104+
URITests test1;
105+
num_test_failures += QTest::qExec(&test1);
100106

101-
RPCNestedTests test3(app.node());
102-
num_test_failures += QTest::qExec(&test3);
107+
RPCNestedTests test3(app.node());
108+
num_test_failures += QTest::qExec(&test3);
103109

104110
#ifdef ENABLE_WALLET
105-
WalletTests test5(app.node());
106-
num_test_failures += QTest::qExec(&test5);
111+
WalletTests test5(app.node());
112+
num_test_failures += QTest::qExec(&test5);
107113

108-
AddressBookTests test6(app.node());
109-
num_test_failures += QTest::qExec(&test6);
114+
AddressBookTests test6(app.node());
115+
num_test_failures += QTest::qExec(&test6);
110116
#endif
111117

112-
if (num_test_failures) {
113-
qWarning("\nFailed tests: %d\n", num_test_failures);
114-
} else {
115-
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+
}
116123
}
124+
125+
QSettings settings;
126+
settings.clear();
127+
117128
return num_test_failures;
118129
}

0 commit comments

Comments
 (0)