diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-05-09 02:48:59 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-05-09 02:57:17 +0200 |
commit | 8c868f47a8934ccfa27d5ac3103297d344506b68 (patch) | |
tree | ff66c8cf62cec7444eb94baaa61bb9369109b1ba | |
parent | 5d9dc70c2fc0e2bbf8375b1ef5c22df5606682ea (diff) | |
download | nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar.gz nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar.bz2 nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar.lz nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar.xz nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.tar.zst nixpkgs-8c868f47a8934ccfa27d5ac3103297d344506b68.zip |
Revert "nixos/tests/docker-tools*: remove useless formatter"
Annoyed with the interference of the python formatting of generated code (see #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 #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 4035049af3e45554ffc4d8b4c30fd43ae9cd328a.
-rw-r--r-- | nixos/tests/docker-tools-cross.nix | 3 | ||||
-rw-r--r-- | nixos/tests/docker-tools-overlay.nix | 3 | ||||
-rw-r--r-- | nixos/tests/docker-tools.nix | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index 91a6c954008..a7a6a31475d 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -73,7 +73,4 @@ in { "docker rmi ${hello2.imageName}", ) ''; - - # Remove when the formatter has been removed and a linter has been added - skipLint = true; }) diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index b4504032019..6781388e639 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -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; }) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 650648fe724..39b97b4cb99 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -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; }) |