aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-27 08:47:23 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-27 08:47:23 -0600
commit2d704312685249c20fa71d983094fc4e689bc5ff (patch)
treecb6a3ce849abf99614909d311d488ee11a6b872e
parent1384ff5e9f4d98630d4ec1206049c8fb6d96f187 (diff)
parent432756135050479fc89b4d21d18a176ee815277e (diff)
downloadservo-2d704312685249c20fa71d983094fc4e689bc5ff.tar.gz
servo-2d704312685249c20fa71d983094fc4e689bc5ff.zip
Auto merge of #7405 - Ms2ger:quota, r=jdm
Disable storage_session_setitem_quotaexceedederr.html. It fails intermittently due to OOM because we don't implement the quota check. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7405) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini3
-rw-r--r--tests/wpt/metadata/webstorage/storage_session_setitem_quotaexceedederr.html.ini2
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini b/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini
index dcfe5d1a8ce..a9a0f773b81 100644
--- a/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini
+++ b/tests/wpt/metadata/webstorage/storage_local_setitem_quotaexceedederr.html.ini
@@ -1,4 +1,3 @@
[storage_local_setitem_quotaexceedederr.html]
type: testharness
- disabled: intermittently crashes instead of times out in release
- expected: TIMEOUT
+ disabled: https://github.com/servo/servo/issues/6734
diff --git a/tests/wpt/metadata/webstorage/storage_session_setitem_quotaexceedederr.html.ini b/tests/wpt/metadata/webstorage/storage_session_setitem_quotaexceedederr.html.ini
index ab2b15baeb9..098bc8405f8 100644
--- a/tests/wpt/metadata/webstorage/storage_session_setitem_quotaexceedederr.html.ini
+++ b/tests/wpt/metadata/webstorage/storage_session_setitem_quotaexceedederr.html.ini
@@ -1,3 +1,3 @@
[storage_session_setitem_quotaexceedederr.html]
type: testharness
- expected: TIMEOUT
+ disabled: https://github.com/servo/servo/issues/6734