Proper use of execparams

Author: hategan

tests/getting_started/test_simple_example.py

@@ -1,13 +1,13 @@
 from executor_test_params import ExecutorTestParams
 
-from _test_tools import assert_completed
+from _test_tools import assert_completed, _get_executor_instance
 
 
 def test_getting_started_single_job(execparams: ExecutorTestParams) -> None:
-    from psij import Job, JobSpec, JobExecutor
+    from psij import Job, JobSpec
 
-    ex = JobExecutor.get_instance(execparams.executor)
     job = Job(JobSpec(executable="/bin/date"))
+    ex = _get_executor_instance(execparams, job)
     ex.submit(job)
 
     status = job.wait()

tests/test_nodefile.py

@@ -4,9 +4,9 @@
 
 import pytest
 
-from _test_tools import assert_completed
+from _test_tools import assert_completed, _get_executor_instance
 from executor_test_params import ExecutorTestParams
-from psij import Job, JobSpec, JobExecutor, ResourceSpecV1
+from psij import Job, JobSpec, ResourceSpecV1
 
 NOT_TESTED = set(['rp', 'flux'])
 
@@ -24,7 +24,7 @@ def test_nodefile(execparams: ExecutorTestParams) -> None:
                        stdout_path=outp)
         job = Job(spec)
         spec.resources = ResourceSpecV1(process_count=N_PROC)
-        ex = JobExecutor.get_instance(execparams.executor)
+        ex = _get_executor_instance(execparams, job)
         ex.submit(job)
         status = job.wait()
         assert_completed(job, status)

tests/user_guide/test_resourcespec.py

@@ -1,11 +1,10 @@
-from psij import Job, JobSpec, JobExecutor, ResourceSpecV1
+from psij import Job, JobSpec, ResourceSpecV1
 from executor_test_params import ExecutorTestParams
 
-from _test_tools import assert_completed
+from _test_tools import assert_completed, _get_executor_instance
 
 
 def test_user_guide_resourcespec(execparams: ExecutorTestParams) -> None:
-    ex = JobExecutor.get_instance(execparams.executor)
     job = Job(
         JobSpec(
             executable='/bin/date',
@@ -15,6 +14,7 @@ def test_user_guide_resourcespec(execparams: ExecutorTestParams) -> None:
             )
         )
     )
+    ex = _get_executor_instance(execparams, job)
     ex.submit(job)
     status = job.wait()
     assert_completed(job, status)

tests/user_guide/test_scheduling_information.py

@@ -1,12 +1,11 @@
-from psij import Job, JobSpec, JobExecutor, JobAttributes
+from psij import Job, JobSpec, JobAttributes
 # from psij import JobAttributes
 from executor_test_params import ExecutorTestParams
 
-from _test_tools import assert_completed
+from _test_tools import assert_completed, _get_executor_instance
 
 
 def test_user_guide_scheduling_info(execparams: ExecutorTestParams) -> None:
-    executor = JobExecutor.get_instance(execparams.executor)
 
     job = Job(
         JobSpec(
@@ -18,6 +17,8 @@ def test_user_guide_scheduling_info(execparams: ExecutorTestParams) -> None:
         )
     )
 
+    executor = _get_executor_instance(execparams, job)
+
     executor.submit(job)
     status = job.wait()
     assert_completed(job, status)