yu-re-ka/binary-cache
0
0
Fork 1
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(tests): Try to fix tests but still failing

Browse source
This commit is contained in:
sinavir 2024-07-21 04:18:30 +02:00
parent 40846d3b16
commit 939cfbf5e6
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/default.nix
View file

@ -8,9 +8,7 @@
# ingest = pkgs.callPackage ./ingest.nix { }; # ingest = pkgs.callPackage ./ingest.nix { };
multi-cache = pkgs.callPackage ./multi-cache.nix { }; multi-cache = pkgs.callPackage ./multi-cache.nix { };
substitution = pkgs.callPackage ./substitution.nix { }; substitution = pkgs.callPackage ./substitution.nix { };
upstream-cache = { upstream-cache-tvix = pkgs.callPackage ./upstream-cache-tvix.nix { };
tvix = pkgs.callPackage ./upstream-cache-tvix.nix { }; upstream-cache-http-directory = pkgs.callPackage ./upstream-cache-http-directory.nix { };
http-directory = pkgs.callPackage ./upstream-cache-http-directory.nix { }; upstream-cache-nix-serve = pkgs.callPackage ./upstream-cache-nix-serve.nix { };
nix-serve = pkgs.callPackage ./upstream-cache-nix-serve.nix { };
};
} }

4
tests/upstream-cache-http-directory.nix
View file

@ -69,9 +69,9 @@ pkgs.testers.runNixOSTest (_: {
cache.succeed("nix store sign -k ${./cache-keys/privkey} ${hello}") cache.succeed("nix store sign -k ${./cache-keys/privkey} ${hello}")
cache.succeed("nix copy --to file:///srv ${hello}") cache.succeed("nix copy --to file:///srv ${hello}")
narHash = "${hello}"[11:11+32] narHash = "${hello}"[11:11+32]
out = cache.succeed(f"curl -f 'http://127.0.0.1/upstream/{narHash}.narinfo'") out = cache.succeed(f"curl -f 'http://localhost/upstream/{narHash}.narinfo'")
print(out) print(out)
cache.succeed(f"curl -f 'http://127.0.0.1/cache/{narHash}.narinfo'") cache.succeed(f"curl -f 'http://localhost/cache/{narHash}.narinfo'")
with subtest("Try to substitute from cache"): with subtest("Try to substitute from cache"):
delete_and_substitute() delete_and_substitute()
with subtest("Check effective caching"): with subtest("Check effective caching"):

6
tests/upstream-cache-tvix.nix
View file

@ -66,10 +66,10 @@ pkgs.testers.runNixOSTest (_: {
with subtest("Upload"): with subtest("Upload"):
cache.succeed("nix store sign -k ${./cache-keys/privkey} ${hello}") cache.succeed("nix store sign -k ${./cache-keys/privkey} ${hello}")
cache.succeed("nix copy --to 'http://127.0.0.1/upstream/?compression=none' ${hello}") cache.succeed("nix copy --to 'http://localhost/upstream/?compression=none' ${hello}")
narHash = "${hello}"[11:11+32] narHash = "${hello}"[11:11+32]
cache.succeed(f"curl -f 'http://127.0.0.1/upstream/{narHash}.narinfo'") cache.succeed(f"curl -f 'http://localhost/upstream/{narHash}.narinfo'")
cache.succeed(f"curl -f 'http://127.0.0.1/cache/{narHash}.narinfo'") cache.succeed(f"curl -f 'http://localhost/cache/{narHash}.narinfo'")
with subtest("Try to substitute from cache"): with subtest("Try to substitute from cache"):
delete_and_substitute() delete_and_substitute()
with subtest("Check effective caching"): with subtest("Check effective caching"):