diff --git a/tests/basic.nix b/tests/basic.nix index db59c3b..d89c81b 100644 --- a/tests/basic.nix +++ b/tests/basic.nix @@ -7,7 +7,10 @@ pkgs.testers.runNixOSTest (_: { nodes.machine = { config, ... }: { - imports = [ ../modules ]; + imports = [ + ./common + ../modules + ]; system.extraDependencies = [ hello ]; @@ -22,7 +25,7 @@ pkgs.testers.runNixOSTest (_: { services.nginx = { enable = true; recommendedProxySettings = true; - virtualHosts.cachix = { + virtualHosts.cache = { default = true; locations = { "/one".return = "302 /one/"; @@ -52,7 +55,7 @@ pkgs.testers.runNixOSTest (_: { if out != "nar-bridge": sys.exit(1) with subtest("Nar upload"): - machine.succeed("nix copy --extra-experimental-features nix-command --to 'http://127.0.0.1/one/?compression=none' ${hello}") + machine.succeed("nix copy --to 'http://127.0.0.1/one/?compression=none' ${hello}") with subtest("narinfo retrieve"): narHash = "${hello}"[11:11+32] machine.succeed(f"curl -f 'http://127.0.0.1/one/{narHash}.narinfo'") diff --git a/tests/common/default.nix b/tests/common/default.nix new file mode 100644 index 0000000..2c42c4c --- /dev/null +++ b/tests/common/default.nix @@ -0,0 +1 @@ +{ imports = [ ./nix.nix ]; } diff --git a/tests/common/nix.nix b/tests/common/nix.nix new file mode 100644 index 0000000..6dc6032 --- /dev/null +++ b/tests/common/nix.nix @@ -0,0 +1,8 @@ +{ + nix.settings = { + extra-experimental-features = [ + "nix-command" + "flakes" + ]; + }; +}