Commit 8dfa5b84 authored by Xiaocheng Hu's avatar Xiaocheng Hu Committed by Commit Bot

[webkitpy] Treat LayoutNG name mismatch as PASS

This patch changes the layout test runner to treat LayoutNG name
mismatch (e.g., LayoutBlockFlow vs. LayoutNGBlockFlow) as PASS instead
of TEXT failure, to reduce noise in test result.

Bug: 795043
Change-Id: Ia0a358f7ccf47cc809fff6b20eea1847d4754413
Reviewed-on: https://chromium-review.googlesource.com/828276Reviewed-by: default avatarAleks Totic <atotic@chromium.org>
Reviewed-by: default avatarQuinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524407}
parent 38856cf6
...@@ -357,9 +357,10 @@ class SingleTestRunner(object): ...@@ -357,9 +357,10 @@ class SingleTestRunner(object):
processed = actual.replace('LayoutNGBlockFlow', 'LayoutBlockFlow').replace('LayoutNGListItem', 'LayoutListItem') processed = actual.replace('LayoutNGBlockFlow', 'LayoutBlockFlow').replace('LayoutNGListItem', 'LayoutListItem')
return not self._port.do_text_results_differ(expected, processed) return not self._port.do_text_results_differ(expected, processed)
# LayoutNG name mismatch # LayoutNG name mismatch (e.g., LayoutBlockFlow vs. LayoutNGBlockFlow)
# is treated as pass
if is_ng_name_mismatch(expected_text, normalized_actual_text): if is_ng_name_mismatch(expected_text, normalized_actual_text):
return [test_failures.FailureLayoutNGNameMismatch()] return []
# General text mismatch # General text mismatch
if self._port.do_text_results_differ( if self._port.do_text_results_differ(
......
...@@ -216,15 +216,6 @@ class FailureSpaceTabLineBreakTextMismatch(FailureTextMismatch): ...@@ -216,15 +216,6 @@ class FailureSpaceTabLineBreakTextMismatch(FailureTextMismatch):
return 'spaces, tabs and newlines only' return 'spaces, tabs and newlines only'
class FailureLayoutNGNameMismatch(FailureTextMismatch):
def message(self):
return 'text diff due to LayoutNG name mismatch'
def text_mismatch_category(self):
return 'LayoutNG name mismatch'
class FailureMissingImageHash(TestFailure): class FailureMissingImageHash(TestFailure):
def message(self): def message(self):
...@@ -313,7 +304,7 @@ ALL_FAILURE_CLASSES = (FailureTimeout, FailureCrash, FailureMissingResult, ...@@ -313,7 +304,7 @@ ALL_FAILURE_CLASSES = (FailureTimeout, FailureCrash, FailureMissingResult,
FailureTestHarnessAssertion, FailureTestHarnessAssertion,
FailureTextMismatch, FailureSpacesAndTabsTextMismatch, FailureTextMismatch, FailureSpacesAndTabsTextMismatch,
FailureLineBreaksTextMismatch, FailureSpaceTabLineBreakTextMismatch, FailureLineBreaksTextMismatch, FailureSpaceTabLineBreakTextMismatch,
FailureLayoutNGNameMismatch, FailureMissingImageHash, FailureMissingImageHash,
FailureMissingImage, FailureImageHashMismatch, FailureMissingImage, FailureImageHashMismatch,
FailureImageHashIncorrect, FailureReftestMismatch, FailureImageHashIncorrect, FailureReftestMismatch,
FailureReftestMismatchDidNotOccur, FailureReftestMismatchDidNotOccur,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment