From 76a41206c0051a09594ccbca1fa43103f5973c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?=
 <13665637+DanielNoord@users.noreply.github.com>
Date: Sat, 28 May 2022 21:03:28 +0200
Subject: [PATCH] Move ``pylint_primer_tests`` into ``tests``

---
 .github/workflows/primer_run_main.yaml                      | 6 +++---
 .github/workflows/primer_run_pr.yaml                        | 6 +++---
 .gitignore                                                  | 2 +-
 pylint/testutils/primer.py                                  | 2 +-
 .../.pylint_primer_tests}/.gitkeep                          | 0
 tests/primer/primer_tool.py                                 | 4 ++--
 tests/primer/test_primer_external.py                        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename {.pylint_primer_tests => tests/.pylint_primer_tests}/.gitkeep (100%)

diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
index b587bce0fb..0169fb1456 100644
--- a/.github/workflows/primer_run_main.yaml
+++ b/.github/workflows/primer_run_main.yaml
@@ -69,7 +69,7 @@ jobs:
         id: cache-projects
         uses: actions/cache@v3
         with:
-          path: .pylint_primer_tests/
+          path: tests/.pylint_primer_tests/
           key: >-
             ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.commitstring.outputs.commitstring }}-primer
@@ -81,7 +81,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: primer_commitstring
-          path: .pylint_primer_tests/commit_string.txt
+          path: tests/.pylint_primer_tests/commit_string.txt
 
       # Run primer
       - name: Run pylint primer
@@ -93,4 +93,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: primer_output
-          path: .pylint_primer_tests/output_main.txt
+          path: tests/.pylint_primer_tests/output_main.txt
diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
index 642b34f347..cc753d9476 100644
--- a/.github/workflows/primer_run_pr.yaml
+++ b/.github/workflows/primer_run_pr.yaml
@@ -115,7 +115,7 @@ jobs:
       - name: Copy and unzip the commit string
         run: |
           unzip primer_commitstring.zip
-          cp commit_string.txt .pylint_primer_tests/commit_string.txt
+          cp commit_string.txt tests/.pylint_primer_tests/commit_string.txt
       - name: Unzip the output of 'main'
         run: unzip primer_output_main.zip
       - name: Get commit string
@@ -128,7 +128,7 @@ jobs:
         id: cache-projects
         uses: actions/cache@v3
         with:
-          path: .pylint_primer_tests/
+          path: tests/.pylint_primer_tests/
           key: >-
             ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.commitstring.outputs.commitstring }}-primer
@@ -155,7 +155,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: primer_output_pr
-          path: .pylint_primer_tests/output_pr.txt
+          path: tests/.pylint_primer_tests/output_pr.txt
       - name: Upload output of 'main'
         uses: actions/upload-artifact@v3
         with:
diff --git a/.gitignore b/.gitignore
index ec5d55dd85..d807609565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ doc/user_guide/messages/fatal/
 doc/user_guide/messages/information/
 doc/user_guide/messages/refactor/
 doc/user_guide/messages/warning/
+tests/.pylint_primer_tests/
 pyve
 build-stamp
 .coverage
@@ -26,4 +27,3 @@ build-stamp
 .pytest_cache/
 .mypy_cache/
 .benchmarks/
-.pylint_primer_tests/
diff --git a/pylint/testutils/primer.py b/pylint/testutils/primer.py
index 6f3c9c9553..0492c3a8bc 100644
--- a/pylint/testutils/primer.py
+++ b/pylint/testutils/primer.py
@@ -9,7 +9,7 @@
 
 import git
 
-PRIMER_DIRECTORY_PATH = Path(".pylint_primer_tests")
+PRIMER_DIRECTORY_PATH = Path("tests") / ".pylint_primer_tests"
 
 
 class PackageToLint:
diff --git a/.pylint_primer_tests/.gitkeep b/tests/.pylint_primer_tests/.gitkeep
similarity index 100%
rename from .pylint_primer_tests/.gitkeep
rename to tests/.pylint_primer_tests/.gitkeep
diff --git a/tests/primer/primer_tool.py b/tests/primer/primer_tool.py
index efd5542fca..157db1496e 100644
--- a/tests/primer/primer_tool.py
+++ b/tests/primer/primer_tool.py
@@ -15,8 +15,8 @@
 from pylint.reporters import JSONReporter
 from pylint.testutils.primer import PackageToLint
 
-MAIN_DIR = Path(__file__).parent.parent.parent
-PRIMER_DIRECTORY = MAIN_DIR / ".pylint_primer_tests/"
+TESTS_DIR = Path(__file__).parent.parent
+PRIMER_DIRECTORY = TESTS_DIR / ".pylint_primer_tests/"
 PACKAGES_TO_PRIME_PATH = Path(__file__).parent / "packages_to_prime.json"
 
 
diff --git a/tests/primer/test_primer_external.py b/tests/primer/test_primer_external.py
index 76f1ee8cb9..21e2f8c26f 100644
--- a/tests/primer/test_primer_external.py
+++ b/tests/primer/test_primer_external.py
@@ -14,7 +14,7 @@
 
 from pylint.testutils.primer import PackageToLint
 
-PRIMER_DIRECTORY = Path(".pylint_primer_tests/").resolve()
+PRIMER_DIRECTORY = (Path("tests") / ".pylint_primer_tests/").resolve()
 
 
 def get_packages_to_lint_from_json(json_path: Path | str) -> dict[str, PackageToLint]: