Diff
Modified: trunk/LayoutTests/ChangeLog (254340 => 254341)
--- trunk/LayoutTests/ChangeLog 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/LayoutTests/ChangeLog 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,15 @@
+2020-01-10 youenn fablet <[email protected]>
+
+ [WTR] Use short heart beat timer as a TestOption
+ https://bugs.webkit.org/show_bug.cgi?id=205795
+
+ Reviewed by Chris Dumez.
+
+ * http/wpt/service-workers/service-worker-spinning-activate.https.html:
+ * http/wpt/service-workers/service-worker-spinning-fetch.https.html:
+ * http/wpt/service-workers/service-worker-spinning-install.https.html:
+ * http/wpt/service-workers/service-worker-spinning-message.https.html:
+
2020-01-10 Pablo Saavedra <[email protected]>
[GTK] imported/w3c/web-platform-tests/xhr/anonymous-mode-unsupported.htm is flaky
Modified: trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-activate.https.html (254340 => 254341)
--- trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-activate.https.html 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-activate.https.html 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,4 @@
+<!doctype html><!-- webkit-test-runner [ useServiceWorkerShortTimeout=true ] -->
<html>
<head>
<script src=""
Modified: trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-fetch.https.html (254340 => 254341)
--- trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-fetch.https.html 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-fetch.https.html 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,4 @@
+<!doctype html><!-- webkit-test-runner [ useServiceWorkerShortTimeout=true ] -->
<html>
<head>
<script src=""
Modified: trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-install.https.html (254340 => 254341)
--- trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-install.https.html 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-install.https.html 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,4 @@
+<!doctype html><!-- webkit-test-runner [ useServiceWorkerShortTimeout=true ] -->
<html>
<head>
<script src=""
Modified: trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-message.https.html (254340 => 254341)
--- trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-message.https.html 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/LayoutTests/http/wpt/service-workers/service-worker-spinning-message.https.html 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,4 @@
+<!doctype html><!-- webkit-test-runner [ useServiceWorkerShortTimeout=true ] -->
<html>
<head>
<script src=""
Modified: trunk/Tools/ChangeLog (254340 => 254341)
--- trunk/Tools/ChangeLog 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/Tools/ChangeLog 2020-01-10 16:48:40 UTC (rev 254341)
@@ -1,3 +1,21 @@
+2020-01-10 youenn fablet <[email protected]>
+
+ [WTR] Use short heart beat timer as a TestOption
+ https://bugs.webkit.org/show_bug.cgi?id=205795
+
+ Reviewed by Chris Dumez.
+
+ Using short service worker heartbeat timeout values creates flakiness on slow bots.
+ By default, use regular service worker heartbeat timeout values for layout tests.
+ Add a WTR option value to use short service worker timeout values.
+ Use this option for service worker spinning layout tests.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+ (WTR::updateTestOptionsFromTestHeader):
+ * WebKitTestRunner/TestOptions.h:
+ (WTR::TestOptions::hasSameInitializationOptions const):
+
2020-01-10 Jonathan Bedard <[email protected]>
Python 3: Add support to run-webkit-tests
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (254340 => 254341)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-01-10 16:48:40 UTC (rev 254341)
@@ -947,7 +947,7 @@
WKPreferencesSetVideoPlaybackRequiresUserGesture(preferences, false);
WKPreferencesSetAudioPlaybackRequiresUserGesture(preferences, false);
- WKPreferencesSetShouldUseServiceWorkerShortTimeout(preferences, true);
+ WKPreferencesSetShouldUseServiceWorkerShortTimeout(preferences, options.contextOptions.useServiceWorkerShortTimeout);
platformResetPreferencesToConsistentValues();
}
@@ -1434,6 +1434,8 @@
testOptions.contextOptions.enableProcessSwapOnNavigation = parseBooleanTestHeaderValue(value);
else if (key == "enableProcessSwapOnWindowOpen")
testOptions.contextOptions.enableProcessSwapOnWindowOpen = parseBooleanTestHeaderValue(value);
+ else if (key == "useServiceWorkerShortTimeout")
+ testOptions.contextOptions.useServiceWorkerShortTimeout = parseBooleanTestHeaderValue(value);
else if (key == "enableColorFilter")
testOptions.enableColorFilter = parseBooleanTestHeaderValue(value);
else if (key == "punchOutWhiteBackgroundsInDarkMode")
Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (254340 => 254341)
--- trunk/Tools/WebKitTestRunner/TestOptions.h 2020-01-10 16:16:19 UTC (rev 254340)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h 2020-01-10 16:48:40 UTC (rev 254341)
@@ -38,6 +38,7 @@
bool ignoreSynchronousMessagingTimeouts { false };
bool enableProcessSwapOnNavigation { true };
bool enableProcessSwapOnWindowOpen { false };
+ bool useServiceWorkerShortTimeout { false };
bool hasSameInitializationOptions(const ContextOptions& options) const
{
@@ -44,7 +45,8 @@
if (ignoreSynchronousMessagingTimeouts != options.ignoreSynchronousMessagingTimeouts
|| overrideLanguages != options.overrideLanguages
|| enableProcessSwapOnNavigation != options.enableProcessSwapOnNavigation
- || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen)
+ || enableProcessSwapOnWindowOpen != options.enableProcessSwapOnWindowOpen
+ || useServiceWorkerShortTimeout != options.useServiceWorkerShortTimeout)
return false;
return true;
}
