Skip to content

Commit c6d8b9d

Browse files
committed
skip emoji test on windows with Py2
1 parent f135961 commit c6d8b9d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

cwltool/process.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
import tempfile
1414
import textwrap
1515
import uuid
16-
from collections import Iterable # pylint: disable=unused-import
16+
17+
try:
18+
from collections.abc import Iterable # only works on python 3.3+
19+
except ImportError:
20+
from collections import Iterable # pylint: disable=unused-import
1721
from io import open
1822
from typing import (Any, Callable, Dict, Generator, Iterator, List,
1923
Mapping, MutableMapping, MutableSequence, Optional, Set, Tuple,

tests/test_examples.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
from .util import (get_data, get_main_output, get_windows_safe_factory,
2525
needs_docker, working_directory, needs_singularity, temp_dir, windows_needs_docker)
2626

27+
import six
28+
2729
try:
2830
reload
2931
except: # pylint: disable=bare-except
@@ -888,6 +890,7 @@ def test_bad_basecommand_docker():
888890
assert "permanentFail" in stderr, stderr
889891
assert error_code == 1
890892

893+
@pytest.mark.skipif(onWindows() and six.PY2, reason="emojis not supported with Py2 under Windows")
891894
def test_v1_0_position_expression():
892895
test_file = "tests/echo-position-expr.cwl"
893896
test_job = "tests/echo-position-expr-job.yml"

0 commit comments

Comments
 (0)