summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2020-09-14 11:05:48 -0300
committerGitHub <noreply@github.com>2020-09-14 11:05:48 -0300
commita5931fa6e38da31f119cf08127c1aa8f178a22af (patch)
tree78aa6349cac51a2281b3e46013ff448cbf29134c /nixos
parent0d82843d168a0bfa42ccf5dd8eed8672119934aa (diff)
parentae82f81bfaf8691e49a0de9c01c29c72a411bfb3 (diff)
downloadnixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar.gz
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar.bz2
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar.lz
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar.xz
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.tar.zst
nixpkgs-a5931fa6e38da31f119cf08127c1aa8f178a22af.zip
Merge pull request #95409 from utdemir/stream_layered_image_fix
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/docker-tools.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 2543801ae8b..edb9aec62db 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -219,18 +219,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         )
 
     with subtest("Ensure correct behavior when no store is needed"):
-        # This check tests two requirements simultaneously
-        #  1. buildLayeredImage can build images that don't need a store.
-        #  2. Layers of symlinks are eliminated by the customization layer.
-        #
+        # This check tests that buildLayeredImage can build images that don't need a store.
         docker.succeed(
             "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'"
         )
 
-        # Busybox will not recognize argv[0] and print an error message with argv[0],
-        # but it confirms that the custom-true symlink is present.
-        docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true")
-
         # This check may be loosened to allow an *empty* store rather than *no* store.
         docker.succeed("docker run --rm no-store-paths ls /")
         docker.fail("docker run --rm no-store-paths ls /nix/store")