From 6ac38abf29cc60f2e4c7b405692dfa0b03afe60d Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 31 Mar 2025 17:17:52 -0400
Subject: [PATCH] nixos/tests/envoy: migrate to runTests

---
 nixos/tests/all-tests.nix |   5 +-
 nixos/tests/envoy.nix     | 108 +++++++++++++++++++-------------------
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3fc31d6f5909..ac99791699b2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -407,7 +407,10 @@ in
   enlightenment = handleTest ./enlightenment.nix { };
   env = handleTest ./env.nix { };
   envfs = handleTest ./envfs.nix { };
-  envoy = handleTest ./envoy.nix { };
+  envoy = runTest {
+    imports = [ ./envoy.nix ];
+    _module.args.envoyPackage = pkgs.envoy;
+  };
   ergo = handleTest ./ergo.nix { };
   ergochat = handleTest ./ergochat.nix { };
   eris-server = handleTest ./eris-server.nix { };
diff --git a/nixos/tests/envoy.nix b/nixos/tests/envoy.nix
index d669b2bb718f..6cbf782a421f 100644
--- a/nixos/tests/envoy.nix
+++ b/nixos/tests/envoy.nix
@@ -1,62 +1,60 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "envoy";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ cameronnemo ];
-    };
+{ envoyPackage, lib, ... }:
+{
+  name = envoyPackage.pname;
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.envoy.enable = true;
-        services.envoy.settings = {
-          admin = {
-            access_log_path = "/dev/null";
-            address = {
-              socket_address = {
-                protocol = "TCP";
-                address = "127.0.0.1";
-                port_value = 80;
-              };
-            };
+  meta = with lib.maintainers; {
+    maintainers = [ cameronnemo ];
+  };
+
+  nodes.machine = {
+    services.envoy.enable = true;
+    services.envoy.package = envoyPackage;
+    services.envoy.settings = {
+      admin = {
+        access_log_path = "/dev/null";
+        address = {
+          socket_address = {
+            protocol = "TCP";
+            address = "127.0.0.1";
+            port_value = 80;
           };
-          static_resources = {
-            listeners = [ ];
-            clusters = [ ];
-          };
-        };
-        specialisation = {
-          withoutConfigValidation.configuration =
-            { ... }:
-            {
-              services.envoy = {
-                requireValidConfig = false;
-                settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log";
-              };
-            };
         };
       };
+      static_resources = {
+        listeners = [ ];
+        clusters = [ ];
+      };
+    };
+    specialisation = {
+      withoutConfigValidation.configuration =
+        { ... }:
+        {
+          services.envoy = {
+            requireValidConfig = false;
+            settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log";
+          };
+        };
+    };
+  };
 
-    testScript =
-      { nodes, ... }:
-      let
-        specialisations = "${nodes.machine.system.build.toplevel}/specialisation";
-      in
-      ''
-        machine.start()
+  testScript =
+    { nodes, ... }:
+    let
+      specialisations = "${nodes.machine.system.build.toplevel}/specialisation";
+    in
+    ''
+      machine.start()
 
-        with subtest("envoy.service starts and responds with ready"):
-          machine.wait_for_unit("envoy.service")
-          machine.wait_for_open_port(80)
-          machine.wait_until_succeeds("curl -fsS localhost:80/ready")
+      with subtest("envoy.service starts and responds with ready"):
+        machine.wait_for_unit("envoy.service")
+        machine.wait_for_open_port(80)
+        machine.wait_until_succeeds("curl -fsS localhost:80/ready")
 
-        with subtest("envoy.service works with config path not available at eval time"):
-          machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test')
-          machine.wait_for_unit("envoy.service")
-          machine.wait_for_open_port(80)
-          machine.wait_until_succeeds("curl -fsS localhost:80/ready")
-          machine.succeed('test -f /var/log/envoy/access.log')
-      '';
-  }
-)
+      with subtest("envoy.service works with config path not available at eval time"):
+        machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test')
+        machine.wait_for_unit("envoy.service")
+        machine.wait_for_open_port(80)
+        machine.wait_until_succeeds("curl -fsS localhost:80/ready")
+        machine.succeed('test -f /var/log/envoy/access.log')
+    '';
+}