aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMukilan Thiyagarajan <mukilanthiagarajan@gmail.com>2014-11-04 08:20:46 +0530
committerMukilan Thiyagarajan <mukilanthiagarajan@gmail.com>2014-11-04 08:20:46 +0530
commit9bafd5f28ae3351a7f94b29ed95d93eb1c4797ce (patch)
tree9f99104368242bcd49d9cbe2369319e2bb970525
parent7435db26ac93de57c24a5c29693282cd7bbf9f6c (diff)
downloadservo-9bafd5f28ae3351a7f94b29ed95d93eb1c4797ce.tar.gz
servo-9bafd5f28ae3351a7f94b29ed95d93eb1c4797ce.zip
Update expectations for wpt tests under /XMLHttpRequest
Following tests are re-enabled: * /XMLHttpRequest/send-network-error-async-events.sub.htm * /XMLHttpRequest/send-network-error-sync-events.sub.htm * /XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html * /XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html * /XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html * /XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html Following tests are disabled: * /XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html The following tests are expected to timeout since window.postMessage is not implemented yet: * /XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html * /XMLHttpRequest/xmlhttprequest-timeout-overrides.html * /XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/data-uri.htm.ini21
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini6
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/send-network-error-sync-events.sub.htm.ini5
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini2
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini2
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini2
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini3
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini3
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini5
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini3
-rw-r--r--tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini4
11 files changed, 17 insertions, 39 deletions
diff --git a/tests/wpt/metadata/XMLHttpRequest/data-uri.htm.ini b/tests/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
index 86f52974368..6d4729e7bd4 100644
--- a/tests/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
@@ -1,33 +1,32 @@
[data-uri.htm]
type: testharness
- expected: TIMEOUT
[XHR method GET with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method GET with charset text/plain (base64)]
- expected: TIMEOUT
+ expected: FAIL
[XHR method GET with charset text/html]
- expected: TIMEOUT
+ expected: FAIL
[XHR method GET with charset image/png]
- expected: TIMEOUT
+ expected: FAIL
[XHR method POST with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method PUT with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method DELETE with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method HEAD with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method UNICORN with charset text/plain]
- expected: TIMEOUT
+ expected: FAIL
[XHR method GET with charset text/html;charset=UTF-8]
- expected: TIMEOUT
+ expected: FAIL
diff --git a/tests/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini
deleted file mode 100644
index 023a121a237..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[send-network-error-async-events.sub.htm]
- type: testharness
- expected: TIMEOUT
- [XmlHttpRequest: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset)]
- expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/XMLHttpRequest/send-network-error-sync-events.sub.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-network-error-sync-events.sub.htm.ini
deleted file mode 100644
index d7a4bd92f93..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/send-network-error-sync-events.sub.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[send-network-error-sync-events.sub.htm]
- type: testharness
- [XmlHttpRequest: The send() method: Throw a "throw an "NetworkError" exception when Network error happens (synchronous flag is set)]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini
index 6665862bc4a..a8bb968e3c2 100644
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-abortedonmain.html.ini
@@ -1,3 +1,3 @@
[xmlhttprequest-timeout-abortedonmain.html]
type: testharness
- expected: CRASH
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini
index 1b57172bf86..e767ee33d53 100644
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overrides.html.ini
@@ -1,3 +1,3 @@
[xmlhttprequest-timeout-overrides.html]
type: testharness
- expected: CRASH
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini
index e2d7d3d215e..d957c5c0fc9 100644
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-overridesexpires.html.ini
@@ -1,3 +1,3 @@
[xmlhttprequest-timeout-overridesexpires.html]
type: testharness
- expected: CRASH
+ expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini
deleted file mode 100644
index ff19591c2a5..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-aborted.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[xmlhttprequest-timeout-worker-aborted.html]
- type: testharness
- expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini
deleted file mode 100644
index bf389247205..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overrides.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[xmlhttprequest-timeout-worker-overrides.html]
- type: testharness
- expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini
index aeacaaee729..e3890908396 100644
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-overridesexpires.html.ini
@@ -1,3 +1,6 @@
[xmlhttprequest-timeout-worker-overridesexpires.html]
type: testharness
- expected: TIMEOUT
+
+ [Timeout test: timeout set to expired value before load fires, original timeout at 1000, reset at 400 to 300]
+ disabled: racy test
+
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini
deleted file mode 100644
index 746c7d262dc..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-simple.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[xmlhttprequest-timeout-worker-simple.html]
- type: testharness
- expected: TIMEOUT
diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini
deleted file mode 100644
index a4730828426..00000000000
--- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-timeout-worker-twice.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[xmlhttprequest-timeout-worker-twice.html]
- type: testharness
- disabled: xhr issue #3630
- expected: TIMEOUT