fix tests

use pytest-datadir instead of my custom thing which was broken
examol-corp · Mar 12, 2024 · d4d6e47 · d4d6e47
1 parent b4e7367
commit d4d6e47
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 39 deletions.
diff --git a/hatch.toml b/hatch.toml
@@ -8,6 +8,7 @@ python = "3.12"
 
 dependencies = [
     "pytest",
+    "pytest-datadir",
     "black",
     "ruff",
     "mypy",

diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/test_collector.py b/tests/test_collector.py
@@ -13,19 +13,19 @@
 
 
 @pytest.mark.pointer(target=detect_files)
-def test_detect_files(test_data_dir):
-    assert len(detect_files(test_data_dir / "detect_files")) == 2
+def test_detect_files(datadir):
+    assert len(detect_files(datadir / "detect_files")) == 2
 
 
 @pytest.mark.pointer(target=resolve_fq_modules)
-def test_resolve_fq_modules(test_data_dir):
+def test_resolve_fq_modules(datadir):
 
     expected_module_fqs = [
         "mymodule.thing",
         "mymodule.other",
     ]
 
-    search_dir = test_data_dir / "resolve_fq_modules"
+    search_dir = datadir / "resolve_fq_modules"
     modpath = search_dir / "mymodule"
     submod_paths = [
         modpath / "thing.py",
@@ -44,9 +44,9 @@ def test_resolve_fq_modules(test_data_dir):
 
 
 @pytest.mark.pointer(target=resolve_fq_targets)
-def test_resolve_fq_targets(test_data_dir):
+def test_resolve_fq_targets(datadir):
 
-    search_dir = test_data_dir / "resolve_fq_targets"
+    search_dir = datadir / "resolve_fq_targets"
     modpath = search_dir / "mymodule"
     submod_paths = modpath.glob("**/*.py")
 

diff --git a/test_data/a.py → tests/test_collector/a.py b/test_data/a.py → tests/test_collector/a.py
diff --git a/test_data/detect_files/a.py → tests/test_collector/detect_files/a.py b/test_data/detect_files/a.py → tests/test_collector/detect_files/a.py
diff --git a/test_data/detect_files/b.py → tests/test_collector/detect_files/b.py b/test_data/detect_files/b.py → tests/test_collector/detect_files/b.py
diff --git a/test_data/mock_structure/__init__.py → ...test_collector/mock_structure/__init__.py b/test_data/mock_structure/__init__.py → ...test_collector/mock_structure/__init__.py
diff --git a/test_data/mock_structure/for_func_finder.py → ...llector/mock_structure/for_func_finder.py b/test_data/mock_structure/for_func_finder.py → ...llector/mock_structure/for_func_finder.py
diff --git a/...a/resolve_fq_modules/mymodule/__init__.py → ...r/resolve_fq_modules/mymodule/__init__.py b/...a/resolve_fq_modules/mymodule/__init__.py → ...r/resolve_fq_modules/mymodule/__init__.py
diff --git a/...data/resolve_fq_modules/mymodule/other.py → ...ctor/resolve_fq_modules/mymodule/other.py b/...data/resolve_fq_modules/mymodule/other.py → ...ctor/resolve_fq_modules/mymodule/other.py
diff --git a/...data/resolve_fq_modules/mymodule/thing.py → ...ctor/resolve_fq_modules/mymodule/thing.py b/...data/resolve_fq_modules/mymodule/thing.py → ...ctor/resolve_fq_modules/mymodule/thing.py
diff --git a/...a/resolve_fq_targets/mymodule/__init__.py → ...r/resolve_fq_targets/mymodule/__init__.py b/...a/resolve_fq_targets/mymodule/__init__.py → ...r/resolve_fq_targets/mymodule/__init__.py
diff --git a/...lve_fq_targets/mymodule/cases/__init__.py → ...lve_fq_targets/mymodule/cases/__init__.py b/...lve_fq_targets/mymodule/cases/__init__.py → ...lve_fq_targets/mymodule/cases/__init__.py
diff --git a/...q_targets/mymodule/cases/async_methods.py → ...q_targets/mymodule/cases/async_methods.py b/...q_targets/mymodule/cases/async_methods.py → ...q_targets/mymodule/cases/async_methods.py
diff --git a/...e_fq_targets/mymodule/cases/decorators.py → ...e_fq_targets/mymodule/cases/decorators.py b/...e_fq_targets/mymodule/cases/decorators.py → ...e_fq_targets/mymodule/cases/decorators.py
diff --git a/...olve_fq_targets/mymodule/cases/ignored.py → ...olve_fq_targets/mymodule/cases/ignored.py b/...olve_fq_targets/mymodule/cases/ignored.py → ...olve_fq_targets/mymodule/cases/ignored.py
diff --git a/...q_targets/mymodule/cases/multi_methods.py → ...q_targets/mymodule/cases/multi_methods.py b/...q_targets/mymodule/cases/multi_methods.py → ...q_targets/mymodule/cases/multi_methods.py
diff --git a/.../mymodule/cases/multiclass_same_method.py → .../mymodule/cases/multiclass_same_method.py b/.../mymodule/cases/multiclass_same_method.py → .../mymodule/cases/multiclass_same_method.py
diff --git a/...data/resolve_fq_targets/mymodule/other.py → ...ctor/resolve_fq_targets/mymodule/other.py b/...data/resolve_fq_targets/mymodule/other.py → ...ctor/resolve_fq_targets/mymodule/other.py
diff --git a/...data/resolve_fq_targets/mymodule/thing.py → ...ctor/resolve_fq_targets/mymodule/thing.py b/...data/resolve_fq_targets/mymodule/thing.py → ...ctor/resolve_fq_targets/mymodule/thing.py
diff --git a/tests/test_data.py b/tests/test_data.py