Support environment variables in the configuration for CoverityChecker

src/mlx/warnings/regex_checker.py

@@ -196,10 +196,7 @@ def parse_config(self, config):
             classification_key = classification.lower().replace("_", " ")
             if classification_key in CoverityClassificationChecker.SEVERITY_MAP:
                 checker = CoverityClassificationChecker(classification=classification_key, verbose=self.verbose)
-                if maximum := checker_config.get("max", 0):
-                    checker.maximum = int(maximum)
-                if minimum := checker_config.get("min", 0):
-                    checker.minimum = int(minimum)
+                checker.parse_config(checker_config)
                 self.checkers[classification_key] = checker
             else:
                 print(f"WARNING: Unrecognized classification {classification!r}")

tests/test_coverity.py

@@ -1,8 +1,8 @@
+import json
+import os
 from io import StringIO
-from unittest import TestCase
 from pathlib import Path
-import filecmp
-
+from unittest import TestCase, mock
 from unittest.mock import patch
 
 from mlx.warnings import WarningsPlugin, warnings_wrapper
@@ -11,6 +11,16 @@
 TEST_OUT_DIR = Path(__file__).parent / 'test_out'
 
 
+def ordered(obj):
+    if isinstance(obj, dict):
+        return sorted((k, ordered(v)) for k, v in obj.items())
+    if isinstance(obj, list):
+        return sorted(ordered(x) for x in obj)
+    else:
+        return obj
+
+
+@mock.patch.dict(os.environ, {"MIN_COV_WARNINGS": "1", "MAX_COV_WARNINGS": "2"})
 class TestCoverityWarnings(TestCase):
     def setUp(self):
         self.warnings = WarningsPlugin(verbose=True)
@@ -63,7 +73,11 @@ def test_code_quality_without_config(self):
             str(TEST_IN_DIR / 'defects.txt'),
         ])
         self.assertEqual(8, retval)
-        self.assertTrue(filecmp.cmp(out_file, ref_file))
+        with open(out_file) as file:
+            cq_out = json.load(file)
+        with open(ref_file) as file:
+            cq_ref = json.load(file)
+        self.assertEqual(ordered(cq_out), ordered(cq_ref))
 
     def test_code_quality_with_config(self):
         filename = 'coverity_cq.json'
@@ -75,4 +89,8 @@ def test_code_quality_with_config(self):
             str(TEST_IN_DIR / 'defects.txt'),
         ])
         self.assertEqual(3, retval)
-        self.assertTrue(filecmp.cmp(out_file, ref_file))
+        with open(out_file) as file:
+            cq_out = json.load(file)
+        with open(ref_file) as file:
+            cq_ref = json.load(file)
+        self.assertEqual(ordered(cq_out), ordered(cq_ref))

tests/test_in/config_example_coverity.yml

@@ -1,14 +1,19 @@
 coverity:
   enabled: true
+  unclassified:
+    min: $MIN_COV_WARNINGS
+    max: '$MAX_COV_WARNINGS'
   intentional:
     min: 0
     max: -1
   bug:
+    min: 0
     max: 0
   pending:
     min: 0
     max: 0
   false_positive:
+    min: 0
     max: -1
 sphinx:
   enabled: false