Skip to content

Commit

Permalink
Revert "nixos/tests/docker-tools*: remove useless formatter"
Browse files Browse the repository at this point in the history
Annoyed with the interference of the python formatting of
generated code (see NixOS#72964), I took matters into my own hands
as maintainer of dockerTools.

Afterwards, I've created a PR, hoping to unstuck the discussion.

@aszlig took notice and thanks to his python ecosystem knowledge,
the testing efforts of @blaggacao and @Ma27, and a sense of
shared suffering and comraderie we were able to change the
situation for the better in NixOS#122201.

Now, we have a proper linter that actually helps contributors,
so it's time to turn it back on again.

I'm glad we could make it happen this quickly!

Thanks!

This reverts commit 4035049.
  • Loading branch information
roberth committed May 9, 2021
1 parent 5d9dc70 commit 8c868f4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions nixos/tests/docker-tools-cross.nix
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,4 @@ in {
"docker rmi ${hello2.imageName}",
)
'';

# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})
3 changes: 0 additions & 3 deletions nixos/tests/docker-tools-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,4 @@ import ./make-test-python.nix ({ pkgs, ... }:
# 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")
'';

# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})
3 changes: 0 additions & 3 deletions nixos/tests/docker-tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"
)
'';

# Remove when the formatter has been removed and a linter has been added
skipLint = true;
})

0 comments on commit 8c868f4

Please sign in to comment.