gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixosTests.docker-tools-overlay: migrate to runTestOn

Browse Source 
Part of #386873
This commit is contained in:
Piotr Kwiecinski
2025-04-02 17:14:24 +02:00
parent cc69d51afb
commit d3b5f76505
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,7 +375,7 @@ in
docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { }; docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };
docker-tools-nix-shell = runTest ./docker-tools-nix-shell.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-cross = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix { };
docker-tools-overlay = handleTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix { }; docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;
docling-serve = runTest ./docling-serve.nix; docling-serve = runTest ./docling-serve.nix;
documize = handleTest ./documize.nix { }; documize = handleTest ./documize.nix { };
documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };

9
nixos/tests/docker-tools-overlay.nix
View File

@@ -1,8 +1,6 @@
# this test creates a simple GNU image with docker tools and sees if it executes # this test creates a simple GNU image with docker tools and sees if it executes
{ pkgs, ... }:
import ./make-test-python.nix ( {
{ pkgs, ... }:
{
name = "docker-tools-overlay"; name = "docker-tools-overlay";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ maintainers = [
@@ -34,5 +32,4 @@ import ./make-test-python.nix (
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store # drw------- 99 0 0 100 Apr 14 11:36 /nix/store
docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version") docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
''; '';
} }
)