Simplify test cleanup

Author: WardBrian

test/conftest.py

@@ -0,0 +1,19 @@
+"""The global configuration for the test suite"""
+import os
+import subprocess
+
+import pytest
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+DATAFILES_PATH = os.path.join(HERE, 'data')
+
+
+# after we have run all tests, use git to delete the built files in data/
+@pytest.fixture(scope='session', autouse=True)
+def cleanup_test_files():
+    yield
+    subprocess.Popen(
+        ['git', 'clean', '-fX', DATAFILES_PATH],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.STDOUT,
+    )

test/test_model.py

@@ -8,7 +8,6 @@
 from unittest.mock import Mock
 
 import numpy as np
-import pytest
 import tqdm
 from testfixtures import LogCapture
 
@@ -37,23 +36,6 @@
 
 
 class CmdStanModelTest(unittest.TestCase):
-
-    # pylint: disable=no-self-use
-    @pytest.fixture(scope='class', autouse=True)
-    def do_clean_up(self):
-        for root, _, files in os.walk(DATAFILES_PATH):
-            for filename in files:
-                _, ext = os.path.splitext(filename)
-                if (
-                    ext.lower() in ('.o', '.d', '.hpp', '.exe', '')
-                    and filename != ".gitignore"
-                    and filename != "return_one.hpp"
-                ):
-                    filepath = os.path.join(root, filename)
-                    os.remove(filepath)
-                    # we should really make this module-level
-                    # and use something like git clean -Xf data/
-
     def show_cmdstan_version(self):
         print('\n\nCmdStan version: {}\n\n'.format(cmdstan_path()))
         self.assertTrue(True)
@@ -94,6 +76,7 @@ def test_model_good(self):
         self.assertEqual(BERN_STAN, model.stan_file)
         self.assertEqual(None, model.exe_file)
 
+    # pylint: disable=no-self-use
     def test_model_pedantic(self):
         with LogCapture() as log:
             logging.getLogger()

test/test_optimize.py

@@ -5,7 +5,6 @@
 import unittest
 
 import numpy as np
-import pytest
 from testfixtures import LogCapture
 
 from cmdstanpy.cmdstan_args import CmdStanArgs, OptimizeArgs
@@ -18,21 +17,6 @@
 
 
 class CmdStanMLETest(unittest.TestCase):
-
-    # pylint: disable=no-self-use
-    @pytest.fixture(scope='class', autouse=True)
-    def do_clean_up(self):
-        for root, _, files in os.walk(DATAFILES_PATH):
-            for filename in files:
-                _, ext = os.path.splitext(filename)
-                if (
-                    ext.lower() in ('.o', '.d', '.hpp', '.exe', '')
-                    and filename != ".gitignore"
-                    and filename != "return_one.hpp"
-                ):
-                    filepath = os.path.join(root, filename)
-                    os.remove(filepath)
-
     def test_instantiate(self):
         stan = os.path.join(DATAFILES_PATH, 'optimize', 'rosenbrock.stan')
         model = CmdStanModel(stan_file=stan)

test/test_sample.py

@@ -13,7 +13,6 @@
 from time import time
 
 import numpy as np
-import pytest
 from testfixtures import LogCapture
 
 try:
@@ -56,21 +55,6 @@ def without_import(library, module):
 
 
 class SampleTest(unittest.TestCase):
-
-    # pylint: disable=no-self-use
-    @pytest.fixture(scope='class', autouse=True)
-    def do_clean_up(self):
-        for root, _, files in os.walk(DATAFILES_PATH):
-            for filename in files:
-                _, ext = os.path.splitext(filename)
-                if (
-                    ext.lower() in ('.o', '.d', '.hpp', '.exe', '')
-                    and filename != ".gitignore"
-                    and filename != "return_one.hpp"
-                ):
-                    filepath = os.path.join(root, filename)
-                    os.remove(filepath)
-
     def test_bernoulli_good(self, stanfile='bernoulli.stan'):
         stan = os.path.join(DATAFILES_PATH, stanfile)
         bern_model = CmdStanModel(stan_file=stan)

test/test_variational.py

@@ -4,7 +4,6 @@
 import unittest
 from math import fabs
 
-import pytest
 from testfixtures import LogCapture
 
 from cmdstanpy.cmdstan_args import CmdStanArgs, VariationalArgs
@@ -16,23 +15,6 @@
 
 
 class CmdStanVBTest(unittest.TestCase):
-
-    # pylint: disable=no-self-use
-    @pytest.fixture(scope='class', autouse=True)
-    def do_clean_up(self):
-        for root, _, files in os.walk(
-            os.path.join(DATAFILES_PATH, 'variational')
-        ):
-            for filename in files:
-                _, ext = os.path.splitext(filename)
-                if (
-                    ext.lower() in ('.o', '.d', '.hpp', '.exe', '')
-                    and filename != ".gitignore"
-                    and filename != "return_one.hpp"
-                ):
-                    filepath = os.path.join(root, filename)
-                    os.remove(filepath)
-
     def test_instantiate(self):
         stan = os.path.join(
             DATAFILES_PATH, 'variational', 'eta_should_be_big.stan'
@@ -155,23 +137,6 @@ def test_variables_3d(self):
 
 
 class VariationalTest(unittest.TestCase):
-
-    # pylint: disable=no-self-use
-    @pytest.fixture(scope='class', autouse=True)
-    def do_clean_up(self):
-        for root, _, files in os.walk(
-            os.path.join(DATAFILES_PATH, 'variational')
-        ):
-            for filename in files:
-                _, ext = os.path.splitext(filename)
-                if (
-                    ext.lower() in ('.o', '.d', '.hpp', '.exe', '')
-                    and filename != ".gitignore"
-                    and filename != "return_one.hpp"
-                ):
-                    filepath = os.path.join(root, filename)
-                    os.remove(filepath)
-
     def test_variational_good(self):
         stan = os.path.join(
             DATAFILES_PATH, 'variational', 'eta_should_be_big.stan'