Title: [137404] trunk/Tools
- Revision
- 137404
- Author
- [email protected]
- Date
- 2012-12-11 18:22:28 -0800 (Tue, 11 Dec 2012)
Log Message
REGRESSION(r133380): new tests without expected file reported as failing tests on the bots
https://bugs.webkit.org/show_bug.cgi?id=101469
Reviewed by Ryosuke Niwa.
Fix parsing of NRWT's output to identify missing results separately
from other regressions.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests._parseNewRunWebKitTestsOutput):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(MasterCfgTest.test_nrwt_leaks_parsing):
(test_nrwt_missing_results):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (137403 => 137404)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-12-12 02:21:46 UTC (rev 137403)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-12-12 02:22:28 UTC (rev 137404)
@@ -364,10 +364,10 @@
def _parseNewRunWebKitTestsOutput(self, logText):
incorrectLayoutLines = []
expressions = [
- ('flakes', re.compile(r'[Uu]nexpected flakiness.+:?\s*\((\d+)\)')),
+ ('flakes', re.compile(r'Unexpected flakiness.+\((\d+)\)')),
('new passes', re.compile(r'Expected to .+, but passed:\s+\((\d+)\)')),
- ('missing results', re.compile(r'(?:no expected results found|missing results)\s*:\s+\((\d+)\)')),
- ('failures', re.compile(r'Regressions: [Uu]nexpected.+:?\s*\((\d+)\)')),
+ ('missing results', re.compile(r'Regressions: Unexpected missing results\s+\((\d+)\)')),
+ ('failures', re.compile(r'Regressions: Unexpected.+\((\d+)\)')),
]
testFailures = {}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (137403 => 137404)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2012-12-12 02:21:46 UTC (rev 137403)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2012-12-12 02:22:28 UTC (rev 137404)
@@ -51,7 +51,7 @@
class MasterCfgTest(unittest.TestCase):
def test_nrwt_leaks_parsing(self):
- run_webkit_tests = RunWebKitTests()
+ run_webkit_tests = RunWebKitTests() # pylint is confused by the way we import the module ... pylint: disable-msg=E0602
log_text = """
2011-08-09 10:05:18,580 29486 mac.py:275 INFO leaks found for a total of 197,936 bytes!
2011-08-09 10:05:18,580 29486 mac.py:276 INFO 1 unique leaks found!
@@ -61,9 +61,33 @@
'1 unique leaks found!',
]
run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
+ self.fail()
self.assertEqual(run_webkit_tests.incorrectLayoutLines, expected_incorrect_lines)
+ def test_nrwt_missing_results(self):
+ run_webkit_tests = RunWebKitTests() # pylint is confused by the way we import the module ... pylint: disable-msg=E0602
+ log_text = """
+Expected to fail, but passed: (2)
+ animations/additive-transform-animations.html
+ animations/cross-fade-webkit-mask-box-image.html
+Unexpected flakiness: text-only failures (2)
+ fast/events/touch/touch-inside-iframe.html [ Failure Pass ]
+ http/tests/inspector-enabled/console-clear-arguments-on-frame-navigation.html [ Failure Pass ]
+
+Unexpected flakiness: timeouts (1)
+ svg/text/foreignObject-repaint.xml [ Timeout Pass ]
+
+Regressions: Unexpected missing results (1)
+ svg/custom/zero-path-square-cap-rendering2.svg [ Missing ]
+
+Regressions: Unexpected text-only failures (1)
+ svg/custom/zero-path-square-cap-rendering2.svg [ Failure ]
+"""
+ run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
+ self.assertEqual(set(run_webkit_tests.incorrectLayoutLines),
+ set(['2 new passes', '3 flakes', '1 missing results', '1 failures']))
+
class StubStdio(object):
def __init__(self, stdio):
self._stdio = stdio
Modified: trunk/Tools/ChangeLog (137403 => 137404)
--- trunk/Tools/ChangeLog 2012-12-12 02:21:46 UTC (rev 137403)
+++ trunk/Tools/ChangeLog 2012-12-12 02:22:28 UTC (rev 137404)
@@ -1,5 +1,21 @@
2012-12-11 Dirk Pranke <[email protected]>
+ REGRESSION(r133380): new tests without expected file reported as failing tests on the bots
+ https://bugs.webkit.org/show_bug.cgi?id=101469
+
+ Reviewed by Ryosuke Niwa.
+
+ Fix parsing of NRWT's output to identify missing results separately
+ from other regressions.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests._parseNewRunWebKitTestsOutput):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (MasterCfgTest.test_nrwt_leaks_parsing):
+ (test_nrwt_missing_results):
+
+2012-12-11 Dirk Pranke <[email protected]>
+
buildbot: change run-webkit-tests --no-launch-safari to --no-show-results
https://bugs.webkit.org/show_bug.cgi?id=104299
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
