Title: [231083] trunk/Tools
- Revision
- 231083
- Author
- [email protected]
- Date
- 2018-04-26 18:25:10 -0700 (Thu, 26 Apr 2018)
Log Message
REGRESSION (r231039): RunUnitTests step reports disabled tests as failures
https://bugs.webkit.org/show_bug.cgi?id=185061
Reviewed by Aakash Jain.
* BuildSlaveSupport/build.webkit.org-config/steps.py:
(RunUnitTests.countFailures): Return the difference between the total number of tests run and the number that passed.
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Add a test.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (231082 => 231083)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-04-27 00:10:48 UTC (rev 231082)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-04-27 01:25:10 UTC (rev 231083)
@@ -498,12 +498,11 @@
def countFailures(self, cmd):
log_text = cmd.logs['stdio'].getText()
- count = 0
match = re.search(r'Ran (?P<ran>\d+) tests of (?P<total>\d+) with (?P<passed>\d+) successful', log_text)
if not match:
return -1
- return int(match.group('total')) - int(match.group('passed'))
+ return int(match.group('ran')) - int(match.group('passed'))
class RunPythonTests(TestWithFailureCount):
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (231082 => 231083)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2018-04-27 00:10:48 UTC (rev 231082)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2018-04-27 01:25:10 UTC (rev 231083)
@@ -241,6 +241,20 @@
All tests successfully passed!
""")
+ def test_no_failures_or_timeouts_with_disabled(self):
+ self.assertFailures(0, """...
+worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
+worker/0 TestWTF.WTF_Variant.Ref Passed
+worker/0 TestWTF.WTF_Variant.RefPtr Passed
+worker/0 TestWTF.WTF_Variant.RetainPtr Passed
+worker/0 TestWTF.WTF_Variant.VisitorUsingMakeVisitor Passed
+worker/0 TestWTF.WTF_Variant.VisitorUsingSwitchOn Passed
+worker/0 exiting
+Ran 1881 tests of 1888 with 1881 successful
+------------------------------
+All tests successfully passed!
+""")
+
def test_one_failure(self):
self.assertFailures(1, """...
worker/0 TestWTF.WTF_Variant.OperatorAmpersand Passed
Modified: trunk/Tools/ChangeLog (231082 => 231083)
--- trunk/Tools/ChangeLog 2018-04-27 00:10:48 UTC (rev 231082)
+++ trunk/Tools/ChangeLog 2018-04-27 01:25:10 UTC (rev 231083)
@@ -1,3 +1,14 @@
+2018-04-26 Ryan Haddad <[email protected]>
+
+ REGRESSION (r231039): RunUnitTests step reports disabled tests as failures
+ https://bugs.webkit.org/show_bug.cgi?id=185061
+
+ Reviewed by Aakash Jain.
+
+ * BuildSlaveSupport/build.webkit.org-config/steps.py:
+ (RunUnitTests.countFailures): Return the difference between the total number of tests run and the number that passed.
+ * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Add a test.
+
2018-04-26 Ross Kirsling <[email protected]>
Add release bots for WinCairo.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
