diff options
Diffstat (limited to 'tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp')
| -rw-r--r-- | tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index 42be8038e..47fb41bf1 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -84,26 +84,19 @@ class tst_PackageManagerCore : public QObject private: void setIgnoreMessage(const QString &testDirectory) { -#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) - const QString message = "\"\t- arguments: %1\" "; -#else - const QString message = "\"\\t- arguments: %1\" "; -#endif + const QString message = "\t- arguments: %1"; QTest::ignoreMessage(QtDebugMsg, "Operations sanity check succeeded."); - QTest::ignoreMessage(QtDebugMsg, "\"backup operation: Mkdir\" "); + QTest::ignoreMessage(QtDebugMsg, "backup operation: Mkdir"); QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(testDirectory))); QTest::ignoreMessage(QtDebugMsg, qPrintable(message.arg(testDirectory))); 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 "); - QTest::ignoreMessage(QtDebugMsg, "Done "); - QTest::ignoreMessage(QtDebugMsg, "Done "); + QTest::ignoreMessage(QtDebugMsg, "perform operation: Mkdir"); + QTest::ignoreMessage(QtDebugMsg, "Install size: 1 components"); + QTest::ignoreMessage(QtDebugMsg, "ROLLING BACK operations= 1"); + QTest::ignoreMessage(QtDebugMsg, "undo operation: Mkdir"); + QTest::ignoreMessage(QtDebugMsg, "Done"); + QTest::ignoreMessage(QtDebugMsg, "Done"); + QTest::ignoreMessage(QtDebugMsg, "Done"); } private slots: @@ -202,8 +195,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) { |