Skip to content

Commit 23b93e4

Browse files
authored
make the singularity test more verbose (#976)
1 parent 17268d1 commit 23b93e4

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ prune cwltool/schemas/v1.0/v1.0
3636
prune cwltool/schemas/v1.1.0-dev1/examples
3737
prune cwltool/schemas/v1.1.0-dev1/v1.1.0-dev1
3838
recursive-exclude cwltool/schemas *.py
39-
39+
exclude debian.img
4040
global-exclude *~
4141
global-exclude *.pyc

release-test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ then
4646
&& pip install --force-reinstall -U pip==${pipver} \
4747
&& pip install setuptools==${setuptoolsver} wheel
4848
make install-dep
49+
pip install .
4950
#pip install 'galaxy-lib>=17.09.3'
5051
make test
5152
pip uninstall -y ${package} || true; pip uninstall -y ${package} || true; make install

tests/test_singularity.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77

88
from cwltool.main import main
99

10-
from .util import get_data, get_main_output, needs_singularity
10+
from .util import (get_data, get_main_output, needs_singularity,
11+
working_directory)
1112

1213
sys.argv = ['']
1314

1415

1516
@needs_singularity
16-
def test_singularity_workflow():
17-
error_code, _, stderr = get_main_output(
18-
['--singularity', '--default-container', 'debian',
19-
get_data("tests/wf/hello-workflow.cwl"), "--usermessage", "hello"])
20-
assert "completed success" in stderr
17+
def test_singularity_workflow(tmpdir):
18+
with working_directory(str(tmpdir)):
19+
error_code, _, stderr = get_main_output(
20+
['--singularity', '--default-container', 'debian', '--debug',
21+
get_data("tests/wf/hello-workflow.cwl"), "--usermessage", "hello"])
22+
assert "completed success" in stderr, stderr
2123
assert error_code == 0
2224

2325
def test_singularity_iwdr():

0 commit comments

Comments
 (0)