Attachment 338824 Details for Bug 184982 – Patch for landing

[patch] Patch for landing

bug-184982-20180425164601.patch (text/plain), 13.37 KB, created by Jonathan Bedard on 2018-04-25 16:46:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-04-25 16:46:01 PDT

Size: 13.37 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 231033)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-04-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        REGRESSION (r230998): Bot watcher's dashboard doesn't display number of API test failures
>+        https://bugs.webkit.org/show_bug.cgi?id=184982
>+
>+        Rubber-stamped by Aakash Jain.
>+
>+        Correctly count the number of API test failures.
>+
>+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
>+        (RunUnitTests.countFailures): Count the number of test failures for the new run-api-tests.
>+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py:
>+        * Scripts/webkitpy/api_tests/manager.py:
>+        (Manager.run): Disabled tests are not run.
>+
> 2018-04-25  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Remove access to keychain from the WebContent process
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	(revision 231019)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/steps.py	(working copy)
>@@ -496,15 +496,10 @@ class RunUnitTests(TestWithFailureCount)
>         log_text = cmd.logs['stdio'].getText()
>         count = 0
> 
>-        split = re.split(r'\sTests that timed out:\s', log_text)
>-        if len(split) > 1:
>-            count += len(re.findall(r'^\s+\S+$', split[1], flags=re.MULTILINE))
>-
>-        split = re.split(r'\sTests that failed:\s', split[0])
>-        if len(split) > 1:
>-            count += len(re.findall(r'^\s+\S+$', split[1], flags=re.MULTILINE))
>-
>-        return count
>+        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'))
> 
> 
> class RunPythonTests(TestWithFailureCount):
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	(revision 231019)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	(working copy)
>@@ -228,111 +228,162 @@ class RunUnitTestsTest(unittest.TestCase
>         self.assertEqual(expected_text, actual_text)
> 
>     def test_no_failures_or_timeouts(self):
>-        self.assertFailures(0, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>+        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 1888 tests of 1888 with 1888 successful
>+------------------------------
>+All tests successfully passed!
> """)
> 
>     def test_one_failure(self):
>-        self.assertFailures(1, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>-Tests that failed:
>-  WebKit2.WebKit2.CanHandleRequest
>+        self.assertFailures(1, """...
>+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 1888 tests of 1888 with 1887 successful
>+------------------------------
>+Test suite failed
>+
>+Crashed
>+
>+    TestWTF.WTF.StringConcatenate_Unsigned
>+        **FAIL** WTF.StringConcatenate_Unsigned
>+
>+        C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
>+        Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
>+          Actual: hello 42 world
>+        Expected: "hello * world"
>+        Which is: 74B00C9C
>+
>+Testing completed, Exit status: 3
> """)
> 
>     def test_multiple_failures(self):
>-        self.assertFailures(4, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>-Tests that failed:
>-  WebKit2.WebKit2.CanHandleRequest
>-  WebKit2.WebKit2.DocumentStartUserScriptAlertCrashTest
>-  WebKit2.WebKit2.HitTestResultNodeHandle
>-  WebKit2.WebKit2.InjectedBundleBasic
>+        self.assertFailures(2, """...
>+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 1888 tests of 1888 with 1886 successful
>+------------------------------
>+Test suite failed
>+
>+Crashed
>+
>+    TestWTF.WTF.StringConcatenate_Unsigned
>+        **FAIL** WTF.StringConcatenate_Unsigned
>+
>+        C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
>+        Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
>+          Actual: hello 42 world
>+        Expected: "hello * world"
>+        Which is: 74B00C9C
>+
>+    TestWTF.WTF_Expected.Unexpected
>+        **FAIL** WTF_Expected.Unexpected
>+
>+        C:\cygwin\home\buildbot\slave\win-release\build\Tools\TestWebKitAPI\Tests\WTF\Expected.cpp:96
>+        Value of: s1
>+          Actual: oops
>+        Expected: s0
>+        Which is: oops
>+
>+Testing completed, Exit status: 3
> """)
> 
>     def test_one_timeout(self):
>-        self.assertFailures(1, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>-Tests that timed out:
>-  WebKit2.WebKit2.CanHandleRequest
>+        self.assertFailures(1, """...
>+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 1888 tests of 1888 with 1887 successful
>+------------------------------
>+Test suite failed
>+
>+Timeout
>+
>+     TestWTF.WTF_PoisonedUniquePtrForTriviallyDestructibleArrays.Assignment
>+
>+Testing completed, Exit status: 3
> """)
> 
>     def test_multiple_timeouts(self):
>-        self.assertFailures(4, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>-Tests that timed out:
>-  WebKit2.WebKit2.CanHandleRequest
>-  WebKit2.WebKit2.DocumentStartUserScriptAlertCrashTest
>-  WebKit2.WebKit2.HitTestResultNodeHandle
>-  WebKit2.WebKit2.InjectedBundleBasic
>+        self.assertFailures(2, """...
>+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 1888 tests of 1888 with 1886 successful
>+------------------------------
>+Test suite failed
>+
>+Timeout
>+
>+    TestWTF.WTF_PoisonedUniquePtrForTriviallyDestructibleArrays.Assignment
>+    TestWTF.WTF_Lock.ContendedShortSection
>+
>+Testing completed, Exit status: 3
> """)
> 
>     def test_multiple_failures_and_timeouts(self):
>-        self.assertFailures(8, """Note: Google Test filter = WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[==========] Running 1 test from 1 test case.
>-[----------] Global test environment set-up.
>-[----------] 1 test from WebViewDestructionWithHostWindow
>-[ RUN      ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose
>-[       OK ] WebViewDestructionWithHostWindow.DestroyViewWindowWithoutClose (127 ms)
>-[----------] 1 test from WebViewDestructionWithHostWindow (127 ms total)
>-
>-[----------] Global test environment tear-down
>-[==========] 1 test from 1 test case ran. (127 ms total)
>-[  PASSED  ] 1 test.
>-Tests that failed:
>-  WebKit2.WebKit2.CanHandleRequest
>-  WebKit2.WebKit2.DocumentStartUserScriptAlertCrashTest
>-  WebKit2.WebKit2.HitTestResultNodeHandle
>-Tests that timed out:
>-  WebKit2.WebKit2.InjectedBundleBasic
>-  WebKit2.WebKit2.LoadCanceledNoServerRedirectCallback
>-  WebKit2.WebKit2.MouseMoveAfterCrash
>-  WebKit2.WebKit2.ResponsivenessTimerDoesntFireEarly
>-  WebKit2.WebKit2.WebArchive
>+        self.assertFailures(4, """...
>+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 1888 tests of 1888 with 1884 successful
>+------------------------------
>+Test suite failed
>+
>+Crashed
>+
>+    TestWTF.WTF.StringConcatenate_Unsigned
>+        **FAIL** WTF.StringConcatenate_Unsigned
>+
>+        C:\\cygwin\\home\\buildbot\\slave\\win-release\\build\\Tools\\TestWebKitAPI\\Tests\\WTF\\StringConcatenate.cpp:84
>+        Value of: makeString("hello ", static_cast<unsigned short>(42) , " world")
>+          Actual: hello 42 world
>+        Expected: "hello * world"
>+        Which is: 74B00C9C
>+
>+    TestWTF.WTF_Expected.Unexpected
>+        **FAIL** WTF_Expected.Unexpected
>+
>+        C:\cygwin\home\buildbot\slave\win-release\build\Tools\TestWebKitAPI\Tests\WTF\Expected.cpp:96
>+        Value of: s1
>+          Actual: oops
>+        Expected: s0
>+        Which is: oops
>+
>+Timeout
>+
>+    TestWTF.WTF_PoisonedUniquePtrForTriviallyDestructibleArrays.Assignment
>+    TestWTF.WTF_Lock.ContendedShortSection
>+
>+Testing completed, Exit status: 3
> """)
> 
> 
>Index: Tools/Scripts/webkitpy/api_tests/manager.py
>===================================================================
>--- Tools/Scripts/webkitpy/api_tests/manager.py	(revision 231019)
>+++ Tools/Scripts/webkitpy/api_tests/manager.py	(working copy)
>@@ -163,10 +163,11 @@ class Manager(object):
>             self._stream.writeln('')
> 
>         successful = runner.result_map_by_status(runner.STATUS_PASSED)
>-        _log.info('Ran {} tests of {} with {} successful'.format(len(runner.results), len(test_names), len(successful)))
>+        disabled = len(runner.result_map_by_status(runner.STATUS_DISABLED))
>+        _log.info('Ran {} tests of {} with {} successful'.format(len(runner.results) - disabled, len(test_names), len(successful)))
> 
>         self._stream.writeln('------------------------------')
>-        if len(successful) + len(runner.result_map_by_status(runner.STATUS_DISABLED)) == len(test_names):
>+        if len(successful) + disabled == len(test_names):
>             self._stream.writeln('All tests successfully passed!')
>             return Manager.SUCCESS
>

Actions: View | Formatted Diff | Diff

Attachments on bug 184982: 338822 | 338824