From 9a7691eb7840395ed576b590eb6378023f030284 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 21 Oct 2020 11:48:14 +0300 Subject: CLI: Fix wrong warning text in command 'purge' for running processes Task-number: QTIFW-1996 Change-Id: Iaf9aa6bfd39d266ed052838e969881c168b4b2ed Reviewed-by: Katja Marttila --- .../installer/packagemanagercore/tst_packagemanagercore.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index c7cf1028f..ae2c3b211 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -321,11 +321,16 @@ private slots: QVERIFY(QDir().mkpath(testDirectory)); core.setValue(scTargetDir, testDirectory); - const QString warningMessage = QString("Unable to update components. Please stop these processes: "); - const QRegularExpression re(warningMessage); - QTest::ignoreMessage(QtWarningMsg, re); + const QString warningMessageUp = QString("Unable to update components. Please stop these processes: "); + const QRegularExpression reUp(warningMessageUp); + QTest::ignoreMessage(QtWarningMsg, reUp); QVERIFY_EXCEPTION_THROWN(core.updateComponentsSilently(QStringList()), Error); + const QString warningMessageRm = QString("Unable to remove components. Please stop these processes: "); + const QRegularExpression reRm(warningMessageRm); + QTest::ignoreMessage(QtWarningMsg, reRm); + QVERIFY_EXCEPTION_THROWN(core.removeInstallationSilently(), Error); + QVERIFY(QDir().rmdir(testDirectory)); } -- cgit v1.2.3