Diff
Modified: trunk/LayoutTests/ChangeLog (199224 => 199225)
--- trunk/LayoutTests/ChangeLog 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/ChangeLog 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,3 +1,15 @@
+2016-04-08 Youenn Fablet <[email protected]>
+
+ Testharness-based tests that time out should be able to produce a detailled output
+ https://bugs.webkit.org/show_bug.cgi?id=145313
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * TestExpectations: Removed TIMEOUT for some tests for which testharness.timeout will be called just before WTR times out.
+ * platform/gtk/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt: GTK specific baseline.
+ * resources/testharnessreport.js:
+ (add_completion_callback): Improving error logging message. Dumping of the tests status in error case.
+
2016-04-08 Manuel Rego Casasnovas <[email protected]>
[css-grid] Fix positioned items with grid gaps
Modified: trunk/LayoutTests/TestExpectations (199224 => 199225)
--- trunk/LayoutTests/TestExpectations 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/TestExpectations 2016-04-08 14:45:24 UTC (rev 199225)
@@ -323,8 +323,6 @@
imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-cors.htm [ Skip ]
imported/w3c/web-platform-tests/XMLHttpRequest/send-redirect-to-non-cors.htm [ Skip ]
-imported/w3c/web-platform-tests/fetch/api/request/request-cache.html [ Timeout ]
-
# New W3C ref tests that are failing.
webkit.org/b/148856 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-video-element/video_initially_paused.html [ ImageOnlyFailure ]
@@ -387,12 +385,6 @@
imported/w3c/web-platform-tests/domparsing/DOMParser-parseFromString-html.html [ Pass Failure ]
imported/w3c/web-platform-tests/domparsing/insert-adjacent.html [ Pass Failure ]
-# W3C html timing out tests
-imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html [ Failure Timeout ]
-imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01.html [ Timeout ]
-imported/w3c/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01.html [ Timeout ]
-imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html [ Timeout ]
-
# Imported W3C canvas failed tests
webkit.org/b/138676 imported/w3c/canvas/2d.pattern.image.null.html [ Failure ]
webkit.org/b/138676 imported/w3c/canvas/2d.pattern.image.incomplete.omitted.html [ Failure ]
@@ -509,6 +501,9 @@
imported/w3c/web-platform-tests/html/dom/elements/global-attributes/dir_auto-textarea-script-N-between-Rs.html [ ImageOnlyFailure ]
imported/w3c/web-platform-tests/html/dom/elements/global-attributes/style-01.html [ ImageOnlyFailure ]
+imported/w3c/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/010.html [ Failure Timeout ]
+imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html [ Failure ]
+
# Imported Mozilla SVG tests
webkit.org/b/5968 imported/mozilla/svg/linearGradient-basic-03.svg [ ImageOnlyFailure ]
webkit.org/b/32177 imported/mozilla/svg/as-image/background-image-rect-1png.html [ ImageOnlyFailure ]
@@ -1037,4 +1032,4 @@
webkit.org/b/156099 http/tests/security/anchor-download-allow-blob.html [ Failure ]
# <a download> does not honor cross-origin restrictions
-webkit.org/b/156100 http/tests/security/anchor-download-block-crossorigin.html [ Failure ]
\ No newline at end of file
+webkit.org/b/156100 http/tests/security/anchor-download-block-crossorigin.html [ Failure ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (199224 => 199225)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,3 +1,17 @@
+2016-04-08 Youenn Fablet <[email protected]>
+
+ Testharness-based tests that time out should be able to produce detailed output
+ https://bugs.webkit.org/show_bug.cgi?id=145313
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Rebasing tests that produce output after testharness timeout() is called.
+
+ * web-platform-tests/fetch/api/request/request-cache-expected.txt:
+ * web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01-expected.txt:
+ * web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01-expected.txt:
+ * web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change-expected.txt:
+
2016-03-31 Youenn Fablet <[email protected]>
[Fetch API] Add basic loading of resources for Workers
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt (199224 => 199225)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,2 +1,92 @@
-FAIL: Timed out waiting for notifyDone to be called
+Harness Error (TIMEOUT), message = null
+
+FAIL RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with Etag and stale response assert_array_equals: property 0, expected 200 but got 500
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with date and fresh response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates stale responses found in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates stale responses found in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates fresh responses found in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates fresh responses found in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with date and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and stale response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with date and stale response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and fresh response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and fresh response Test timed out
+
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01-expected.txt (199224 => 199225)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01-expected.txt 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-style-error-01-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,3 +1,6 @@
CONSOLE MESSAGE: Did not parse stylesheet at 'http://localhost:8800/common/css-red.txt' because non CSS MIME types are not allowed in strict mode.
-FAIL: Timed out waiting for notifyDone to be called
+Harness Error (TIMEOUT), message = null
+
+TIMEOUT Should get an error event for a text/plain response. Test timed out
+
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01-expected.txt (199224 => 199225)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01-expected.txt 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-style-element/style-error-01-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,3 +1,6 @@
CONSOLE MESSAGE: Did not parse stylesheet at 'http://localhost:8800/common/css-red.txt' because non CSS MIME types are not allowed in strict mode.
-FAIL: Timed out waiting for notifyDone to be called
+Harness Error (TIMEOUT), message = null
+
+TIMEOUT Should get an error event for a text/plain response. Test timed out
+
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change-expected.txt (199224 => 199225)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change-expected.txt 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,2 +1,47 @@
-FAIL: Timed out waiting for notifyDone to be called
+
+PASS img (no src), onload, narrow
+PASS img (no src), resize to wide
+FAIL img (empty src), onload, narrow assert_equals: expected "" but got "http://localhost:8800/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html?id=02edf22a-03f6-44d2-9b5e-417f19c0040d"
+PASS img (empty src), resize to wide
+PASS img (src only) broken image, onload, narrow
+PASS img (src only) broken image, resize to wide
+PASS img (src only) valid image, onload, narrow
+PASS img (src only) valid image, resize to wide
+PASS img (srcset 1 cand) broken image, onload, narrow
+PASS img (srcset 1 cand) broken image, resize to wide
+PASS img (srcset 1 cand) valid image, onload, narrow
+PASS img (srcset 1 cand) valid image, resize to wide
+PASS picture: source (max-width:500px) broken image, img broken image, onload, narrow
+PASS picture: source (max-width:500px) broken image, img broken image, resize to wide
+PASS picture: source (max-width:500px) broken image, img valid image, onload, narrow
+PASS picture: source (max-width:500px) broken image, img valid image, resize to wide
+PASS picture: source (max-width:500px) valid image, img broken image, onload, narrow
+PASS picture: source (max-width:500px) valid image, img broken image, resize to wide
+PASS picture: source (max-width:500px) valid image, img valid image, onload, narrow
+PASS picture: source (max-width:500px) valid image, img valid image, resize to wide
+PASS picture: same URL in source (max-width:500px) and img, onload, narrow
+FAIL picture: same URL in source (max-width:500px) and img, resize to wide assert_unreached: Got unexpected load event Reached unreachable code
+PASS img (no src), onload, wide
+PASS img (no src), resize to narrow
+FAIL img (empty src), onload, wide assert_equals: expected "" but got "http://localhost:8800/html/semantics/embedded-content/the-img-element/environment-changes/iframed.sub.html?id=f0ecd3f6-a6df-40ac-8630-4b09c34db93a"
+PASS img (empty src), resize to narrow
+PASS img (src only) broken image, onload, wide
+PASS img (src only) broken image, resize to narrow
+PASS img (src only) valid image, onload, wide
+PASS img (src only) valid image, resize to narrow
+PASS img (srcset 1 cand) broken image, onload, wide
+PASS img (srcset 1 cand) broken image, resize to narrow
+PASS img (srcset 1 cand) valid image, onload, wide
+PASS img (srcset 1 cand) valid image, resize to narrow
+PASS picture: source (max-width:500px) broken image, img broken image, onload, wide
+PASS picture: source (max-width:500px) broken image, img broken image, resize to narrow
+PASS picture: source (max-width:500px) broken image, img valid image, onload, wide
+PASS picture: source (max-width:500px) broken image, img valid image, resize to narrow
+PASS picture: source (max-width:500px) valid image, img broken image, onload, wide
+PASS picture: source (max-width:500px) valid image, img broken image, resize to narrow
+PASS picture: source (max-width:500px) valid image, img valid image, onload, wide
+PASS picture: source (max-width:500px) valid image, img valid image, resize to narrow
+PASS picture: same URL in source (max-width:500px) and img, onload, wide
+FAIL picture: same URL in source (max-width:500px) and img, resize to narrow assert_unreached: Got unexpected load event Reached unreachable code
+
Added: trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt (0 => 199225)
--- trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/imported/w3c/web-platform-tests/fetch/api/request/request-cache-expected.txt 2016-04-08 14:45:24 UTC (rev 199225)
@@ -0,0 +1,92 @@
+
+Harness Error (TIMEOUT), message = null
+
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode checks the cache for previously cached content and avoids going to the network if a fresh response exists with date and fresh response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates stale responses found in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates stale responses found in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates fresh responses found in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-cache" mode revalidates fresh responses found in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for stale responses with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and avoid revalidation for fresh responses with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response is not found with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" mode checks the cache for previously cached content and goes to the network if a cached response would vary with date and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and stale response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with date and stale response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with Etag and fresh response Test timed out
+TIMEOUT RequestCache "force-cache" stores the response in the cache if it goes to the network with date and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "no-store" mode does not store the response in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Modified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-None-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Unmodified-Since header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Match header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and stale response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with Etag and fresh response Test timed out
+TIMEOUT RequestCache "default" mode with an If-Range header is treated similarly to "no-store" with date and fresh response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and stale response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with date and stale response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with Etag and fresh response Test timed out
+TIMEOUT Responses with the "Cache-Control: no-store" header are not stored in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does not check the cache for previously cached content and goes to the network regardless with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache with date and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and stale response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with Etag and fresh response Test timed out
+TIMEOUT RequestCache "reload" mode does store the response in the cache even if a previous response is already stored with date and fresh response Test timed out
+
Modified: trunk/LayoutTests/resources/testharnessreport.js (199224 => 199225)
--- trunk/LayoutTests/resources/testharnessreport.js 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/LayoutTests/resources/testharnessreport.js 2016-04-08 14:45:24 UTC (rev 199225)
@@ -16,6 +16,11 @@
if (self.testRunner) {
testRunner.dumpAsText();
testRunner.waitUntilDone();
+ // Let's restrict calling testharness timeout() to wptserve tests for the moment.
+ // That will limit the impact to a small number of tests.
+ // The risk is that testharness timeout() might be called to late on slow bots to finish properly.
+ if (testRunner.timeout && location.port == 8800)
+ setTimeout(timeout, testRunner.timeout * 0.9);
}
// Function used to convert the test status code into
@@ -52,30 +57,28 @@
// Check harness_status. If it is not 0, tests did not
// execute correctly, output the error code and message
if(harness_status.status != 0){
- resultStr += "Harness Error. harness_status.status = " +
- harness_status.status +
- " , harness_status.message = " +
- harness_status.message;
+ resultStr += "Harness Error (" +
+ convertResult(harness_status.status) +
+ "), message = " +
+ harness_status.message + "\n\n";
}
- else {
- // Iterate through tests array and build string that contains
- // results for all tests
- for(var i=0; i<tests.length; i++){
- var message = (tests[i].message != null) ? tests[i].message : "";
- if (tests[i].status == 1 && !tests[i].dumpStack) {
- // Remove stack for failed tests for proper string comparison without file paths.
- // For a test to dump the stack set its dumpStack attribute to true.
- var stackIndex = message.indexOf("(stack:");
- if (stackIndex > 0) {
- message = message.substr(0, stackIndex);
- }
+ // Iterate through tests array and build string that contains
+ // results for all tests
+ for(var i = 0; i < tests.length; i++) {
+ var message = (tests[i].message != null) ? tests[i].message : "";
+ if (tests[i].status == 1 && !tests[i].dumpStack) {
+ // Remove stack for failed tests for proper string comparison without file paths.
+ // For a test to dump the stack set its dumpStack attribute to true.
+ var stackIndex = message.indexOf("(stack:");
+ if (stackIndex > 0) {
+ message = message.substr(0, stackIndex);
}
- resultStr += convertResult(tests[i].status) + " " +
- ( (tests[i].name!=null) ? tests[i].name : "" ) + " " +
- message +
- "\n";
- }
- }
+ }
+ resultStr += convertResult(tests[i].status) + " " +
+ ( (tests[i].name!=null) ? tests[i].name : "" ) + " " +
+ message +
+ "\n";
+ }
results.innerText = resultStr;
Modified: trunk/Tools/ChangeLog (199224 => 199225)
--- trunk/Tools/ChangeLog 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/Tools/ChangeLog 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1,3 +1,21 @@
+2016-04-08 Youenn Fablet <[email protected]>
+
+ Testharness-based tests that time out should be able to produce a detailed output
+ https://bugs.webkit.org/show_bug.cgi?id=145313
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Adding timeout readonly accessor to TestRunner for both WK1 and WK2.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (getTimeoutCallback): The js "timeout" property getter.
+ (TestRunner::staticValues): Adding "timeout" property to DumpRenderTree so that testRunner.timeout called from JS returns the timeout value.
+ * DumpRenderTree/TestRunner.h:
+ (TestRunner::timeout): Adding access to DRT m_timeout private value.
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: Adding timeout readonly attribute so that testRunner.timeout can be called from JS.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h: Adding DOM timeout getter to implement timeout IDL definition.
+ (WTR::TestRunner::timeout):
+
2016-04-07 Joseph Pecoraro <[email protected]>
stylebot should know about TestWebKitAPI FeatureDefines.xcconfig
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (199224 => 199225)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-04-08 14:45:24 UTC (rev 199225)
@@ -1766,6 +1766,12 @@
// Static Values
+static JSValueRef getTimeoutCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
+ return JSValueMakeNumber(context, controller->timeout());
+}
+
static JSValueRef getGlobalFlagCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
{
TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
@@ -2005,6 +2011,7 @@
JSStaticValue* TestRunner::staticValues()
{
static JSStaticValue staticValues[] = {
+ { "timeout", getTimeoutCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "globalFlag", getGlobalFlagCallback, setGlobalFlagCallback, kJSPropertyAttributeNone },
{ "webHistoryItemCount", getWebHistoryItemCountCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "secureEventInputIsEnabled", getSecureEventInputIsEnabledCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (199224 => 199225)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2016-04-08 14:45:24 UTC (rev 199225)
@@ -358,6 +358,7 @@
bool hasPendingWebNotificationClick() const { return m_hasPendingWebNotificationClick; }
void setCustomTimeout(int duration) { m_timeout = duration; }
+ double timeout() { return m_timeout; }
private:
TestRunner(const std::string& testURL, const std::string& expectedPixelHash);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (199224 => 199225)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2016-04-08 14:45:24 UTC (rev 199225)
@@ -32,6 +32,7 @@
void waitUntilDownloadFinished();
void notifyDone();
double preciseTime();
+ readonly attribute double timeout;
// Other dumping.
void dumpBackForwardList();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (199224 => 199225)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-04-08 09:04:17 UTC (rev 199224)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2016-04-08 14:45:24 UTC (rev 199225)
@@ -71,6 +71,7 @@
void waitUntilDone();
void notifyDone();
double preciseTime();
+ double timeout() { return m_timeout; }
// Other dumping.
void dumpBackForwardList() { m_shouldDumpBackForwardListsForAllWindows = true; }
