Fix autotests for changed debug output

Commit fa5f7c662841b1d13f6610db8817608a24e3a3f6 removed the printing
of exceptions on creation. Fix autotests accordingly.

Change-Id: Id715b194f893016d23d7e2accf4b131a40a3f906
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

4 files changed, 4 insertions, 28 deletions

diff --git a/tests/auto/installer/binaryformat/tst_binaryformat.cpp b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
index af32dddc6..31663158e 100644
--- a/tests/auto/installer/binaryformat/tst_binaryformat.cpp
+++ b/tests/auto/installer/binaryformat/tst_binaryformat.cpp
@@ -123,8 +123,6 @@ private slots:
 
     void findMagicCookieWithError()
     {
-        QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"No marker found, stopped after 71.00 KiB.\" ");
-
         QTemporaryFile file;
         file.open();
 
diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
index d6ca5e97e..42da15a80 100644
--- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
+++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
@@ -102,9 +102,6 @@ private:
         QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(testDirectory)));
         QTest::ignoreMessage(QtDebugMsg, "\"perform  operation: Mkdir\" ");
         QTest::ignoreMessage(QtDebugMsg, "Install size: 1 components ");
-        QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Force crash to test rollback!\" ");
-        QTest::ignoreMessage(QtDebugMsg, "\"created critical message box installationError: 'Error"
-            "', Force crash to test rollback!\" ");
         QTest::ignoreMessage(QtDebugMsg, "ROLLING BACK operations= 1 ");
         QTest::ignoreMessage(QtDebugMsg, "\"undo  operation: Mkdir\" ");
         QTest::ignoreMessage(QtDebugMsg, "Done ");
@@ -208,8 +205,6 @@ private slots:
 
             Component *root = new NamedComponent(&core, QLatin1String("root1"));
             try {
-                QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Components cannot "
-                    "have children in updater mode.\" ");
                 root->appendComponent(new NamedComponent(&core, QLatin1String("root1.foo")));
                 QFAIL("Components cannot have children in updater mode.");
             } catch (const QInstaller::Error &error) {
diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
index 0bbb79060..1d9144105 100644
--- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp
+++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp
@@ -360,16 +360,15 @@ private slots:
         // m_core becomes the owner of testComponent, it will delete it in the destructor
         m_core.appendRootComponent(testComponent);
 
-        const QString debugMesssage(
-            "create Error-Exception: \"Exception while loading the component script '"
-            ":///data/component2.qs'. (ReferenceError: broken is not defined)\"");
         try {
             // ignore Output from script
             setExpectedScriptOutput("\"script function: Component\"");
-            setExpectedScriptOutput(qPrintable(debugMesssage));
             testComponent->loadComponentScript(":///data/component2.qs");
         } catch (const Error &error) {
-            QVERIFY2(debugMesssage.contains(error.message()), "(ReferenceError: broken is not defined)");
+            const QString debugMessage(
+                "create Error-Exception: \"Exception while loading the component script '"
+                ":///data/component2.qs'. (ReferenceError: broken is not defined)\"");
+            QVERIFY2(debugMessage.contains(error.message()), "(ReferenceError: broken is not defined)");
         }
     }
 
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index ef1ef5e3b..47322984f 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -96,8 +96,6 @@ void tst_Settings::loadFullConfig()
 
 void tst_Settings::loadEmptyConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Missing or empty <Name> tag in "
-                         ":/data/empty_config.xml.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/empty_config.xml", ":/data");
     } catch (const Error &error) {
@@ -109,9 +107,6 @@ 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\" ");
     try {
         Settings::fromFileAndPrefix(":/data/inexisting_config.xml", ":/data");
     } catch (const Error &error) {
@@ -125,8 +120,6 @@ void tst_Settings::loadNotExistingConfig()
 
 void tst_Settings::loadMalformedConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in :/data/malformed_config.xml, "
-                         "line 9, column 0: Premature end of document.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/malformed_config.xml", ":/data");
     } catch (const Error &error) {
@@ -139,8 +132,6 @@ void tst_Settings::loadMalformedConfig()
 
 void tst_Settings::loadUnknownElementConfigInStrictParseMode()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in :/data/unknown_element_config.xml, "
-        "line 5, column 13: Unexpected element 'unknown'.\" ");
     try {
         Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data");
     } catch (const Error &error) {
@@ -178,10 +169,6 @@ void tst_Settings::loadMinimalConfigTagDefaults()
 
 void tst_Settings::loadUnexpectedAttributeConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in "
-        ":///data/unexpectedattribute_config.xml, line 6, column 27: Unexpected attribute "
-        "for element 'Argument'.\" ");
-
     try {
         Settings::fromFileAndPrefix(":///data/unexpectedattribute_config.xml", ":///data");
     } catch (const Error &error) {
@@ -196,9 +183,6 @@ void tst_Settings::loadUnexpectedAttributeConfig()
 
 void tst_Settings::loadUnexpectedTagConfig()
 {
-    QTest::ignoreMessage(QtDebugMsg, "create Error-Exception: \"Error in "
-        ":///data/unexpectedtag_config.xml, line 6, column 12: Unexpected element 'Foo'.\" ");
-
     try {
         Settings::fromFileAndPrefix(":///data/unexpectedtag_config.xml", ":///data");
     } catch (const Error &error) {