auto merge of #3906 : mbrubeck/servo/disable-wpt-xhr, r=jdm

Due to w3c/web-platform-tests#1362
This commit is contained in:
bors-servo 2014-11-05 18:18:39 -07:00
commit f09c314420
3 changed files with 8 additions and 1 deletions

View file

@ -0,0 +1,4 @@
[xmlhttprequest-timeout-worker-overrides.html]
type: testharness
[Timeout test: timeout enabled after initially disabled, original timeout at 0, reset at 400 to 1000]
disabled: flaky - https://github.com/w3c/web-platform-tests/issues/1362

View file

@ -2,4 +2,3 @@
type: testharness type: testharness
[Timeout test: timeout set to expired value before load fires, original timeout at 1000, reset at 400 to 300] [Timeout test: timeout set to expired value before load fires, original timeout at 1000, reset at 400 to 300]
disabled: racy test disabled: racy test

View file

@ -0,0 +1,4 @@
[xmlhttprequest-timeout-worker-twice.html]
type: testharness
[Timeout test: load fires normally with same timeout set twice, original timeout at 1000, reset at 400 to 1000]
disabled: flaky