From b62f2530fcc399ea8ef9f44dcfa3ba1c95cc6439 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 1 May 2025 12:49:18 +0200
Subject: [PATCH] nixos/tests/eintopf: switch to runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/eintopf.nix   | 46 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2cada8eaaa0f..c0902c5b4526 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -421,7 +421,7 @@ in
   ecryptfs = handleTest ./ecryptfs.nix { };
   fscrypt = handleTest ./fscrypt.nix { };
   fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
-  eintopf = handleTest ./eintopf.nix { };
+  eintopf = runTest ./eintopf.nix;
   ejabberd = handleTest ./xmpp/ejabberd.nix { };
   elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
   emacs-daemon = runTest ./emacs-daemon.nix;
diff --git a/nixos/tests/eintopf.nix b/nixos/tests/eintopf.nix
index 6e3992677da2..11e1158456f1 100644
--- a/nixos/tests/eintopf.nix
+++ b/nixos/tests/eintopf.nix
@@ -1,26 +1,24 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "eintopf";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ onny ];
-    };
+{
+  lib,
+  pkgs,
+  ...
+}:
 
-    nodes = {
-      eintopf =
-        { config, pkgs, ... }:
-        {
-          services.eintopf = {
-            enable = true;
-          };
-        };
-    };
+{
+  name = "eintopf";
+  meta.maintainers = with lib.maintainers; [ onny ];
 
-    testScript = ''
-      eintopf.start
-      eintopf.wait_for_unit("eintopf.service")
-      eintopf.wait_for_open_port(3333)
-      eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'Es sind keine Veranstaltungen eingetragen'")
-    '';
-  }
-)
+  nodes = {
+    eintopf = {
+      services.eintopf.enable = true;
+    };
+  };
+
+  testScript = ''
+    eintopf.start
+    eintopf.wait_for_unit("eintopf.service")
+    eintopf.wait_for_open_port(3333)
+    eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'No events available'")
+  '';
+
+}