nixosTests.morph-browser: Turn into attrset of Qt5 & Qt6 variant tests

nixos/tests/all-tests.nix

@@ -992,7 +992,7 @@ in
   moonraker = runTest ./moonraker.nix;
   moosefs = runTest ./moosefs.nix;
   mopidy = runTest ./mopidy.nix;
-  morph-browser = runTest ./morph-browser.nix;
+  morph-browser = discoverTests (import ./morph-browser.nix);
   mosquitto = runTest ./mosquitto.nix;
   movim = import ./web-apps/movim {
     inherit runTest;

nixos/tests/morph-browser.nix

@@ -1,64 +1,81 @@
-{ pkgs, lib, ... }:
-{
-  name = "morph-browser-standalone";
-  meta.maintainers = lib.teams.lomiri.members;
-
-  nodes.machine =
-    { config, pkgs, ... }:
+let
+  makeTest = import ./make-test-python.nix;
+  generic =
     {
-      imports = [
-        ./common/x11.nix
-      ];
+      withQt6,
+    }:
+    makeTest (
+      { pkgs, lib, ... }:
+      {
+        name = "morph-browser-${if withQt6 then "qt6" else "qt5"}-standalone";
+        meta.maintainers = lib.teams.lomiri.members;
 
-      services.xserver.enable = true;
+        nodes.machine =
+          {
+            config,
+            pkgs,
+            ...
+          }:
+          {
+            imports = [
+              ./common/x11.nix
+            ];
 
-      environment = {
-        systemPackages = with pkgs.lomiri; [
-          suru-icon-theme
-          morph-browser
-        ];
-        variables = {
-          UITK_ICON_THEME = "suru";
-        };
-      };
+            services.xserver.enable = true;
 
-      i18n.supportedLocales = [ "all" ];
+            environment = {
+              systemPackages = with (if withQt6 then pkgs.lomiri-qt6 else pkgs.lomiri); [
+                suru-icon-theme
+                morph-browser
+              ];
+              variables = {
+                UITK_ICON_THEME = "suru";
+              };
+            };
 
-      fonts.packages = with pkgs; [
-        # Intended font & helps with OCR
-        ubuntu-classic
-      ];
-    };
+            i18n.supportedLocales = [ "all" ];
 
-  enableOCR = true;
+            fonts.packages = with pkgs; [
+              # Intended font & helps with OCR
+              ubuntu-classic
+            ];
+          };
 
-  testScript = ''
-    machine.wait_for_x()
+        enableOCR = true;
 
-    with subtest("morph browser launches"):
-        machine.succeed("morph-browser >&2 &")
-        machine.sleep(10)
-        machine.send_key("alt-f10")
-        machine.sleep(5)
-        machine.wait_for_text(r"Web Browser|New|sites|Bookmarks")
-        machine.screenshot("morph_open")
+        testScript = ''
+          machine.wait_for_x()
 
-    with subtest("morph browser displays HTML"):
-        machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n")
-        machine.wait_for_text("Valgrind Documentation")
-        machine.screenshot("morph_htmlcontent")
+          with subtest("morph browser launches"):
+              machine.succeed("morph-browser >&2 &")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text(r"Web Browser|New|sites|Bookmarks")
+              machine.screenshot("morph_open")
 
-    machine.succeed("pkill -f morph-browser")
+          with subtest("morph browser displays HTML"):
+              machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n")
+              machine.wait_for_text("Valgrind Documentation")
+              machine.screenshot("morph_htmlcontent")
 
-    # Get rid of saved tabs, to show localised start page
-    machine.succeed("rm -r /root/.local/share/morph-browser")
+          machine.succeed("pkill -f morph-browser")
 
-    with subtest("morph browser localisation works"):
-        machine.succeed("env LANG=de_DE.UTF-8 morph-browser >&2 &")
-        machine.sleep(10)
-        machine.send_key("alt-f10")
-        machine.sleep(5)
-        machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen")
-        machine.screenshot("morph_localised")
-  '';
+          # Get rid of saved tabs, to show localised start page
+          machine.succeed("rm -r /root/.local/share/morph-browser")
+
+          with subtest("morph browser localisation works"):
+              machine.succeed("env LANG=de_DE.UTF-8 morph-browser >&2 &")
+              machine.sleep(10)
+              machine.send_key("alt-f10")
+              machine.sleep(5)
+              machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen")
+              machine.screenshot("morph_localised")
+        '';
+      }
+    );
+in
+{
+  qt5 = generic { withQt6 = false; };
+  qt6 = generic { withQt6 = true; };
 }

pkgs/desktops/lomiri/applications/morph-browser/default.nix

@@ -159,10 +159,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     updateScript = gitUpdater { };
-    tests = lib.optionalAttrs (!withQt6) {
+    tests = {
       # Test of morph-browser itself
-      standalone = nixosTests.morph-browser;
-
+      standalone = if withQt6 then nixosTests.morph-browser.qt6 else nixosTests.morph-browser.qt5;
+    }
+    // lib.optionalAttrs (!withQt6) {
       # Interactions between the Lomiri ecosystem and this browser
       inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;
     };