From 23e40c0ca47b29ef2850a8ef7962e8ee06f7254b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 30 Oct 2024 14:27:21 +0100
Subject: [PATCH] tests/lomiri: Only enable greeter in greeter test

To test a scenario where only the greeter portion is being enabled, not the whole DE.
---
 nixos/tests/lomiri.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 1ff68e85b94d..4e400ccf121e 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -72,11 +72,13 @@ in
             inherit description password;
           };
 
-          services.desktopManager.lomiri.enable = lib.mkForce true;
-          services.displayManager.defaultSession = lib.mkForce "lomiri";
-
-          # Help with OCR
-          fonts.packages = [ pkgs.inconsolata ];
+          services.xserver.enable = true;
+          services.xserver.windowManager.icewm.enable = true;
+          services.xserver.displayManager.lightdm = {
+            enable = true;
+            greeters.lomiri.enable = true;
+          };
+          services.displayManager.defaultSession = lib.mkForce "none+icewm";
         };
 
       enableOCR = true;
@@ -110,13 +112,8 @@ in
 
               # Login
               machine.send_chars("${password}\n")
-              machine.wait_until_succeeds("pgrep -u ${user} -f 'lomiri --mode=full-shell'")
-
-              # Output rendering from Lomiri has started when it starts printing performance diagnostics
-              machine.wait_for_console_text("Last frame took")
-              # Look for datetime's clock, one of the last elements to load
-              wait_for_text(r"(AM|PM)")
-              machine.screenshot("lomiri_launched")
+              machine.wait_for_x()
+              machine.screenshot("session_launched")
         '';
     }
   );