diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2017-11-08 09:52:09 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2017-11-08 08:40:39 +0000 |
| commit | 2539c3d4537268691557388ee84efb4e907b7036 (patch) | |
| tree | a17f45fd45e69e53e4e3380df357fa7bbab2eb84 | |
| parent | 6f187699dea7a2844c7a26631da632b47c649df6 (diff) | |
Fix tests
Task-number: QTIFW-1027
Change-Id: I9d153924d0f88a537ddcf87e61cac2c550d6817f
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index 186e341c7..2049e6323 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -277,7 +277,7 @@ private slots: // ignore Output from script setExpectedScriptOutput("function receive()"); - QTest::ignoreMessage(QtWarningMsg, ":43: ReferenceError: foo is not defined"); + QTest::ignoreMessage(QtWarningMsg, ":38: ReferenceError: foo is not defined"); emiter.produceSignal(); const QJSValue value = m_scriptEngine->evaluate(""); diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index fc49f4ed8..0edf3fd7b 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -119,9 +119,6 @@ void tst_Settings::loadNotExistingConfig() if (!file.open(QIODevice::ReadOnly)) { errorString = file.errorString(); } - QTest::ignoreMessage(QtDebugMsg, QString::fromLatin1("create Error-Exception: \"Cannot open" - " settings file %1 for reading: %2\"") - .arg(configFile).arg(errorString).toLatin1()); try { Settings::fromFileAndPrefix(configFile, ":/data"); } catch (const Error &error) { |