aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-04-16 12:51:35 +0200
committerMs2ger <ms2ger@gmail.com>2015-04-16 18:58:53 +0200
commit2d49203b9c8f69cd169aafb87391e3b4ab82079c (patch)
tree2fd2d6551724a56f58bcc9d2e635717ae252d509 /tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
parent53d2432c90ab9ef171dfbef8e22ed3f58fcef8f0 (diff)
downloadservo-2d49203b9c8f69cd169aafb87391e3b4ab82079c.tar.gz
servo-2d49203b9c8f69cd169aafb87391e3b4ab82079c.zip
Update web-platform-tests to revision 000905d008db2538360020335bc2dbba16d322b5.
Diffstat (limited to 'tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js')
-rw-r--r--tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js b/tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
index 12f5eb5eacc..6dc2173b2e6 100644
--- a/tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
+++ b/tests/wpt/web-platform-tests/XMLHttpRequest/resources/xmlhttprequest-timeout-overrides.js
@@ -2,10 +2,10 @@ if (this.document === undefined)
importScripts("xmlhttprequest-timeout.js");
/*
Sets up three requests to a resource that will take 0.6 seconds to load:
-1) timeout first set to 1000ms, after 400ms timeout is set to 0, asserts load fires
-2) timeout first set to 1000ms, after 200ms timeout is set to 400, asserts load fires (race condition..?!?)
-3) timeout first set to 0, after 400ms it is set to 1000, asserts load fires
+1) timeout first set to TIME_NORMAL_LOAD, after TIME_REGULAR_TIMEOUT timeout is set to 0, asserts load fires
+2) timeout first set to TIME_NORMAL_LOAD, after TIME_DELAY timeout is set to TIME_REGULAR_TIMEOUT, asserts load fires (race condition..?!?)
+3) timeout first set to 0, after TIME_REGULAR_TIMEOUT it is set to TIME_REGULAR_TIMEOUT * 10, asserts load fires
*/
runTestRequests([ new RequestTracker(true, "timeout disabled after initially set", TIME_NORMAL_LOAD, TIME_REGULAR_TIMEOUT, 0),
- new RequestTracker(true, "timeout overrides load after a delay", TIME_NORMAL_LOAD, TIME_DELAY, TIME_REGULAR_TIMEOUT),
- new RequestTracker(true, "timeout enabled after initially disabled", 0, TIME_REGULAR_TIMEOUT, TIME_NORMAL_LOAD * 10) ]);
+ new RequestTracker(true, "timeout overrides load after a delay", TIME_NORMAL_LOAD, TIME_DELAY, TIME_REGULAR_TIMEOUT),
+ new RequestTracker(true, "timeout enabled after initially disabled", 0, TIME_REGULAR_TIMEOUT, TIME_NORMAL_LOAD * 10) ]);