Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (233367 => 233368)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-06-29 20:11:39 UTC (rev 233367)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2018-06-29 20:25:44 UTC (rev 233368)
@@ -89,7 +89,10 @@
flunkOnFailure = True
command = ['Tools/Scripts/test-webkitperl']
+ def __init__(self, **kwargs):
+ super(RunWebKitPerlTests, self).__init__(timeout=2 * 60, **kwargs)
+
class RunWebKitPyTests(shell.ShellCommand):
name = 'webkitpy-tests'
description = ['webkitpy-tests running']
@@ -97,7 +100,10 @@
flunkOnFailure = True
command = ['Tools/Scripts/test-webkitpy']
+ def __init__(self, **kwargs):
+ super(RunWebKitPyTests, self).__init__(timeout=2 * 60, **kwargs)
+
def appendCustomBuildFlags(step, platform, fullPlatform):
# FIXME: Make a common 'supported platforms' list.
if platform not in ('gtk', 'wincairo', 'ios', 'jsc-only', 'wpe'):
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (233367 => 233368)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-06-29 20:11:39 UTC (rev 233367)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2018-06-29 20:25:44 UTC (rev 233368)
@@ -273,6 +273,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
command=['Tools/Scripts/test-webkitperl'],
+ timeout=120,
)
+ 0,
)
@@ -284,6 +285,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
command=['Tools/Scripts/test-webkitperl'],
+ timeout=120,
)
+ ExpectShell.log('stdio', stdout='''Failed tests: 1-3, 5-7, 9, 11-13
Files=40, Tests=630, 4 wallclock secs ( 0.16 usr 0.09 sys + 2.78 cusr 0.64 csys = 3.67 CPU)
@@ -308,6 +310,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
command=['Tools/Scripts/test-webkitpy'],
+ timeout=120,
)
+ 0,
)
@@ -319,6 +322,7 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
command=['Tools/Scripts/test-webkitpy'],
+ timeout=120,
)
+ ExpectShell.log('stdio', stdout='''Ran 1744 tests in 5.913s
FAILED (failures=1, errors=0)''')
Modified: trunk/Tools/ChangeLog (233367 => 233368)
--- trunk/Tools/ChangeLog 2018-06-29 20:11:39 UTC (rev 233367)
+++ trunk/Tools/ChangeLog 2018-06-29 20:25:44 UTC (rev 233368)
@@ -1,3 +1,15 @@
+2018-06-29 Aakash Jain <[email protected]>
+
+ [ews-build] Add timeout to webkitpy and webkitperl tests
+ https://bugs.webkit.org/show_bug.cgi?id=187191
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/ews-build/steps.py:
+ (RunWebKitPerlTests.__init__): Set timeout of 2 minutes.
+ (RunWebKitPyTests.__init__): Ditto.
+ * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
2018-06-29 Carlos Alberto Lopez Perez <[email protected]>
[WPE]: Fix exception handling when flatpak is not installed
