Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/devicestorage. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:15 +0100
changeset 321148 05a67089ffd29615a457bde285b4bc1aef4e6e3f
parent 321147 c94607d8ac8796f68294a0ba5ad6b396a3ca860f
child 321149 3a97d4394764a8d9ef00cdb82e2d88e6170074fe
push id30919
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 20:28:20 +0000
treeherdermozilla-central@572249b2ffb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/devicestorage. r=RyanVM MozReview-Commit-ID: Cnl6QSVDfml
dom/devicestorage/test/chrome.ini
dom/devicestorage/test/mochitest.ini
dom/devicestorage/test/test_storageAreaListener.html
--- a/dom/devicestorage/test/chrome.ini
+++ b/dom/devicestorage/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || os == 'android')
+skip-if = os == 'android'
 
 [test_app_permissions.html]
 [test_fs_app_permissions.html]
--- a/dom/devicestorage/test/mochitest.ini
+++ b/dom/devicestorage/test/mochitest.ini
@@ -12,26 +12,24 @@ support-files = devicestorage_common.js
 # [test_diskSpace.html]
 # Possible race between the time we write a file, and the
 # time it takes to be reflected by statfs().  Bug # 791287
 [test_dotdot.html]
 [test_enumerate.html]
 [test_enumerateMultipleContinue.html]
 [test_enumerateOptions.html]
 [test_freeSpace.html]
+# FileSystem API tests start
+[test_fs_basic.html]
+[test_fs_createDirectory.html]
+[test_fs_get.html]
+[test_fs_getFilesAndDirectories.html]
+[test_fs_remove.html]
+[test_fs_createFile.html]
+[test_fs_appendFile.html]
+# FileSystem API tests end
 [test_lastModificationFilter.html]
 [test_overrideDir.html]
 [test_overwrite.html]
 [test_sanity.html]
 [test_usedSpace.html]
 [test_watch.html]
 [test_watchOther.html]
-[test_storageAreaListener.html]
-skip-if = (toolkit != 'gonk')
-
-# FileSystem API tests
-[test_fs_basic.html]
-[test_fs_createDirectory.html]
-[test_fs_get.html]
-[test_fs_getFilesAndDirectories.html]
-[test_fs_remove.html]
-[test_fs_createFile.html]
-[test_fs_appendFile.html]
deleted file mode 100644
--- a/dom/devicestorage/test/test_storageAreaListener.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-Any copyright is dedicated to the Public Domain.
-http://creativecommons.org/publicdomain/zero/1.0/
--->
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=1126694
--->
-<head>
-<title>Test for device storage area listener API </title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-<script type="text/javascript" src="devicestorage_common.js"></script>
-
-<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1126694">Mozilla Bug 1126684</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-	devicestorage_setup(function () {
-
-	var XPCOMUtils = SpecialPowers.Cu.import("resource://gre/modules/XPCOMUtils.jsm").XPCOMUtils;
-	var Ci = SpecialPowers.Ci;
-
-	var volumeService = SpecialPowers.Cc["@mozilla.org/telephony/volume-service;1"].getService(Ci.nsIVolumeService);
-
-	var volName = "dummy-volume";
-	var mountPoint = "/data/local/tmp/dummy";
-
-	var storage;
-	if (navigator.deviceStorageAreaListener) {
-		ok (true, "got deviceStorageAreaListener")
-	}
-
-	navigator.deviceStorageAreaListener.addEventListener("storageareachanged", function (e) {
-		info("got storageareachanged event name:" + e.storageName + "\n");
-		info("operation:" + e.operation + "\n");
-
-		if (e.operation == "added") {
-			storage = navigator.getDeviceStorageByNameAndType(e.storageName, "sdcard");
-			ok (storage, "got storage");
-			volumeService.removeFakeVolume(volName);
-		}
-		else if (e.operation == "removed") {
-			ok (true, "got removal event");
-			SimpleTest.finish();
-		}
-	});
-
-	storage = navigator.getDeviceStorageByNameAndType(volName, "sdcard");
-	ok(!storage, "storage area doesn't exist");
-
-	volumeService.createFakeVolume(volName, mountPoint);
-
-        });
-
-</script>
-</pre>
-</body>
-</html>