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-rootless: migrate to runTestOn

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

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

@ -370,7 +370,7 @@ in
dnsdist = import ./dnsdist.nix { inherit pkgs runTest; }; dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
doas = runTest ./doas.nix; doas = runTest ./doas.nix;
docker = runTestOn [ "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 = runTestOn [ "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 { };
docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix; docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;

9
nixos/tests/docker-rootless.nix
View file

@ -1,8 +1,6 @@
# This test runs docker and checks if simple container starts # This test runs docker and checks if simple container starts
{ lib, pkgs, ... }:
import ./make-test-python.nix ( {
{ lib, pkgs, ... }:
{
name = "docker-rootless"; name = "docker-rootless";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ abbradar ]; maintainers = [ abbradar ];
@ -47,5 +45,4 @@ import ./make-test-python.nix (
machine.succeed("${sudo} docker ps | grep sleeping") machine.succeed("${sudo} docker ps | grep sleeping")
machine.succeed("${sudo} docker stop sleeping") machine.succeed("${sudo} docker stop sleeping")
''; '';
} }
)