Start fixing path issues after moving files

Author: garciadias

tests/bundle/test_bundle_workflow.py

@@ -30,19 +30,20 @@
 from monai.transforms import Compose, LoadImage, LoadImaged, SaveImaged
 from tests.nonconfig_workflow import NonConfigWorkflow, PythonicWorkflowImpl
 
-TEST_CASE_1 = [os.path.join(os.path.dirname(__file__), "testing_data", "inference.json")]
+MODULE_PATH = os.path.dirname(os.path.abspath(__file__).parents[2])
 
-TEST_CASE_2 = [os.path.join(os.path.dirname(__file__), "testing_data", "inference.yaml")]
+TEST_CASE_1 = [os.path.join(MODULE_PATH, "tests", "testing_data", "inference.json")]
 
-TEST_CASE_3 = [os.path.join(os.path.dirname(__file__), "testing_data", "config_fl_train.json")]
+TEST_CASE_2 = [os.path.join(MODULE_PATH, "tests", "testing_data", "inference.yaml")]
 
-TEST_CASE_4 = [os.path.join(os.path.dirname(__file__), "testing_data", "responsive_inference.json")]
+TEST_CASE_3 = [os.path.join(MODULE_PATH, "tests", "testing_data", "config_fl_train.json")]
+
+TEST_CASE_4 = [os.path.join(MODULE_PATH, "tests", "testing_data", "responsive_inference.json")]
 
 TEST_CASE_NON_CONFIG_WRONG_LOG = [None, "logging.conf", "Cannot find the logging config file: logging.conf."]
 
 
 class TestBundleWorkflow(unittest.TestCase):
-
     def setUp(self):
         self.data_dir = tempfile.mkdtemp()
         self.expected_shape = (128, 128, 128)

tests/fl/client/monai_algo/test_fl_monai_algo.py

@@ -17,6 +17,7 @@
 import unittest
 from copy import deepcopy
 from os.path import join as pathjoin
+from pathlib import Path
 
 from parameterized import parameterized
 
@@ -28,7 +29,7 @@
 from monai.utils import path_to_uri
 from tests.utils import SkipIfNoModule
 
-_root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__)))
+_root_dir = Path(__file__).resolve().parents[3]
 _data_dir = os.path.join(_root_dir, "testing_data")
 _logging_file = pathjoin(_data_dir, "logging.conf")
 
@@ -181,7 +182,6 @@
 @SkipIfNoModule("ignite")
 @SkipIfNoModule("mlflow")
 class TestFLMonaiAlgo(unittest.TestCase):
-
     @parameterized.expand([TEST_TRAIN_1, TEST_TRAIN_2, TEST_TRAIN_3, TEST_TRAIN_4])
     def test_train(self, input_params):
         # initialize algo

tests/fl/test_fl_monai_algo_stats.py

@@ -13,6 +13,7 @@
 
 import os
 import unittest
+from pathlib import Path
 
 from parameterized import parameterized
 
@@ -22,7 +23,7 @@
 from monai.fl.utils.exchange_object import ExchangeObject
 from tests.utils import SkipIfNoModule
 
-_root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__)))
+_root_dir = Path(__file__).resolve().parents[1]
 _data_dir = os.path.join(_root_dir, "testing_data")
 _logging_file = os.path.join(_data_dir, "logging.conf")
 
@@ -64,7 +65,6 @@
 
 @SkipIfNoModule("ignite")
 class TestFLMonaiAlgo(unittest.TestCase):
-
     @parameterized.expand([TEST_GET_DATA_STATS_1, TEST_GET_DATA_STATS_2, TEST_GET_DATA_STATS_3])
     def test_get_data_stats(self, input_params):
         # initialize algo

tests/min_tests.py

@@ -11,10 +11,10 @@
 
 from __future__ import annotations
 
-import glob
 import os
 import sys
 import unittest
+from pathlib import Path
 
 
 def run_testsuit():
@@ -216,17 +216,20 @@ def run_testsuit():
     ]
     assert sorted(exclude_cases) == sorted(set(exclude_cases)), f"Duplicated items in {exclude_cases}"
 
-    files = glob.glob(os.path.join(os.path.dirname(__file__), "test_*.py"))
+    files = [f.relative_to(Path(__file__).parent.parent) for f in Path(__file__).parent.rglob("test_*.py")]
+    files = [str(f).replace(os.sep, ".").replace(".py", "") for f in files]
 
     cases = []
-    for case in files:
-        test_module = os.path.basename(case)[:-3]
-        if test_module in exclude_cases:
-            exclude_cases.remove(test_module)
-            print(f"skipping tests.{test_module}.")
+    for test_module in files:
+        test_case = test_module.split(".")[-1]
+        if test_case in exclude_cases:
+            exclude_cases.remove(test_case)
+            print(f"skipping {test_module}")
         else:
-            cases.append(f"tests.{test_module}")
-    assert not exclude_cases, f"items in exclude_cases not used: {exclude_cases}."
+            print(f"adding {test_module}")
+            cases.append(test_module)
+    exclude_cases = [str(list(Path(__file__).parent.rglob(f"*{et}*"))[0]) for et in exclude_cases]
+    assert not exclude_cases, f"items in exclude_cases not used:\n\t{'\n\t'.join(exclude_cases)}"
     test_suite = unittest.TestLoader().loadTestsFromNames(cases)
     return test_suite