15
15
# titles, which the fixtures don't
16
16
@pytest .mark .parametrize ('use_titles,use_schema' , [(False , False ), (True , False ), (False , True )])
17
17
@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 ]] )
19
19
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
-
23
20
# Not sure why, but this seems to be necessary to have warnings picked up
24
21
# on Python 2.7 and 3.3, but 3.4 and 3.5 are fine without it
25
22
import warnings
@@ -59,7 +56,7 @@ def test_flatten(use_titles, use_schema, root_id, root_id_kwargs, input_list, ex
59
56
assert list (parser .main_sheet .lines ) == expected_output_list
60
57
61
58
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 ]] )
63
60
@pytest .mark .parametrize ('root_id,root_id_kwargs' , ROOT_ID_PARAMS )
64
61
def test_flatten_titles (root_id , root_id_kwargs , input_list , expected_output_list , recwarn , comment , warning_messages , reversible , tmpdir ):
65
62
"""
@@ -79,11 +76,8 @@ def test_flatten_titles(root_id, root_id_kwargs, input_list, expected_output_lis
79
76
# titles, which the fixtures don't
80
77
@pytest .mark .parametrize ('use_titles,use_schema' , [(False , False ), (True , False ), (False , True )])
81
78
@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 ]] )
83
80
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
-
87
81
# Not sure why, but this seems to be necessary to have warnings picked up
88
82
# on Python 2.7 and 3.3, but 3.4 and 3.5 are fine without it
89
83
import warnings
0 commit comments