Skip to content

Commit 6f29c59

Browse files
committed
docker test: run single-threaded
and skip another external file test
1 parent e5cce99 commit 6f29c59

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ diff-cover: coverage.xml
157157
diff-cover.html: coverage.xml
158158
diff-cover --compare-branch=main $^ --html-report $@
159159

160-
## test : run the ${MODULE} test suite
160+
## test : run the cwltool test suite
161161
test: check-python3 $(PYSOURCES)
162162
python -m pytest -rs ${PYTEST_EXTRA}
163163

164-
## testcov : run the ${MODULE} test suite and collect coverage
164+
## testcov : run the cwltool test suite and collect coverage
165165
testcov: check-python3 $(PYSOURCES)
166166
python -m pytest -rs --cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}
167167

build-cwltool-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ docker run -t -v /var/run/docker.sock:/var/run/docker.sock \
77
-v /tmp:/tmp \
88
-v "$PWD":/tmp/cwltool \
99
quay.io/commonwl/cwltool_module /bin/sh -c \
10-
"apk add gcc bash && pip install -r/tmp/cwltool/test-requirements.txt ; pytest -k 'not (test_bioconda or test_double_overwrite or test_env_filtering or test_biocontainers or test_disable_file_overwrite_without_ext or test_disable_file_creation_in_outdir_with_ext or test_write_write_conflict or test_directory_literal_with_real_inputs_inside or test_revsort_workflow or test_stdin_with_id_preset)' --ignore-glob '*test_udocker.py' -n auto -v -rs --pyargs cwltool"
10+
"apk add gcc bash && pip install -r/tmp/cwltool/test-requirements.txt ; pytest -k 'not (test_bioconda or test_double_overwrite or test_env_filtering or test_biocontainers or test_disable_file_overwrite_without_ext or test_disable_file_creation_in_outdir_with_ext or test_write_write_conflict or test_directory_literal_with_real_inputs_inside or test_revsort_workflow or test_stdin_with_id_preset or test_no_compute_chcksum or test_packed_workflow_execution[tests/wf/count-lines1-wf.cwl-tests/wf/wc-job.json-False] or test_sequential_workflow or test_single_process_subwf_subwf_inline_step)' --ignore-glob '*test_udocker.py' -n 0 -v -rs --pyargs cwltool"

0 commit comments

Comments
 (0)