From 6a06b8adc5d6fabac4401219044b928043e7e8a9 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 17 Jun 2016 12:16:35 +0300 Subject: 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 --- tests/auto/installer/settings/tst_settings.cpp | 20 +++++++++++++------- 1 file 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"); -- cgit v1.2.3