convert test_cases and failure_test_cases to pytest.param

Author: mhoff

tests/unit/ng/processor/calculator/test_calculator.py

@@ -32,21 +32,21 @@ class TestCalculator(BaseProcessorTestCase):
         "rules": ["tests/testdata/unit/calculator/rules"],
     }
 
-    @pytest.mark.parametrize("testcase, rule, event, expected", test_cases)
-    def test_testcases(self, testcase, rule, event, expected):  # pylint: disable=unused-argument
+    @pytest.mark.parametrize("rule, event, expected", test_cases)
+    def test_testcases(self, rule, event, expected):
         self._load_rule(rule)
         event = LogEvent(event, original=b"")
         self.object.process(event)
-        assert event.data == expected, testcase
+        assert event.data == expected
 
-    @pytest.mark.parametrize("testcase, rule, event, expected, error_message", failure_test_cases)
-    def test_testcases_failure_handling(self, testcase, rule, event, expected, error_message):
+    @pytest.mark.parametrize("rule, event, expected, error_message", failure_test_cases)
+    def test_testcases_failure_handling(self, rule, event, expected, error_message):
         self._load_rule(rule)
         event = LogEvent(event, original=b"")
         result = self.object.process(event)
         assert len(result.warnings) == 1
         assert re.match(rf".*{error_message}", str(result.warnings[0]))
-        assert event.data == expected, testcase
+        assert event.data == expected
 
     @pytest.mark.parametrize(
         "expression, expected",

tests/unit/ng/processor/dissector/test_dissector.py

@@ -24,18 +24,18 @@ class TestDissector(BaseProcessorTestCase):
         "rules": ["tests/testdata/unit/dissector/rules"],
     }
 
-    @pytest.mark.parametrize("testcase, rule, event, expected", test_cases)
-    def test_testcases(self, testcase, rule, event, expected):  # pylint: disable=unused-argument
+    @pytest.mark.parametrize("rule, event, expected", test_cases)
+    def test_testcases(self, rule, event, expected):
         self._load_rule(rule)
         log_event = LogEvent(event, original=b"test_message")
         self.object.process(log_event)
         assert log_event.data == expected
 
-    @pytest.mark.parametrize("testcase, rule, event, expected", failure_test_cases)
-    def test_testcases_failure_handling(self, testcase, rule, event, expected):
+    @pytest.mark.parametrize("rule, event, expected", failure_test_cases)
+    def test_testcases_failure_handling(self, rule, event, expected):
         self._load_rule(rule)
         log_event = LogEvent(event, original=b"test_message")
         result = self.object.process(log_event)
         assert len(result.warnings) == 1
         assert isinstance(result.warnings[0], ProcessingWarning)
-        assert log_event.data == expected, testcase
+        assert log_event.data == expected

tests/unit/ng/processor/generic_adder/test_generic_adder.py

@@ -37,25 +37,21 @@ class TestGenericAdder(BaseProcessorTestCase):
         "rules": ["tests/testdata/unit/generic_adder/rules"],
     }
 
-    @pytest.mark.parametrize("testcase, rule, event, expected", test_cases)
-    def test_generic_adder_testcases(
-        self, testcase, rule, event, expected
-    ):  # pylint: disable=unused-argument
+    @pytest.mark.parametrize("rule, event, expected", test_cases)
+    def test_generic_adder_testcases(self, rule, event, expected):
         self._load_rule(rule)
         log_event = LogEvent(event, original=b"")
         self.object.process(log_event)
         assert event == expected
 
-    @pytest.mark.parametrize("testcase, rule, event, expected, error_message", failure_test_cases)
-    def test_generic_adder_testcases_failure_handling(
-        self, testcase, rule, event, expected, error_message
-    ):
+    @pytest.mark.parametrize("rule, event, expected, error_message", failure_test_cases)
+    def test_generic_adder_testcases_failure_handling(self, rule, event, expected, error_message):
         self._load_rule(rule)
         log_event = LogEvent(event, original=b"")
         result = self.object.process(log_event)
         assert len(result.warnings) == 1
         assert re.match(rf".*FieldExistsWarning.*{error_message}", str(result.warnings[0]))
-        assert event == expected, testcase
+        assert event == expected
 
     def test_add_generic_fields_from_file_missing_and_existing_with_all_required(self):
         with pytest.raises(InvalidRuleDefinitionError, match=r"files do not exist"):