fixes to test

Author: jan-janssen

executorlib/task_scheduler/file/task_scheduler.py

@@ -27,7 +27,6 @@
 class FileTaskScheduler(TaskSchedulerBase):
     def __init__(
         self,
-        cache_directory: Optional[str] = None,
         resource_dict: Optional[dict] = None,
         execute_function: Callable = execute_with_pysqa,
         terminate_function: Optional[Callable] = None,
@@ -39,7 +38,6 @@ def __init__(
         Initialize the FileExecutor.
 
         Args:
-            cache_directory (str, optional): The directory to store cache files. Defaults to "executorlib_cache".
             resource_dict (dict): A dictionary of resources required by the task. With the following keys:
                               - cores (int): number of MPI cores to be used for each function call
                               - cwd (str/None): current working directory where the parallel python task is executed
@@ -53,7 +51,6 @@ def __init__(
         default_resource_dict = {
             "cores": 1,
             "cwd": None,
-            "cache_directory": cache_directory,
         }
         if resource_dict is None:
             resource_dict = {}

tests/test_cache_fileexecutor_mpi.py

@@ -32,7 +32,8 @@ def mpi_funct(i):
 class TestCacheExecutorMPI(unittest.TestCase):
     def test_executor(self):
         with FileTaskScheduler(
-            resource_dict={"cores": 2}, execute_function=execute_in_subprocess
+            resource_dict={"cores": 2, "cache_directory": "executorlib_cache"},
+            execute_function=execute_in_subprocess,
         ) as exe:
             fs1 = exe.submit(mpi_funct, 1)
             self.assertFalse(fs1.done())

tests/test_cache_fileexecutor_serial.py

@@ -36,21 +36,30 @@ def get_error(a):
 )
 class TestCacheExecutorSerial(unittest.TestCase):
     def test_executor_mixed(self):
-        with FileTaskScheduler(execute_function=execute_in_subprocess) as exe:
+        with FileTaskScheduler(
+            execute_function=execute_in_subprocess,
+            resource_dict={"cache_directory": "executorlib_cache"},
+        ) as exe:
             fs1 = exe.submit(my_funct, 1, b=2)
             self.assertFalse(fs1.done())
             self.assertEqual(fs1.result(), 3)
             self.assertTrue(fs1.done())
 
     def test_executor_mixed_cache_key(self):
-        with FileTaskScheduler(execute_function=execute_in_subprocess) as exe:
+        with FileTaskScheduler(
+            execute_function=execute_in_subprocess,
+            resource_dict={"cache_directory": "executorlib_cache"},
+        ) as exe:
             fs1 = exe.submit(my_funct, 1, b=2, resource_dict={"cache_key": "a/b/c"})
             self.assertFalse(fs1.done())
             self.assertEqual(fs1.result(), 3)
             self.assertTrue(fs1.done())
 
     def test_executor_dependence_mixed(self):
-        with FileTaskScheduler(execute_function=execute_in_subprocess) as exe:
+        with FileTaskScheduler(
+            execute_function=execute_in_subprocess,
+            resource_dict={"cache_directory": "executorlib_cache"},
+        ) as exe:
             fs1 = exe.submit(my_funct, 1, b=2)
             fs2 = exe.submit(my_funct, 1, b=fs1)
             self.assertFalse(fs2.done())
@@ -66,23 +75,27 @@ def test_create_file_executor_error(self):
     def test_executor_dependence_error(self):
         with self.assertRaises(ValueError):
             with FileTaskScheduler(
-                execute_function=execute_in_subprocess, disable_dependencies=True
+                execute_function=execute_in_subprocess,
+                disable_dependencies=True,
+                resource_dict={"cache_directory": "executorlib_cache"},
             ) as exe:
                 fs = exe.submit(my_funct, 1, b=exe.submit(my_funct, 1, b=2))
                 fs.result()
 
     def test_executor_working_directory(self):
         cwd = os.path.join(os.path.dirname(__file__), "executables")
         with FileTaskScheduler(
-            resource_dict={"cwd": cwd}, execute_function=execute_in_subprocess
+            resource_dict={"cwd": cwd, "cache_directory": "executorlib_cache"},
+            execute_function=execute_in_subprocess,
         ) as exe:
             fs1 = exe.submit(list_files_in_working_directory)
             self.assertEqual(fs1.result(), os.listdir(cwd))
 
     def test_executor_error(self):
         cwd = os.path.join(os.path.dirname(__file__), "executables")
         with FileTaskScheduler(
-            resource_dict={"cwd": cwd}, execute_function=execute_in_subprocess
+            resource_dict={"cwd": cwd, "cache_directory": "executorlib_cache"},
+            execute_function=execute_in_subprocess,
         ) as exe:
             fs1 = exe.submit(get_error, a=1)
             with self.assertRaises(ValueError):