nixosTests.binary-cache{no-compression,xz}: migrate to runTest

Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-01 21:38:41 +02:00
parent a6a9f5f195
commit fab4accced
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 83 additions and 79 deletions

View file

@ -231,9 +231,18 @@ in
beanstalkd = handleTest ./beanstalkd.nix { }; beanstalkd = handleTest ./beanstalkd.nix { };
bees = handleTest ./bees.nix { }; bees = handleTest ./bees.nix { };
benchexec = handleTest ./benchexec.nix { }; benchexec = handleTest ./benchexec.nix { };
binary-cache = handleTest ./binary-cache.nix { compression = "zstd"; }; binary-cache = runTest {
binary-cache-no-compression = handleTest ./binary-cache.nix { compression = "none"; }; imports = [ ./binary-cache.nix ];
binary-cache-xz = handleTest ./binary-cache.nix { compression = "xz"; }; _module.args.compression = "zstd";
};
binary-cache-no-compression = runTest {
imports = [ ./binary-cache.nix ];
_module.args.compression = "none";
};
binary-cache-xz = runTest {
imports = [ ./binary-cache.nix ];
_module.args.compression = "xz";
};
bind = handleTest ./bind.nix { }; bind = handleTest ./bind.nix { };
bird = handleTest ./bird.nix { }; bird = handleTest ./bird.nix { };
birdwatcher = handleTest ./birdwatcher.nix { }; birdwatcher = handleTest ./birdwatcher.nix { };

View file

@ -1,8 +1,4 @@
{ compression, ... }@args: { lib, compression, ... }:
import ./make-test-python.nix (
{ lib, pkgs, ... }:
{ {
name = "binary-cache-" + compression; name = "binary-cache-" + compression;
meta.maintainers = with lib.maintainers; [ thomasjm ]; meta.maintainers = with lib.maintainers; [ thomasjm ];
@ -85,4 +81,3 @@ import ./make-test-python.nix (
machine.succeed("[ -d %s ] || exit 1" % storePath) machine.succeed("[ -d %s ] || exit 1" % storePath)
''; '';
} }
) args