From 1e0ce00c8e2ad697d469a892a791b76fed5df64e Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Wed, 16 Feb 2022 13:59:15 -0500 Subject: [PATCH] report-xfstests.py: Normalize device and mount paths Signed-off-by: Anna Schumaker --- reporter/testresults.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/reporter/testresults.py b/reporter/testresults.py index c45b6cc..c296173 100644 --- a/reporter/testresults.py +++ b/reporter/testresults.py @@ -18,9 +18,13 @@ class PassingTest: class SkippedTest: - def __init__(self, elm): + def __init__(self, elm, test_dev, test_dir, scratch_dev, scratch_mnt): self.time = elm.attrib["time"] self.message = elm[0].attrib["message"] + self.message = self.message.replace(test_dev, "$TEST_DEV") + self.message = self.message.replace(test_dir, "$TEST_DIR") + self.message = self.message.replace(scratch_dev, "$SCRATCH_DEV") + self.message = self.message.replace(scratch_mnt, "$SCRATCH_MNT") class FailedTest: @@ -74,7 +78,11 @@ class TestResults: result = PassingTest(elm) passed += 1 elif elm[0].tag == "skipped": - result = SkippedTest(elm) + result = SkippedTest(elm, + self.properties[self.versions[-1]]["TEST_DEV"], + self.properties[self.versions[-1]]["TEST_DIR"], + self.properties[self.versions[-1]]["SCRATCH_DEV"], + self.properties[self.versions[-1]]["SCRATCH_MNT"]) self.skipped.add(result.message) elif elm[0].tag == "failure": result = FailedTest(elm)