Skip to content

Commit f70228a

Browse files
committed
hopefully fix the last test for docker+win7
1 parent ca6362a commit f70228a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

tests/test_examples.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
import schema_salad.validate
2626
from cwltool.main import main
2727

28-
from .util import get_data, needs_docker
28+
from .util import (get_data, needs_docker, windows_default_container_id,
29+
onWindows)
2930

3031
sys.argv = ['']
3132

@@ -615,7 +616,9 @@ def test_wf_without_container(self):
615616
class TestChecksum(TestCmdLine):
616617

617618
def test_compute_checksum(self):
618-
f = cwltool.factory.Factory(compute_checksum=True, use_container=False)
619+
f = cwltool.factory.Factory(compute_checksum=True,
620+
default_container=windows_default_container_id if onWindows()
621+
else None)
619622
echo = f.make(get_data("tests/wf/cat-tool.cwl"))
620623
output = echo(file1={
621624
"class": "File",

tests/util.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ def get_data(filename):
1717
pass
1818
if not filepath or not os.path.isfile(filepath):
1919
filepath = os.path.join(os.path.dirname(__file__), os.pardir, filename)
20+
# warning, __file__ is all lowercase on Windows systems, this can
21+
# sometimes conflict with docker toolkit. Workaround: pip install .
22+
# and run the tests elsewhere via python -m pytest --pyarg cwltool
2023
return filepath
2124

2225

0 commit comments

Comments
 (0)