nixosTests.nix-serve: Use new entrypoint

This reuses the `pkgs`, so that `pkgs.nixosTests.nix-serve` will run with the overlays of `pkgs` applied.
mmahut · Sep 18, 2024 · 30620e7 · 30620e7
1 parent 395c52d
commit 30620e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
@@ -685,7 +685,7 @@ in {
  nix-misc = handleTest ./nix/misc.nix {};
  nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;};
  nix-required-mounts = runTest ./nix-required-mounts;
- nix-serve = handleTest ./nix-serve.nix {};
+ nix-serve = runTest ./nix-serve.nix;
  nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
  nixops = handleTest ./nixops/default.nix {};
  nixos-generate-config = handleTest ./nixos-generate-config.nix {};

diff --git a/nixos/tests/nix-serve.nix b/nixos/tests/nix-serve.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+{ config, ... }:
 {
  name = "nix-serve";
  nodes.machine = { pkgs, ... }: {
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
  };
  testScript = let
  pkgHash = builtins.head (
- builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
+ builtins.match "${builtins.storeDir}/([^-]+).+" (toString config.node.pkgs.hello)
  );
  in ''
  start_all()
@@ -19,4 +19,4 @@ import ./make-test-python.nix ({ pkgs, ... }:
  "curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
  )
  '';
-})
+}