Merge pull request #1254 from cloudbees-oss/ignore-test-ng-file

[csm] ignore testng-results.xml

Author: Konboi

launchable/test_runners/maven.py

@@ -161,11 +161,13 @@ def format_same_bin(s: str) -> List[Dict[str, str]]:
 def record_tests(client, reports):
     client.path_builder = junit5_nested_class_path_builder(client.path_builder)
 
-    # Override report method to filter out failsafe-summary.xml
+    # Override report method to filter out non-JUnit report files
     original_report = client.report
 
+    IGNORED_FILES = {'failsafe-summary.xml', 'testng-results.xml'}
+
     def report_with_filter(junit_report_file: str):
-        if not junit_report_file.endswith('failsafe-summary.xml'):
+        if not any(junit_report_file.endswith(f) for f in IGNORED_FILES):
             original_report(junit_report_file)
 
     client.report = report_with_filter

tests/commands/compare/test_subsets.py

@@ -201,17 +201,16 @@ def test_subsets_subset_ids(self):
                           mix_stderr=False)
 
         self.assert_success(result)
-        expect = """PTS subset change summary:
-────────────────────────────────
--> 3 tests analyzed | 1 ↑ promoted | 1 ↓ demoted
--> Code files affected: bbb.py, ccc.py, ddd.py
-────────────────────────────────
-
-Δ Rank    Subset Rank    Test Name    Reason                Density
---------  -------------  -----------  --------------------  ---------
-NEW       1              file=ddd.py  Changed file: ddd.py  0.9
-↑1        2              file=ccc.py  Changed file: ccc.py  0.7
-↓1        3              file=bbb.py  Changed file: bbb.py  0.5
-DELETED   -              file=aaa.py
-"""
-        self.assertEqual(result.stdout, expect)
+        output = result.stdout
+        self.assertIn("3 tests analyzed | 1 ↑ promoted | 1 ↓ demoted", output)
+        self.assertIn("Code files affected: bbb.py, ccc.py, ddd.py", output)
+        self.assertIn("Δ Rank", output)
+        self.assertIn("Density", output)
+        for expected_row in [
+            ("NEW", "1", "file=ddd.py", "Changed file: ddd.py", "0.9"),
+            ("↑1", "2", "file=ccc.py", "Changed file: ccc.py", "0.7"),
+            ("↓1", "3", "file=bbb.py", "Changed file: bbb.py", "0.5"),
+            ("DELETED", "-", "file=aaa.py"),
+        ]:
+            for cell in expected_row:
+                self.assertIn(cell, output)