diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-01-30 09:28:23 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-02-08 12:55:47 +0200 |
| commit | fff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (patch) | |
| tree | 901763a343a2085b6c21c314f1b789290ceaeb63 /tests | |
| parent | 0797935d299d0da007cae0ab89ee9ceadc41d670 (diff) | |
| parent | e6c28c7fe32de1dca539c987e1c0a26f48ab0483 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
Diffstat (limited to 'tests')
| -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) { |