Merge pull request #674 from VisLab/develop

Develop updated cache directory tests setup
hed-standard · Jun 1, 2023 · c68ddd8 · c68ddd8
2 parents 83c61a5 + d4e1290
commit c68ddd8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/tests/data/model_tests/ExcelMultipleSheets.xlsx b/tests/data/model_tests/ExcelMultipleSheets.xlsx
diff --git a/tests/models/test_spreadsheet_input.py b/tests/models/test_spreadsheet_input.py
@@ -3,7 +3,7 @@
 import io
 
 from hed.errors import HedFileError
-from hed.models import TabularInput, SpreadsheetInput, model_constants, Sidecar
+from hed.models import TabularInput, SpreadsheetInput,  Sidecar
 import shutil
 from hed import schema
 import pandas as pd

diff --git a/tests/models/test_tabular_input.py b/tests/models/test_tabular_input.py
@@ -82,5 +82,6 @@ def test_validate_file_warnings(self):
         issues2a = input_file2.validate(hed_schema=self.hed_schema, error_handler=ErrorHandler(False))
         breakHere = 3
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/schema/test_hed_cache.py b/tests/schema/test_hed_cache.py
@@ -116,7 +116,10 @@ def test_find_hed_expression(self):
 class TestLocal(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.hed_cache_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../schema_cache_test_local/')
+        hed_cache_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../schema_cache_test_local/')
+        if os.path.exists(hed_cache_dir) and os.path.isdir(hed_cache_dir):
+            shutil.rmtree(hed_cache_dir)
+        cls.hed_cache_dir = hed_cache_dir
         cls.saved_cache_folder = hed_cache.HED_CACHE_DIRECTORY
         schema.set_cache_directory(cls.hed_cache_dir)
 

diff --git a/tests/validator/test_spreadsheet_validator.py b/tests/validator/test_spreadsheet_validator.py
@@ -7,8 +7,7 @@
 from hed.validator import SpreadsheetValidator
 from hed import SpreadsheetInput
 
-
-class TestInsertColumns(unittest.TestCase):
+class TestSpreadsheetValidation(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.schema = load_schema_version("8.1.0")