Create a directory for checker's unittests

18 files changed, 9 insertions, 19 deletions

diff --git a/tests/checkers/__init__.py b/tests/checkers/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/tests/checkers/__init__.py
diff --git a/tests/checkers/conftest.py b/tests/checkers/conftest.py
new file mode 100644
index 000000000..e83101542
--- /dev/null
+++ b/tests/checkers/conftest.py
@@ -0,0 +1,4 @@
+from pathlib import Path
+
+HERE = Path(__file__).parent
+REGR_DATA = HERE / ".." / "regrtest_data"
diff --git a/tests/unittest_checker_base.py b/tests/checkers/unittest_checker_base.py
index a566ad1ac..a566ad1ac 100644
--- a/tests/unittest_checker_base.py
+++ b/tests/checkers/unittest_checker_base.py
diff --git a/tests/unittest_checker_classes.py b/tests/checkers/unittest_checker_classes.py
index cb6e2227f..cb6e2227f 100644
--- a/tests/unittest_checker_classes.py
+++ b/tests/checkers/unittest_checker_classes.py
diff --git a/tests/unittest_checker_exceptions.py b/tests/checkers/unittest_checker_exceptions.py
index eb4e2f379..eb4e2f379 100644
--- a/tests/unittest_checker_exceptions.py
+++ b/tests/checkers/unittest_checker_exceptions.py
diff --git a/tests/unittest_checker_format.py b/tests/checkers/unittest_checker_format.py
index 2494b4daf..2494b4daf 100644
--- a/tests/unittest_checker_format.py
+++ b/tests/checkers/unittest_checker_format.py
diff --git a/tests/unittest_checker_imports.py b/tests/checkers/unittest_checker_imports.py
index c59bab79e..f385fd2cd 100644
--- a/tests/unittest_checker_imports.py
+++ b/tests/checkers/unittest_checker_imports.py
@@ -16,6 +16,7 @@
 # For details: https://github.com/PyCQA/pylint/blob/master/COPYING
 
 """Unit tests for the imports checker."""
+
 import os
 
 import astroid
@@ -24,7 +25,7 @@ from pylint.checkers import imports
 from pylint.interfaces import UNDEFINED
 from pylint.testutils import CheckerTestCase, Message, set_config
 
-REGR_DATA = os.path.join(os.path.dirname(__file__), "regrtest_data", "")
+REGR_DATA = os.path.join(os.path.dirname(__file__), "..", "regrtest_data", "")
 
 
 class TestImportsChecker(CheckerTestCase):
diff --git a/tests/unittest_checker_logging.py b/tests/checkers/unittest_checker_logging.py
index 5eaa6c883..5eaa6c883 100644
--- a/tests/unittest_checker_logging.py
+++ b/tests/checkers/unittest_checker_logging.py
diff --git a/tests/unittest_checker_misc.py b/tests/checkers/unittest_checker_misc.py
index 587bbd069..587bbd069 100644
--- a/tests/unittest_checker_misc.py
+++ b/tests/checkers/unittest_checker_misc.py
diff --git a/tests/unittest_checker_python3.py b/tests/checkers/unittest_checker_python3.py
index 9797c11d2..9797c11d2 100644
--- a/tests/unittest_checker_python3.py
+++ b/tests/checkers/unittest_checker_python3.py
diff --git a/tests/unittest_checker_similar.py b/tests/checkers/unittest_checker_similar.py
index 2763eb08c..0fb438684 100644
--- a/tests/unittest_checker_similar.py
+++ b/tests/checkers/unittest_checker_similar.py
@@ -21,7 +21,7 @@ import pytest
 
 from pylint.checkers import similar
 
-INPUT = Path(__file__).parent / "input"
+INPUT = Path(__file__).parent / ".." / "input"
 SIMILAR1 = str(INPUT / "similar1")
 SIMILAR2 = str(INPUT / "similar2")
 MULTILINE = str(INPUT / "multiline-import")
diff --git a/tests/unittest_checker_spelling.py b/tests/checkers/unittest_checker_spelling.py
index 392df808b..392df808b 100644
--- a/tests/unittest_checker_spelling.py
+++ b/tests/checkers/unittest_checker_spelling.py
diff --git a/tests/unittest_checker_stdlib.py b/tests/checkers/unittest_checker_stdlib.py
index 1331db709..1331db709 100644
--- a/tests/unittest_checker_stdlib.py
+++ b/tests/checkers/unittest_checker_stdlib.py
diff --git a/tests/unittest_checker_strings.py b/tests/checkers/unittest_checker_strings.py
index 2545f7b17..2545f7b17 100644
--- a/tests/unittest_checker_strings.py
+++ b/tests/checkers/unittest_checker_strings.py
diff --git a/tests/unittest_checker_typecheck.py b/tests/checkers/unittest_checker_typecheck.py
index 3e8e26f2c..3e8e26f2c 100644
--- a/tests/unittest_checker_typecheck.py
+++ b/tests/checkers/unittest_checker_typecheck.py
diff --git a/tests/unittest_checker_variables.py b/tests/checkers/unittest_checker_variables.py
index 72ecdc138..028cb747a 100644
--- a/tests/unittest_checker_variables.py
+++ b/tests/checkers/unittest_checker_variables.py
@@ -16,7 +16,6 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/master/COPYING
 
-"""Unit tests for the variables checker."""
 import os
 import re
 import sys
@@ -28,7 +27,7 @@ from pylint.checkers import variables
 from pylint.interfaces import UNDEFINED
 from pylint.testutils import CheckerTestCase, Message, linter, set_config
 
-REGR_DATA_DIR = Path(__file__).parent / "regrtest_data"
+REGR_DATA_DIR = Path(__file__).parent / ".." / "regrtest_data"
 
 
 class TestVariablesChecker(CheckerTestCase):
diff --git a/tests/unittest_checkers_utils.py b/tests/checkers/unittest_checkers_utils.py
index 4da296bcf..4da296bcf 100644
--- a/tests/unittest_checkers_utils.py
+++ b/tests/checkers/unittest_checkers_utils.py
diff --git a/tox.ini b/tox.ini
index b7b9fd3c6..3d7b6b4e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ commands =
     # This would be greatly simplified by a solution for https://github.com/PyCQA/pylint/issues/352
     pylint -rn --rcfile={toxinidir}/tests/.test_pylintrc --load-plugins=pylint.extensions.docparams, pylint.extensions.mccabe \
     {toxinidir}/tests/message/ \
+    {toxinidir}/tests/checkers/ \
     {toxinidir}/tests/extensions/ \
     {toxinidir}/tests/utils/ \
     {toxinidir}/tests/acceptance/ \
@@ -24,21 +25,6 @@ commands =
     {toxinidir}/tests/test_pylint_runners.py \
     {toxinidir}/tests/test_regr.py \
     {toxinidir}/tests/test_self.py \
-    {toxinidir}/tests/unittest_checker_base.py \
-    {toxinidir}/tests/unittest_checker_classes.py  \
-   {toxinidir}/tests/unittest_checker_exceptions.py \
-    {toxinidir}/tests/unittest_checker_format.py \
-    {toxinidir}/tests/unittest_checker_imports.py \
-    {toxinidir}/tests/unittest_checker_logging.py \
-    {toxinidir}/tests/unittest_checker_misc.py \
-    {toxinidir}/tests/unittest_checker_python3.py \
-    {toxinidir}/tests/unittest_checker_similar.py \
-    {toxinidir}/tests/unittest_checker_spelling.py \
-    {toxinidir}/tests/unittest_checker_stdlib.py \
-    {toxinidir}/tests/unittest_checker_strings.py \
-    {toxinidir}/tests/unittest_checkers_utils.py \
-    {toxinidir}/tests/unittest_checker_typecheck.py \
-    {toxinidir}/tests/unittest_checker_variables.py \
     {toxinidir}/tests/unittest_config.py \
     {toxinidir}/tests/lint/ \
     {toxinidir}/tests/unittest_pyreverse_diadefs.py \