Merge pull request #455 from ExaWorks/more_launchers

Add typical launchers in autodetection for tests

Author: hategan

src/psij/executors/batch/pbs.py

@@ -22,6 +22,6 @@ def __init__(self, url: Optional[str] = None, config: Optional[PBSExecutorConfig
         """
         if not config:
             config = PBSExecutorConfig()
-        generator = TemplatedScriptGenerator(config, Path(__file__).parent / 'pbspro'
+        generator = TemplatedScriptGenerator(config, Path(__file__).parent / 'pbs'
                                              / 'pbspro.mustache')
         super().__init__(generator, url=url, config=config)

tests/conftest.py

@@ -141,6 +141,11 @@ def _translate_launcher(config: Dict[str, str], exec: str, launcher: str) -> str
     if launcher == 'auto_l':
         if exec == 'slurm':
             return 'srun'
+        elif exec == 'pbs':
+            return 'mpirun'
+        elif exec == 'lsf':
+            return 'ibrun'
+
         else:
             raise ValueError('Don\'t know how to get launcher for executor "' + exec + '"')
     else:
@@ -199,10 +204,10 @@ def pytest_configure(config):
 
     _purge_old_results(config)
     start_time = _now()
-    (env, key), log = _capture_log(partial(_discover_environment, config))
+    config.option.key = _get_key(config)
+    env, log = _capture_log(partial(_discover_environment, config))
     save = config.getoption('save_results')
     upload = config.getoption('upload_results')
-    config.option.key = key
     end_time = _now()
     data = {}
     if save or upload:
@@ -394,7 +399,6 @@ def _discover_environment(config):
     conf['pythonpath'] = _strip_home(sys.path)
     conf['executors'] = config.getoption('executors')
     conf['maintainer_email'] = config.getoption('maintainer_email')
-    key = _get_key(config)
     env['start_time'] = _now()
     env['run_id'] = _get_run_id(config)
     env['in_conda'] = _get_env('CONDA_SHLVL') != '' and _get_env('CONDA_SHLVL') != '0'
@@ -433,7 +437,7 @@ def _discover_environment(config):
         env['error'] = str(ex)
     config.option.environment = env
     env['computed_executors'] = _get_executors(config)
-    return env, key
+    return env
 
 
 def _now():