Skip to content

Commit 791fe7b

Browse files
AlexTatemr-c
authored andcommitted
Adding suggested changes to the --on-error help string per @mr-c. Formatting compliance updates in test_parallel.py
1 parent 36f12cf commit 791fe7b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cwltool/argparser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ def arg_parser() -> argparse.ArgumentParser:
597597
"--on-error",
598598
help="Desired workflow behavior when a step fails. One of 'stop' (do "
599599
"not submit any more steps), 'continue' (may submit other steps that "
600-
"are not downstream from the error), or kill (same as stop, but also "
600+
"are not downstream from the error), or 'kill' (same as 'stop', but also "
601601
"terminates running jobs in the active step(s)). Default is 'stop'.",
602602
default="stop",
603603
choices=("stop", "continue", "kill"),

tests/test_parallel.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import json
2-
import time
32
import math
3+
import time
44
from pathlib import Path
55

66
from cwltool.context import RuntimeContext
@@ -35,12 +35,13 @@ def test_scattered_workflow() -> None:
3535

3636
def test_on_error_kill() -> None:
3737
test_file = "tests/wf/on-error_kill.cwl"
38+
3839
def selectResources(request, _):
3940
# Remove the "one job per core" resource constraint so that
4041
# parallel jobs aren't withheld on machines with few cores
4142
return {
4243
"cores": 0,
43-
"ram": math.ceil(request["ramMin"]), # default
44+
"ram": math.ceil(request["ramMin"]), # default
4445
"tmpdirSize": math.ceil(request["tmpdirMin"]), # default
4546
"outdirSize": math.ceil(request["outdirMin"]), # default
4647
}

0 commit comments

Comments
 (0)