Skip to content

Commit 3838819

Browse files
committed
cidfile: also deal with IOErrors
1 parent 9e7e73d commit 3838819

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cwltool/job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ def docker_monitor(self, cidfile, tmpdir_prefix, cleanup_cidfile, process):
689689
try:
690690
with open(cidfile) as cidhandle:
691691
cid = cidhandle.readline().strip()
692-
except OSError:
692+
except (OSError, IOError):
693693
cid = None
694694
max_mem = self.docker_get_memory(cid)
695695
tmp_dir, tmp_prefix = os.path.split(tmpdir_prefix)

jenkins.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ EOF
8383
fi
8484
# shellcheck disable=SC2086
8585
LC_ALL=C.UTF-8 ./run_test.sh --junit-xml=result${PYTHON_VERSION}.xml \
86-
RUNNER=${CWLTOOL_WITH_COV} "-j$(($(nproc) / 2))"\
86+
RUNNER=${CWLTOOL_WITH_COV} "-j$(nproc)"\
8787
${DRAFT} "${EXTRA}" \
8888
"--classname=py${PYTHON_VERSION}_${CONTAINER}"
8989
# LC_ALL=C is to work around junit-xml ASCII only bug

0 commit comments

Comments
 (0)