Attachment 338942 Details for Bug 185061 – Patch

[patch] Patch

bug-185061-20180426174344.patch (text/plain), 2.75 KB, created by Ryan Haddad on 2018-04-26 17:43:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Haddad

Created: 2018-04-26 17:43:44 PDT

Size: 2.75 KB

patch

obsolete

>Subversion Revision: 231082
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 386efdd574a8ee9fd78f2060c08289a2379ce7f1..d8cd52b6485bef78797e61e1cf7d0f6b03d04eb4 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-04-26  Ryan Haddad  <ryanhaddad@apple.com>
>+
>+        REGRESSION (r231039): RunUnitTests step reports disabled tests as failures
>+        https://bugs.webkit.org/show_bug.cgi?id=185061
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  <ross.kirsling@sony.com>
> 
>         Add release bots for WinCairo.
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>index 7ea11f2cf03673e9f233d5a09ac54c3cfe39df0f..d1c65711928ed34d52aec537f4ea65bd56cc400a 100644
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>@@ -498,12 +498,11 @@ class RunUnitTests(TestWithFailureCount):
> 
>     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):
>diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>index e37972a454c1c55fd34485c5a3ba668de49dccbf..64d2746df0877091862af05efcf8b57d8493017e 100755
>--- a/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>@@ -239,6 +239,20 @@ worker/0 exiting
> Ran 1888 tests of 1888 with 1888 successful
> ------------------------------
> 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):

Actions: View | Formatted Diff | Diff

Attachments on bug 185061: 338942