diff --git a/layout/tools/reftest/manifest.sys.mjs b/layout/tools/reftest/manifest.sys.mjs index 5eecde795aa7..09ccefd9f7fd 100644 --- a/layout/tools/reftest/manifest.sys.mjs +++ b/layout/tools/reftest/manifest.sys.mjs @@ -155,6 +155,7 @@ function ReadManifest(aURL, aFilter, aManifestID) { var origLength = items.length; items = defaults.concat(items); + var modifiers = [...items]; while ( items[0].match( /^(fails|needs-focus|random|skip|asserts|slow|require-or|silentfail|pref|test-pref|ref-pref|fuzzy|chaos-mode|wr-capture|wr-capture-ref|noautofuzz)/ @@ -492,6 +493,7 @@ function ReadManifest(aURL, aFilter, aManifestID) { chaosMode, wrCapture, noAutoFuzz, + modifiers, }, aFilter, aManifestID @@ -572,6 +574,7 @@ function ReadManifest(aURL, aFilter, aManifestID) { chaosMode, wrCapture, noAutoFuzz, + modifiers, }, aFilter, aManifestID diff --git a/layout/tools/reftest/reftest.sys.mjs b/layout/tools/reftest/reftest.sys.mjs index 0f103c5816a5..12bdab98f9f2 100644 --- a/layout/tools/reftest/reftest.sys.mjs +++ b/layout/tools/reftest/reftest.sys.mjs @@ -1512,6 +1512,8 @@ function RecordResult(testRunTime, errorMsg, typeSpecificResults) { extra.image1 = image1; } } + extra.modifiers = g.urls[0].modifiers; + logger.testStatus( g.urls[0].identifier, message, diff --git a/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py b/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py index fcedb7ebd4ba..f03611d7dae0 100644 --- a/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py +++ b/testing/mozbase/mozlog/mozlog/formatters/errorsummary.py @@ -46,6 +46,7 @@ class ErrorSummaryFormatter(BaseFormatter): "expected": item["expected"], "message": item.get("message"), "stack": item.get("stack"), + "modifiers": item.get("extra", {}).get("modifiers", ""), "known_intermittent": item.get("known_intermittent", []), } return self._output("test_result", data) diff --git a/testing/mozbase/mozlog/tests/test_errorsummary.py b/testing/mozbase/mozlog/tests/test_errorsummary.py index 30a5a304b21c..0925c3a09e71 100644 --- a/testing/mozbase/mozlog/tests/test_errorsummary.py +++ b/testing/mozbase/mozlog/tests/test_errorsummary.py @@ -33,7 +33,7 @@ import pytest ], """ {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0} - {"test": "test_baz", "subtest": null, "group": "manifestA", "status": "PASS", "expected": "FAIL", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 8} + {"test": "test_baz", "subtest": null, "group": "manifestA", "status": "PASS", "expected": "FAIL", "message": null, "stack": null, "modifiers": "", "known_intermittent": [], "action": "test_result", "line": 8} {"group": "manifestA", "status": "ERROR", "duration": 20, "action": "group_result", "line": 9} {"group": "manifestB", "status": "OK", "duration": 10, "action": "group_result", "line": 9} """.strip(), @@ -86,7 +86,7 @@ import pytest ], """ {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0} - {"test": "test_bar", "subtest": null, "group": "manifestA", "status": "CRASH", "expected": "OK", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 4} + {"test": "test_bar", "subtest": null, "group": "manifestA", "status": "CRASH", "expected": "OK", "message": null, "stack": null, "modifiers": "", "known_intermittent": [], "action": "test_result", "line": 4} {"group": "manifestA", "status": "ERROR", "duration": 20, "action": "group_result", "line": 9} {"group": "manifestB", "status": "OK", "duration": 10, "action": "group_result", "line": 9} """.strip(), @@ -143,8 +143,8 @@ import pytest ], """ {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0} - {"test": "test_baz", "subtest": "Test timed out", "group": "manifestA", "status": "FAIL", "expected": "PASS", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 8} - {"test": "test_baz", "subtest": "", "group": "manifestA", "status": "TIMEOUT", "expected": "PASS", "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 9} + {"test": "test_baz", "subtest": "Test timed out", "group": "manifestA", "status": "FAIL", "expected": "PASS", "message": null, "stack": null, "modifiers": "", "known_intermittent": [], "action": "test_result", "line": 8} + {"test": "test_baz", "subtest": "", "group": "manifestA", "status": "TIMEOUT", "expected": "PASS", "message": null, "stack": null, "modifiers": "", "known_intermittent": [], "action": "test_result", "line": 9} {"test": "manifestA", "group": "manifestA", "signature": "signature", "stackwalk_stderr": null, "stackwalk_stdout": null, "action": "crash", "line": 10} {"group": "manifestA", "status": "ERROR", "duration": 49, "action": "group_result", "line": 12} {"group": "manifestB", "status": "OK", "duration": 10, "action": "group_result", "line": 12} @@ -225,7 +225,7 @@ import pytest ], """ {"groups": ["manifestA", "manifestB"], "action": "test_groups", "line": 0} - {"test": "test_baz", "group": "manifestA", "status": "FAIL", "expected": "OK", "subtest": null, "message": null, "stack": null, "known_intermittent": [], "action": "test_result", "line": 8} + {"test": "test_baz", "group": "manifestA", "status": "FAIL", "expected": "OK", "subtest": null, "message": null, "stack": null, "modifiers": "", "known_intermittent": [], "action": "test_result", "line": 8} """.strip(), id="timeout_no_group_status", ),