spl2-testing-framework 1.8.0__tar.gz → 1.8.1__tar.gz

{spl2_testing_framework-1.8.0 → spl2_testing_framework-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spl2-testing-framework
-Version: 1.8.0
+Version: 1.8.1
 Summary: SPL2 Testing Framework
 Home-page: https://github.com/splunk/spl2-testing-framework
 Keywords: SPL2 testing framework

{spl2_testing_framework-1.8.0 → spl2_testing_framework-1.8.1}/pyproject.toml

@@ -15,7 +15,7 @@
 
 [tool.poetry]
 name = "spl2-testing-framework"
-version = "1.8.0"
+version = "1.8.1"
 description = "SPL2 Testing Framework"
 authors = ["mgazda-splunk <mgazda@splunk.com>"]
 readme = "README.md"

{spl2_testing_framework-1.8.0 → spl2_testing_framework-1.8.1}/spl2_testing_framework/tools/spl2test_runner.py

@@ -319,7 +319,20 @@ class SPL2TestRunner:
                 f"got {len(destination_rows)} destination row(s) but "
                 f"{len(box_test.output)} expected output(s); zip would hide a mismatch."
             )
-            for event, expected in zip(destination_rows, box_test.output):
+
+            def _raw_sort_key(row):
+                raw = row.data.get("_raw") if hasattr(row, "data") else row.get("_raw")
+                if isinstance(raw, str):
+                    try:
+                        raw = json.loads(raw)
+                    except (ValueError, TypeError):
+                        pass
+                return json.dumps(raw, sort_keys=True, default=str)
+
+            for event, expected in zip(
+                sorted(destination_rows, key=_raw_sort_key),
+                sorted(box_test.output, key=_raw_sort_key),
+            ):
                 processed_event = self._splunk_process_event(
                     box_test, self._row_as_dict(event)
                 )