Merge pull request #186 from pyiron/update_flux_tests

update flux tests

Author: jan-janssen

docs/source/queue.md

@@ -37,10 +37,18 @@ queues:
 The queue named `flux` is defined based on a submission script template named `flux.sh` with the following content: 
 ```
 #!/bin/bash
-#flux: -n{{cores}} --job-name={{job_name}} --env=CORES={{cores}} --output=time.out --error=error.out
+# flux:--job-name={{job_name}}
+# flux: --env=CORES={{cores}}
+# flux: --output=time.out
+# flux: --error=error.out
+# flux: -n {{cores}}
+{%- if run_time_max %}
+# flux: -t {{ [1, run_time_max // 60]|max }}
+{%- endif %}
+
 {{command}}
 ```
-In this case only the number of cores `cores`, the name of the job `job_name` and the command `command` are communicated. 
+In this case only the number of cores `cores`, the name of the job `job_name` , the maximum run time of the job `run_time_max` and the command `command` are communicated. 
 
 ## LFS
 For the load sharing facility framework from IBM the `queue.yaml` file defines the `queue_type` as `LSF`:

tests/config/flux/flux.sh

@@ -1,3 +1,11 @@
 #!/bin/bash
-#flux: -n{{cores}} --job-name={{job_name}} --env=CORES={{cores}} --output=time.out --error=error.out
+# flux:--job-name={{job_name}}
+# flux: --env=CORES={{cores}}
+# flux: --output=time.out
+# flux: --error=error.out
+# flux: -n {{cores}}
+{%- if run_time_max %}
+# flux: -t {{ [1, run_time_max // 60]|max }}
+{%- endif %}
+
 {{command}}

tests/test_flux.py

@@ -82,7 +82,13 @@ def execute_command(
             output = f.read()
         content = """\
 #!/bin/bash
-#flux: -n4 --job-name=test --env=CORES=4 --output=time.out --error=error.out
+# flux:--job-name=test
+# flux: --env=CORES=4
+# flux: --output=time.out
+# flux: --error=error.out
+# flux: -n 4
+# flux: -t 2880
+
 echo hello"""
         self.assertEqual(content, output)
         os.remove("run_queue.sh")