Unverified Commit 5f0f90f2 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

nixosTests.binary-cache{no-compression,xz}: migrate to runTest (#395261)

parents 278d58d6 fab4accc

nixos/tests/all-tests.nix

+12 −3
Original line number Diff line number Diff line
@@ -231,9 +231,18 @@ in 
  beanstalkd = handleTest ./beanstalkd.nix { };

  bees = handleTest ./bees.nix { };

  benchexec = handleTest ./benchexec.nix { };

  binary-cache = handleTest ./binary-cache.nix { compression = "zstd"; };

  binary-cache-no-compression = handleTest ./binary-cache.nix { compression = "none"; };

  binary-cache-xz = handleTest ./binary-cache.nix { compression = "xz"; };

  binary-cache = runTest {

    imports = [ ./binary-cache.nix ];

    _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 { };

  bird = handleTest ./bird.nix { };

  birdwatcher = handleTest ./birdwatcher.nix { };

nixos/tests/binary-cache.nix

+71 −76
Original line number Diff line number Diff line 
{ compression, ... }@args:



import ./make-test-python.nix (

  { lib, pkgs, ... }:



{ lib, compression, ... }:

{

  name = "binary-cache-" + compression;

  meta.maintainers = with lib.maintainers; [ thomasjm ];
@@ -85,4 +81,3 @@ import ./make-test-python.nix ( 
    machine.succeed("[ -d %s ] || exit 1" % storePath)

  '';

}
 
) args