Unverified Commit 39feb5ab authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

nixosTests.docker{rootless,registry,tools-overlay,tools-cross}: migrate to runTest (#395516)

parents 8159a40e b7a4f78f

nixos/tests/all-tests.nix

+5 −5
Original line number Diff line number Diff line
@@ -369,13 +369,13 @@ in 
  dnscrypt-proxy2 = handleTestOn [ "x86_64-linux" ] ./dnscrypt-proxy2.nix { };

  dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };

  doas = runTest ./doas.nix;

  docker = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix { };

  docker-rootless = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix { };

  docker-registry = handleTest ./docker-registry.nix { };

  docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;

  docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;

  docker-registry = runTest ./docker-registry.nix;

  docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };

  docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;

  docker-tools-cross = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix { };

  docker-tools-overlay = handleTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix { };

  docker-tools-cross = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix;

  docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;

  docling-serve = runTest ./docling-serve.nix;

  documize = handleTest ./documize.nix { };

  documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };

nixos/tests/docker-registry.nix

+60 −63
Original line number Diff line number Diff line 
# This test runs docker-registry and check if it works



import ./make-test-python.nix (

{ pkgs, ... }:

{

  name = "docker-registry";
@@ -71,4 +69,3 @@ import ./make-test-python.nix ( 
    )

  '';

}
 
)

nixos/tests/docker-rootless.nix

+41 −44
Original line number Diff line number Diff line 
# This test runs docker and checks if simple container starts



import ./make-test-python.nix (

{ lib, pkgs, ... }:

{

  name = "docker-rootless";
@@ -48,4 +46,3 @@ import ./make-test-python.nix ( 
      machine.succeed("${sudo} docker stop sleeping")

    '';

}
 
)

nixos/tests/docker-tools-cross.nix

+66 −68
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# tests that _include_ running the result are separate. That way, most people

# can run the majority of the test suite without the extra setup.



import ./make-test-python.nix (

{ pkgs, ... }:

let
@@ -81,4 +80,3 @@ import ./make-test-python.nix ( 
        )

  '';

}
 
)

nixos/tests/docker-tools-overlay.nix

+30 −33
Original line number Diff line number Diff line 
# this test creates a simple GNU image with docker tools and sees if it executes



import ./make-test-python.nix (

{ pkgs, ... }:

{

  name = "docker-tools-overlay";
@@ -35,4 +33,3 @@ import ./make-test-python.nix ( 
    docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")

  '';

}
 
)