From 36d6ba08d0b143bfa52cbb642dc256d0b6fb040e Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:38:54 -0700
Subject: [3.12] gh-60283: Check for redefined test names in CI (GH-109161)
 (#109365)

* gh-60283: Check for redefined test names in CI (GH-109161)
(cherry picked from commit 3cb9a8edca6e3fa0f0045b03a9a6444cf8f7affe)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>

* Update exclude list for 3.12

* Explicitly exclude files which failed to lint/parse

* Sort to avoid future merge conflicts

---------

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---
 .github/CODEOWNERS          |  1 +
 .github/workflows/build.yml |  2 +-
 .github/workflows/lint.yml  |  4 ++++
 .pre-commit-config.yaml     | 10 ++++++++++
 Lib/test/.ruff.toml         | 42 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 Lib/test/.ruff.toml

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 95fd51b..913de4e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,6 +9,7 @@
 
 # pre-commit
 .pre-commit-config.yaml       @hugovk @AlexWaygood
+.ruff.toml                    @hugovk @AlexWaygood
 
 # Build system
 configure*                    @erlend-aasland @corona10
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3061c8f..feddecf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
             # into the PR branch anyway.
             #
             # https://github.com/python/core-workflow/issues/373
-            git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc)' && echo "run_tests=true" >> $GITHUB_OUTPUT || true
+            git diff --name-only origin/$GITHUB_BASE_REF.. | grep -qvE '(\.rst$|^Doc|^Misc|^\.pre-commit-config\.yaml$|\.ruff\.toml$)' && echo "run_tests=true" >> $GITHUB_OUTPUT || true
           fi
 
           # Check if we should run hypothesis tests
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 27b04ba..89f6581 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
 permissions:
   contents: read
 
+env:
+  FORCE_COLOR: 1
+  RUFF_FORMAT: github
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 451cbe8..19f6a03 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,17 @@
 repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.288
+    hooks:
+      - id: ruff
+        name: Run Ruff on Lib/test/
+        args: [--exit-non-zero-on-fix]
+        files: ^Lib/test/
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
+      - id: check-toml
+        exclude: ^Lib/test/test_tomllib/
       - id: check-yaml
       - id: end-of-file-fixer
         types: [python]
diff --git a/Lib/test/.ruff.toml b/Lib/test/.ruff.toml
new file mode 100644
index 0000000..3bdd472
--- /dev/null
+++ b/Lib/test/.ruff.toml
@@ -0,0 +1,42 @@
+fix = true
+select = [
+    "F811",  # Redefinition of unused variable (useful for finding test methods with the same name)
+]
+extend-exclude = [
+    # Failed to lint
+    "badsyntax_pep3120.py",
+    "encoded_modules/module_iso_8859_1.py",
+    "encoded_modules/module_koi8_r.py",
+    # Failed to parse
+    "badsyntax_3131.py",
+    "support/socket_helper.py",
+    "test_fstring.py",
+    "test_lib2to3/data/bom.py",
+    "test_lib2to3/data/crlf.py",
+    "test_lib2to3/data/different_encoding.py",
+    "test_lib2to3/data/false_encoding.py",
+    "test_lib2to3/data/py2_test_grammar.py",
+    # TODO Fix: F811 Redefinition of unused name
+    "test_buffer.py",
+    "test_capi/test_misc.py",
+    "test_capi/test_unicode.py",
+    "test_ctypes/test_arrays.py",
+    "test_ctypes/test_functions.py",
+    "test_dataclasses.py",
+    "test_descr.py",
+    "test_enum.py",
+    "test_functools.py",
+    "test_genericclass.py",
+    "test_grammar.py",
+    "test_import/__init__.py",
+    "test_keywordonlyarg.py",
+    "test_lib2to3/data/py3_test_grammar.py",
+    "test_pkg.py",
+    "test_subclassinit.py",
+    "test_tokenize.py",
+    "test_typing.py",
+    "test_yield_from.py",
+    "time_hashlib.py",
+    # Pending https://github.com/python/cpython/pull/109139
+    "test_monitoring.py",
+]
-- 
cgit v0.12