From 8ea43b266a35b8da0cdea9ac2ec75a21ac4c33db Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Fri, 6 Dec 2013 16:40:49 +0000 Subject: [PATCH] Bug 947134 - Enable datastore/tests/test_certifiedApp.html for B2G Emulator, r=ehsan --- dom/datastore/tests/test_certifiedApp.html | 13 +++++++------ testing/mochitest/b2g-desktop.json | 2 -- testing/mochitest/b2g.json | 2 -- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dom/datastore/tests/test_certifiedApp.html b/dom/datastore/tests/test_certifiedApp.html index ffe5eba00d6..d1782ac4a99 100644 --- a/dom/datastore/tests/test_certifiedApp.html +++ b/dom/datastore/tests/test_certifiedApp.html @@ -66,11 +66,6 @@ } var tests = [ - function() { - ok(!("getDataStores" in navigator), "getDataStores should not exist"); - runTest(); - }, - // Permissions function() { SpecialPowers.pushPermissions( @@ -83,7 +78,13 @@ function() { SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true], ["dom.datastore.enabled", true], - ["dom.testing.ignore_ipc_principal", true]]}, runTest); + ["dom.testing.ignore_ipc_principal", true], + ["dom.testing.datastore_enabled_for_hosted_apps", false]]}, runTest); + }, + + function() { + ok(!("getDataStores" in navigator), "getDataStores should not exist"); + runTest(); }, function() { diff --git a/testing/mochitest/b2g-desktop.json b/testing/mochitest/b2g-desktop.json index 65af6db030b..b2d73839b6a 100644 --- a/testing/mochitest/b2g-desktop.json +++ b/testing/mochitest/b2g-desktop.json @@ -274,8 +274,6 @@ "dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"", "dom/browser-element/":"", - "dom/datastore/tests/test_certifiedApp.html":"", - "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126", "dom/file/test/test_request_readyState.html":"", "dom/file/test/test_stream_tracking.html":"", diff --git a/testing/mochitest/b2g.json b/testing/mochitest/b2g.json index fadd973042e..788ddc94c77 100644 --- a/testing/mochitest/b2g.json +++ b/testing/mochitest/b2g.json @@ -282,8 +282,6 @@ "dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"", "dom/browser-element/":"", - "dom/datastore/tests/test_certifiedApp.html":"", - "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126", "dom/file/test/test_request_readyState.html":"", "dom/file/test/test_stream_tracking.html":"",