Run the test suite during package builds

debian/rules skipped dh_auto_test with a comment claiming no test targets
were defined, which stopped being true when tests/test_toolmodel.cpp was
added: every package build compiled the test binary and then discarded it
without running it. Drop the override so dh_auto_test runs ctest.

Make the filtering test independent of the build host first. It relied on
isLiveEnvironment() returning false, which is derived from the filesystem
type of /, so it would have failed inside any container whose root is an
overlay mount. Add an MX_TOOLS_TEST_FORCE_LIVE override compiled in only
when MX_TOOLS_TESTING is defined (the test target only, never the shipped
binary), pin it in the test fixture, and use it to also cover the live
session case where MX-OnlyLive and MX-OnlyInstalled swap over.

Rename launchTracksAlreadyRunningToolsAndReapsZombies: it does not reach
the zombie branch of isProcessRunning(), because QProcess::startDetached
double-forks and the child is reparented to init and reaped as soon as it
exits. It verifies that relaunch is blocked while running and allowed
afterwards, so name it for that.

Author: AdrianTM

CMakeLists.txt

@@ -272,6 +272,7 @@ if(BUILD_TESTING)
     endif()
     target_compile_definitions(test-toolmodel PRIVATE
         MX_TOOLS_APPLICATIONS_PATH="${CMAKE_CURRENT_BINARY_DIR}/test-applications"
+        MX_TOOLS_TESTING
     )
     target_include_directories(test-toolmodel PRIVATE src)
     add_test(NAME toolmodel COMMAND test-toolmodel)

debian/rules

@@ -26,9 +26,6 @@ override_dh_shlibdeps:
 override_dh_dwz:
 	@:
 
-override_dh_auto_test:
-	# Skip tests as no test targets are defined
-
 override_dh_auto_install:
 	# Install is handled by debian/install file
 	dh_auto_install

src/toolmodel.cpp

@@ -58,6 +58,15 @@ QStringList currentDesktops()
 
 bool isLiveEnvironment()
 {
+#ifdef MX_TOOLS_TESTING
+    // The test suite must not depend on the build host's root filesystem: a
+    // container root is an overlay mount, which would otherwise be detected
+    // as a live session and silently invert the environment filtering.
+    const QByteArray forcedLive = qgetenv("MX_TOOLS_TEST_FORCE_LIVE");
+    if (!forcedLive.isEmpty()) {
+        return forcedLive != "0";
+    }
+#endif
     const QByteArray fileSystem = QStorageInfo(QStringLiteral("/")).fileSystemType();
     return fileSystem == "aufs" || fileSystem == "overlay";
 }

tests/test_toolmodel.cpp

@@ -35,7 +35,7 @@ private slots:
     void init();
     void cleanup();
     void discoversAndFiltersTools();
-    void launchTracksAlreadyRunningToolsAndReapsZombies();
+    void launchBlocksRelaunchOnlyWhileRunning();
 
 private:
     QScopedPointer<QTemporaryDir> m_home;
@@ -53,13 +53,17 @@ void TestToolModel::init()
     qputenv("XDG_CONFIG_HOME", (m_home->path() + QStringLiteral("/.config")).toUtf8());
     qunsetenv("XDG_CURRENT_DESKTOP");
     qunsetenv("XDG_SESSION_DESKTOP");
+    // Pin the live/installed state instead of inheriting it from the root
+    // filesystem, which is an overlay mount inside build containers.
+    qputenv("MX_TOOLS_TEST_FORCE_LIVE", "0");
 
     QVERIFY(QDir().mkpath(QStringLiteral(MX_TOOLS_APPLICATIONS_PATH)));
 }
 
 void TestToolModel::cleanup()
 {
     QDir(QStringLiteral(MX_TOOLS_APPLICATIONS_PATH)).removeRecursively();
+    qunsetenv("MX_TOOLS_TEST_FORCE_LIVE");
     m_home.reset();
 }
 
@@ -87,10 +91,10 @@ void TestToolModel::discoversAndFiltersTools()
     ToolIconProvider iconProvider;
     ToolModel model(&iconProvider);
 
-    // The test process never runs on a live (aufs/overlay) root filesystem,
-    // so MX-OnlyLive is excluded and MX-OnlyInstalled is kept; NotShowIn=XFCE
-    // and OnlyShowIn=KDE both exclude their entries under XDG_CURRENT_DESKTOP=XFCE.
-    // Only "Utility Tool" and "Installed Only Tool" should survive.
+    // MX_TOOLS_TEST_FORCE_LIVE=0 means MX-OnlyLive is excluded and
+    // MX-OnlyInstalled is kept; NotShowIn=XFCE and OnlyShowIn=KDE both exclude
+    // their entries under XDG_CURRENT_DESKTOP=XFCE, so only "Utility Tool" and
+    // "Installed Only Tool" should survive.
     QCOMPARE(model.totalCount(), 2);
     QCOMPARE(model.categories(), QStringList({QStringLiteral("All tools"), QStringLiteral("Maintenance"),
                                                QStringLiteral("Utilities")}));
@@ -109,9 +113,16 @@ void TestToolModel::discoversAndFiltersTools()
     model.setSearch(QStringLiteral("installed"));
     QCOMPARE(model.rowCount(), 1);
     QCOMPARE(model.data(model.index(0), ToolModel::CategoryRole).toString(), QStringLiteral("Maintenance"));
+
+    // On a live session the MX-OnlyLive/MX-OnlyInstalled pair swaps over.
+    qputenv("MX_TOOLS_TEST_FORCE_LIVE", "1");
+    ToolModel liveModel(&iconProvider);
+    QCOMPARE(liveModel.totalCount(), 2);
+    QCOMPARE(liveModel.categories(), QStringList({QStringLiteral("All tools"), QStringLiteral("Live"),
+                                                   QStringLiteral("Utilities")}));
 }
 
-void TestToolModel::launchTracksAlreadyRunningToolsAndReapsZombies()
+void TestToolModel::launchBlocksRelaunchOnlyWhileRunning()
 {
     const QDir applications(QStringLiteral(MX_TOOLS_APPLICATIONS_PATH));
     writeDesktopFile(applications, QStringLiteral("sleeper.desktop"),
@@ -128,8 +139,10 @@ void TestToolModel::launchTracksAlreadyRunningToolsAndReapsZombies()
     QCOMPARE(errors.count(), 1);
     QCOMPARE(errors.constFirst().at(0).toString(), QStringLiteral("Tool already running"));
 
-    // Once the detached /bin/sleep 0.2 has exited, launching again must not
-    // be blocked by a lingering zombie /proc entry for its old pid.
+    // Once the detached /bin/sleep 0.2 has exited, launching again must be
+    // allowed. Note this does not exercise the zombie branch of
+    // isProcessRunning(): QProcess::startDetached double-forks, so the child
+    // is reparented to init and reaped as soon as it exits.
     QTest::qWait(600);
     model.launch(fileName);
     QCOMPARE(errors.count(), 1);