summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@theqtcompany.com>2016-06-17 12:16:35 +0300
committerKatja Marttila <katja.marttila@qt.io>2016-06-20 06:32:55 +0000
commit6a06b8adc5d6fabac4401219044b928043e7e8a9 (patch)
tree2105d45ce8a71aa38b8e60525905ee6fd8da9e1d /tests
parent9b6b59cfc19dc61dd642706a24e1c5d3b6b39609 (diff)
Fix settings test
QFile either returns 'Unknown error' or 'No such file or directory' when trying to use non-existing file. Make settings test work with both values. Change-Id: I5245b5ad0cf5b91a7eec61c17315982ce14eecfb Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp20
1 files changed, 13 insertions, 7 deletions
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 6deea6093..bf45f4856 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -108,15 +108,21 @@ void tst_Settings::loadEmptyConfig()
void tst_Settings::loadNotExistingConfig()
{
- QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Could not open settings file "
- ":/data/inexisting_config.xml for reading: "
- "Unknown error\" ");
+ QString configFile = QLatin1String(":/data/inexisting_config.xml");
+ QFile file(configFile);
+ QString errorString;
+
+ if (!file.open(QIODevice::ReadOnly)) {
+ errorString = file.errorString();
+ }
+ QTest::ignoreMessage(QtDebugMsg, QString::fromLatin1("create Error-Exception: \"Could not open"
+ " settings file %1 for reading: %2\"")
+ .arg(configFile).arg(errorString).toLatin1());
try {
- Settings::fromFileAndPrefix(":/data/inexisting_config.xml", ":/data");
+ Settings::fromFileAndPrefix(configFile, ":/data");
} catch (const Error &error) {
- QCOMPARE(error.message(), QLatin1String("Could not open settings file "
- ":/data/inexisting_config.xml for reading: "
- "Unknown error"));
+ QCOMPARE(error.message(), QString::fromLatin1("Could not open settings file "
+ "%1 for reading: %2").arg(configFile).arg(errorString));
return;
}
QFAIL("No exception thrown");