From 41bae50528ab532fb06c08aca3c8c263dbb3167c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 15 Apr 2023 12:30:07 +0100
Subject: [PATCH] Don't check for black or pre-commit by default

Fix #4261
---
 tests/test_bare.sh                    | 6 ------
 tests/test_cookiecutter_generation.py | 8 +++++++-
 tests/test_docker.sh                  | 7 -------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index afd12fec8..5dc175ebd 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -20,12 +20,6 @@ sudo utility/install_os_dependencies.sh install
 # Install Python deps
 pip install -r requirements/local.txt
 
-# Lint by running pre-commit on all files
-# Needs a git repo to find the project root
-git init
-git add .
-pre-commit run --show-diff-on-failure -a
-
 # run the project's tests
 pytest
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index cb5a99cdb..3bc259a89 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -20,6 +20,11 @@ if sys.platform.startswith("win"):
 elif sys.platform.startswith("darwin") and os.getenv("CI"):
     pytest.skip("skipping slow macOS tests on CI", allow_module_level=True)
 
+# Run auto-fixable styles checks - skipped on CI by default. These can be fixed
+# automatically by running pre-commit after generation however they are tedious
+# to fix in the template, so we don't insist too much in fixing them.
+AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == 1
+
 
 @pytest.fixture
 def context():
@@ -184,9 +189,10 @@ def test_flake8_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@pytest.mark.skipif(AUTOFIXABLE_STYLES, reason="Black is auto-fixable")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_black_passes(cookies, context_override):
-    """Generated project should pass black."""
+    """Check whether generated project passes black style."""
     result = cookies.bake(extra_context=context_override)
 
     try:
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 28d232896..5c60d20d3 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -14,13 +14,6 @@ cd .cache/docker
 cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y "$@"
 cd my_awesome_project
 
-# Lint by running pre-commit on all files
-# Needs a git repo to find the project root
-# We don't have git inside Docker, so run it outside
-git init
-git add .
-pre-commit run --show-diff-on-failure -a
-
 # make sure all images build
 docker-compose -f local.yml build