movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.docker: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-02 14:37:58 +02:00
parent 2f176b5def
commit d175fc3af4
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -369,7 +369,7 @@ in
dnscrypt-proxy2 = handleTestOn [ "x86_64-linux" ] ./dnscrypt-proxy2.nix { }; dnscrypt-proxy2 = handleTestOn [ "x86_64-linux" ] ./dnscrypt-proxy2.nix { };
dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
doas = runTest ./doas.nix; doas = runTest ./doas.nix;
docker = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix { }; docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;
docker-rootless = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix { }; docker-rootless = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix { };
docker-registry = handleTest ./docker-registry.nix { }; docker-registry = handleTest ./docker-registry.nix { };
docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { }; docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };

3
nixos/tests/docker.nix
View file

@ -1,6 +1,4 @@
# This test runs docker and checks if simple container starts # This test runs docker and checks if simple container starts
import ./make-test-python.nix (
{ pkgs, ... }: { pkgs, ... }:
{ {
name = "docker"; name = "docker";
@ -56,4 +54,3 @@ import ./make-test-python.nix (
docker.succeed("grep 1 /proc/sys/net/ipv4/conf/default/forwarding") docker.succeed("grep 1 /proc/sys/net/ipv4/conf/default/forwarding")
''; '';
} }
)