Merge pull request #384 from ackama:linting/disable-paralleltest

PiperOrigin-RevId: 715966740
google · Jan 15, 2025 · f90f987 · f90f987
2 parents f10186f + bc40a66
commit f90f987
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -62,7 +62,6 @@ linters:
 #    - noctx
     - nolintlint
 #    - nosprintfhostport
-#    - paralleltest
 #    - perfsprint
 #    - prealloc
     - predeclared
@@ -90,7 +89,8 @@ linters:
     - zerologlint
   disable-all: true
 #  disable:
-#    - tparallel # Parallel tests mixes up log lines of multiple tests in the internal test runner
+#    - paralleltest # Parallel tests mixes up log lines of multiple tests in the internal test runner
+#    - tparallel    # Parallel tests mixes up log lines of multiple tests in the internal test runner
 
 linters-settings:
   forbidigo: