Merge pull request #12 from RMeli/tests

Move tests outside of Python package
RMeli · Nov 17, 2021 · 0ba2909 · 0ba2909
2 parents 563fe78 + f481268
commit 0ba2909
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 74 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -66,7 +66,7 @@ jobs:
       shell: bash -l {0}
 
       run: |
-        pytest -v --cov=gnina --cov-report=xml --color=yes gnina/tests/ --nogpu
+        pytest -v --cov=gnina --cov-report=xml --color=yes tests/ --nogpu
 
     - name: CodeCov
       uses: codecov/codecov-action@v1

diff --git a/pytest.ini b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
 minversion = 6.0
 testpaths =
-    gnina/tests/
+    tests/
diff --git a/gnina/tests/__init__.py → tests/__init__.py b/gnina/tests/__init__.py → tests/__init__.py
diff --git a/gnina/tests/conftest.py → tests/conftest.py b/gnina/tests/conftest.py → tests/conftest.py
@@ -1,3 +1,5 @@
+import os
+
 import molgrid
 import pytest
 import torch
@@ -35,3 +37,30 @@ def device(pytestconfig):
         device = torch.device("cpu")
 
     return device
+
+
+@pytest.fixture(scope="session")
+def trainfile() -> str:
+    """
+    Path to small training file.
+    """
+    path = os.path.dirname(__file__)
+    return os.path.join(path, "data", "test.types")
+
+
+@pytest.fixture
+def testfile() -> str:
+    """
+    Path to small test file.
+    """
+    path = os.path.dirname(__file__)
+    return os.path.join(path, "data", "test.types")
+
+
+@pytest.fixture(scope="session")
+def dataroot() -> str:
+    """
+    Path to test directory.
+    """
+    path = os.path.dirname(__file__)
+    return os.path.join(path, "data", "mols")
diff --git a/gnina/data/README.md → tests/data/README.md b/gnina/data/README.md → tests/data/README.md
diff --git a/gnina/data/test/l1.sdf → tests/data/mols/l1.sdf b/gnina/data/test/l1.sdf → tests/data/mols/l1.sdf
diff --git a/gnina/data/test/l2.sdf → tests/data/mols/l2.sdf b/gnina/data/test/l2.sdf → tests/data/mols/l2.sdf
diff --git a/gnina/data/test/r1.pdb → tests/data/mols/r1.pdb b/gnina/data/test/r1.pdb → tests/data/mols/r1.pdb
diff --git a/gnina/data/test/r2.pdb → tests/data/mols/r2.pdb b/gnina/data/test/r2.pdb → tests/data/mols/r2.pdb
diff --git a/gnina/data/test.types → tests/data/test.types b/gnina/data/test.types → tests/data/test.types
diff --git a/gnina/tests/test_dataloaders.py → tests/test_dataloaders.py b/gnina/tests/test_dataloaders.py → tests/test_dataloaders.py
@@ -1,31 +1,10 @@
-import os
-import sys
-
 import pytest
 import torch
 
 from gnina import setup, training
 from gnina.dataloaders import GriddedExamplesLoader
 
 
-@pytest.fixture
-def trainfile() -> str:
-    """
-    Path to small training file.
-    """
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test.types")
-
-
-@pytest.fixture
-def dataroot() -> str:
-    """
-    Path to test directory.
-    """
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test")
-
-
 @pytest.mark.parametrize("iteration_scheme", ["small", "large"])
 def test_GriddedExamplesLoader(trainfile, dataroot, device, iteration_scheme):
     # Do not shuffle examples randomly when loading the batch

diff --git a/gnina/tests/test_import.py → tests/test_import.py b/gnina/tests/test_import.py → tests/test_import.py
diff --git a/gnina/tests/test_inference.py → tests/test_inference.py b/gnina/tests/test_inference.py → tests/test_inference.py
@@ -1,29 +1,8 @@
 import os
-import sys
-
-import pytest
 
 from gnina import inference, training
 
 
-@pytest.fixture
-def trainfile() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test.types")
-
-
-@pytest.fixture
-def testfile() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test.types")
-
-
-@pytest.fixture
-def dataroot() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test")
-
-
 def test_inference(trainfile, testfile, dataroot, tmpdir, device):
     epochs = 1
 

diff --git a/gnina/tests/test_losses.py → tests/test_losses.py b/gnina/tests/test_losses.py → tests/test_losses.py
diff --git a/gnina/tests/test_models.py → tests/test_models.py b/gnina/tests/test_models.py → tests/test_models.py
diff --git a/gnina/tests/test_setup.py → tests/test_setup.py b/gnina/tests/test_setup.py → tests/test_setup.py
@@ -1,24 +1,9 @@
-import os
-import sys
-
 import pytest
 import torch
 
 from gnina import setup, training
 
 
-@pytest.fixture
-def trainfile() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test.types")
-
-
-@pytest.fixture
-def dataroot() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test")
-
-
 def test_setup_example_provider_default(trainfile, dataroot, device):
     # Do not shuffle examples randomly when loading the batch
     # This ensures reproducibility

diff --git a/gnina/tests/test_training.py → tests/test_training.py b/gnina/tests/test_training.py → tests/test_training.py
@@ -1,23 +1,8 @@
-import os
-import sys
-
 import pytest
 
 from gnina import training
 
 
-@pytest.fixture
-def trainfile() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test.types")
-
-
-@pytest.fixture
-def dataroot() -> str:
-    gnina_path = os.path.dirname(sys.modules["gnina"].__file__)
-    return os.path.join(gnina_path, "data", "test")
-
-
 def test_options_default(trainfile):
     args = training.options([trainfile])