tests refactored so they can be organized in subdirectories.

jmnavarrol · Mar 10, 2024 · 249c40e · 249c40e
1 parent 70c2c09
commit 249c40e
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -30,7 +30,7 @@ targets:
 	@echo -e "\t${C_BOLD}clean:${C_NC} deletes temp files."
 
 test:
-	python -m unittest discover
+	python -m unittest discover -s tests
 
 build: test $(SDIST_FILES) $(WHEELS) doc
 

diff --git a/src/tests/__init__.py → src/tests/gitrepo/__init__.py b/src/tests/__init__.py → src/tests/gitrepo/__init__.py
diff --git a/src/tests/test_gitrepo.py → src/tests/gitrepo/test_gitrepo.py b/src/tests/test_gitrepo.py → src/tests/gitrepo/test_gitrepo.py
@@ -26,7 +26,7 @@ def setUp(self):
 				os.makedirs(current_scenario_path)
 
 			shutil.copy(
-				TESTS_PATH + '/subrepos.' + test_item,
+				TESTS_PATH + '/../helperfiles/subrepos.' + test_item,
 				os.path.join(current_scenario_path, 'subrepos')
 			)
 

diff --git a/src/tests/subrepos.nonexistent-branch → ...s/helperfiles/subrepos.nonexistent-branch b/src/tests/subrepos.nonexistent-branch → ...s/helperfiles/subrepos.nonexistent-branch
diff --git a/src/tests/subrepos.standard → src/tests/helperfiles/subrepos.standard b/src/tests/subrepos.standard → src/tests/helperfiles/subrepos.standard
diff --git a/src/tests/subrepos/__init__.py b/src/tests/subrepos/__init__.py
@@ -0,0 +1,9 @@
+# Prepares environment for testing
+
+import os, sys
+
+TESTS_PATH   = os.path.dirname(os.path.realpath(__file__))
+PROJECT_PATH = os.path.abspath(os.path.join(TESTS_PATH, os.pardir))
+
+# Adds project dir to python path so source code can be imported
+sys.path.append(PROJECT_PATH)
diff --git a/src/tests/test_subrepos.py → src/tests/subrepos/test_subrepos.py b/src/tests/test_subrepos.py → src/tests/subrepos/test_subrepos.py
@@ -22,7 +22,7 @@ def setUp(self):
 				os.makedirs(current_scenario_path)
 
 			shutil.copy(
-				TESTS_PATH + '/subrepos.' + test_item,
+				TESTS_PATH + '/../helperfiles/subrepos.' + test_item,
 				os.path.join(current_scenario_path, 'subrepos')
 			)