Fix conflict

sbrugman · web-flow · commit d4845d7a2b48 · 2024-08-31T19:54:50.000+02:00
diff --git a/tests/test_torchfix.py b/tests/test_torchfix.py
@@ -36,7 +36,7 @@ def pytest_generate_tests(metafunc):
             ("TOR102", {"TOR102"}),
             ("TOR102,TOR101", {"TOR102", "TOR101"}),
             ("TOR1,TOR102", {"TOR102", "TOR101", "TOR103", "TOR104", "TOR105"}),
-            (None, set(GET_ALL_ERROR_CODES() - exclude_set)),
+            (None, set(GET_ALL_ERROR_CODES()) - exclude_set),
         ]
         metafunc.parametrize("case,expected", cases, ids=[case for case, _ in cases])
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def pytest_generate_tests(metafunc):`
`36`	`36`	`("TOR102", {"TOR102"}),`
`37`	`37`	`("TOR102,TOR101", {"TOR102", "TOR101"}),`
`38`	`38`	`("TOR1,TOR102", {"TOR102", "TOR101", "TOR103", "TOR104", "TOR105"}),`
`39`		`- (None, set(GET_ALL_ERROR_CODES() - exclude_set)),`
	`39`	`+ (None, set(GET_ALL_ERROR_CODES()) - exclude_set),`
`40`	`40`	`]`
`41`	`41`	`metafunc.parametrize("case,expected", cases, ids=[case for case, _ in cases])`
`42`	`42`