Skip to content

Commit 1da7843

Browse files
committed
Only use skip for tests that should eventually pass
1 parent 2786753 commit 1da7843

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

flattentool/tests/test_json_input_is_unflatten_reversed.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
# titles, which the fixtures don't
1616
@pytest.mark.parametrize('use_titles,use_schema', [(False, False), (True, False), (False, True)])
1717
@pytest.mark.parametrize('root_id,root_id_kwargs', ROOT_ID_PARAMS)
18-
@pytest.mark.parametrize('comment,expected_output_list,input_list,warning_messages,reversible', testdata)
18+
@pytest.mark.parametrize('comment,expected_output_list,input_list,warning_messages,reversible', [x for x in testdata if x[4]])
1919
def test_flatten(use_titles, use_schema, root_id, root_id_kwargs, input_list, expected_output_list, recwarn, comment, warning_messages, tmpdir, reversible):
20-
if not reversible:
21-
pytest.skip()
22-
2320
# Not sure why, but this seems to be necessary to have warnings picked up
2421
# on Python 2.7 and 3.3, but 3.4 and 3.5 are fine without it
2522
import warnings
@@ -59,7 +56,7 @@ def test_flatten(use_titles, use_schema, root_id, root_id_kwargs, input_list, ex
5956
assert list(parser.main_sheet.lines) == expected_output_list
6057

6158

62-
@pytest.mark.parametrize('comment,expected_output_list,input_list,warning_messages,reversible', testdata_titles)
59+
@pytest.mark.parametrize('comment,expected_output_list,input_list,warning_messages,reversible', [x for x in testdata_titles if x[4]])
6360
@pytest.mark.parametrize('root_id,root_id_kwargs', ROOT_ID_PARAMS)
6461
def test_flatten_titles(root_id, root_id_kwargs, input_list, expected_output_list, recwarn, comment, warning_messages, reversible, tmpdir):
6562
"""
@@ -79,11 +76,8 @@ def test_flatten_titles(root_id, root_id_kwargs, input_list, expected_output_lis
7976
# titles, which the fixtures don't
8077
@pytest.mark.parametrize('use_titles,use_schema', [(False, False), (True, False), (False, True)])
8178
@pytest.mark.parametrize('root_id,root_id_kwargs', ROOT_ID_PARAMS)
82-
@pytest.mark.parametrize('comment,expected_output_dict,input_list,warning_messages,reversible', testdata_multiplesheets)
79+
@pytest.mark.parametrize('comment,expected_output_dict,input_list,warning_messages,reversible', [x for x in testdata_multiplesheets if x[4]])
8380
def test_flatten_multiplesheets(use_titles, use_schema, root_id, root_id_kwargs, input_list, expected_output_dict, recwarn, comment, warning_messages, tmpdir, reversible):
84-
if not reversible:
85-
pytest.skip()
86-
8781
# Not sure why, but this seems to be necessary to have warnings picked up
8882
# on Python 2.7 and 3.3, but 3.4 and 3.5 are fine without it
8983
import warnings

0 commit comments

Comments
 (0)