@@ -1095,39 +1095,31 @@ def test_pass():
10951095 assert len (re .findall (collapsed_html , html )) == expected_count
10961096 assert_results (html , tests = 2 , passed = 1 , failed = 1 )
10971097
1098- @pytest .mark .parametrize ("keep_original_order, expected_table_header_tag" , [
1099- (
1098+ @pytest .mark .parametrize (
1099+ "keep_original_order, expected_table_header_tag" ,
1100+ [
1101+ (
11001102 False ,
11011103 [
1102- {
1103- 'html_tag' : '<th class=".*sortable.*">' ,
1104- 'expected_count' : 4
1105- },
1106- {
1107- 'html_tag' : '<th class=".*initial-sort.*">' ,
1108- 'expected_count' : 1
1109- }
1110- ]
1111- ),
1112- (
1104+ {"html_tag" : '<th class=".*sortable.*">' , "expected_count" : 4 },
1105+ {"html_tag" : '<th class=".*initial-sort.*">' , "expected_count" : 1 },
1106+ ],
1107+ ),
1108+ (
11131109 True ,
11141110 [
1115- {
1116- 'html_tag' : '<th class=".*sortable.*">' ,
1117- 'expected_count' : 0
1118- },
1119- {
1120- 'html_tag' : '<th class=".*initial-sort.*">' ,
1121- 'expected_count' : 0
1122- }
1123- ]
1124- )
1125- ], ids = (
1126- "keep_original_order option is not set" ,
1127- "keep_original_order option is set" ,
1128- ))
1111+ {"html_tag" : '<th class=".*sortable.*">' , "expected_count" : 0 },
1112+ {"html_tag" : '<th class=".*initial-sort.*">' , "expected_count" : 0 },
1113+ ],
1114+ ),
1115+ ],
1116+ ids = (
1117+ "keep_original_order option is not set" ,
1118+ "keep_original_order option is set" ,
1119+ ),
1120+ )
11291121 def test_keep_original_order_option_remove_any_sort_class_from_headers (
1130- self , testdir , keep_original_order , expected_table_header_tag
1122+ self , testdir , keep_original_order , expected_table_header_tag
11311123 ):
11321124 testdir .makeini (
11331125 f"""
@@ -1153,36 +1145,41 @@ def test_fail2():
11531145 result , html = run (testdir )
11541146 assert result .ret == 1
11551147 for expect_element in expected_table_header_tag :
1156- assert len (
1157- re .findall (expect_element ["html_tag" ], html )
1158- ) == expect_element ["expected_count" ]
1148+ assert (
1149+ len (re .findall (expect_element ["html_tag" ], html ))
1150+ == expect_element ["expected_count" ]
1151+ )
11591152 assert_results (html , tests = 4 , passed = 2 , failed = 2 )
11601153
1161- @pytest .mark .parametrize ("keep_original_order, expected_order" , [
1162- (
1154+ @pytest .mark .parametrize (
1155+ "keep_original_order, expected_order" ,
1156+ [
1157+ (
11631158 False ,
11641159 [
11651160 "test_fail1" ,
11661161 "test_fail2" ,
11671162 "test_pass1" ,
11681163 "test_pass2" ,
1169- ]
1170- ),
1171- (
1164+ ],
1165+ ),
1166+ (
11721167 True ,
11731168 [
11741169 "test_pass1" ,
11751170 "test_fail1" ,
11761171 "test_pass2" ,
11771172 "test_fail2" ,
1178- ]
1179- )
1180- ], ids = (
1181- "keep_original_order option is not set" ,
1182- "keep_original_order option is set" ,
1183- ))
1173+ ],
1174+ ),
1175+ ],
1176+ ids = (
1177+ "keep_original_order option is not set" ,
1178+ "keep_original_order option is set" ,
1179+ ),
1180+ )
11841181 def test_keep_original_order_option_hold_test_run_order (
1185- self , testdir , keep_original_order , expected_order
1182+ self , testdir , keep_original_order , expected_order
11861183 ):
11871184 testdir .makeini (
11881185 f"""
@@ -1210,7 +1207,7 @@ def test_fail2():
12101207 result_report_test_order = re .findall ('<td class="col-name">.*</td>' , html )
12111208 assert len (result_report_test_order ) == len (expected_order )
12121209 for expected_test_name , result_test_name in zip (
1213- expected_order , result_report_test_order
1210+ expected_order , result_report_test_order
12141211 ):
12151212 assert expected_test_name in result_test_name
12161213 assert_results (html , tests = 4 , passed = 2 , failed = 2 )
0 commit comments