From 1e60013b8bf7125b8bcaed037a59001f856bb951 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 15 Oct 2020 13:01:07 +0300 Subject: Fix packagemanagercore test in macos Change-Id: I67178a9df34e3ed4752452dca9a85709fdd4c620 Reviewed-by: Arttu Tarkiainen --- tests/auto/installer/packagemanagercore/BLACKLIST | 2 -- tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 tests/auto/installer/packagemanagercore/BLACKLIST diff --git a/tests/auto/installer/packagemanagercore/BLACKLIST b/tests/auto/installer/packagemanagercore/BLACKLIST deleted file mode 100644 index 3ba5ffe5d..000000000 --- a/tests/auto/installer/packagemanagercore/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[testDisallowRunningProcess] -macos diff --git a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp index dafcd2676..c7cf1028f 100644 --- a/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp +++ b/tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp @@ -290,6 +290,9 @@ private slots: void testAllowRunningProcess() { + #ifdef Q_OS_MACOS + QSKIP("In macOS the app path and maintenancetool differ, not possible to test running processes."); + #endif PackageManagerCore core; core.setPackageManager(); const QString testDirectory = QInstaller::generateTemporaryFileName(); @@ -309,6 +312,9 @@ private slots: void testDisallowRunningProcess() { + #ifdef Q_OS_MACOS + QSKIP("In macOS the app path and maintenancetool differ, not possible to test running processes."); + #endif PackageManagerCore core; core.setPackageManager(); const QString testDirectory = QInstaller::generateTemporaryFileName(); -- cgit v1.2.3