Get rid of storage tracker layout tests
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Jan 2015 19:57:00 +0000 (19:57 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Jan 2015 19:57:00 +0000 (19:57 +0000)
https://bugs.webkit.org/show_bug.cgi?id=140044

Reviewed by Darin Adler.

These tests are very flaky since they expect to be run in order. Furthermore, they were testing a WebKit Mac SPI
that is pretty hard to test reliably, due to its "design". It's not worth trying to make these tests work
or to rewrite them in Objective-C (which would be the right thing to do), so just get rid of them.

* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:
* platform/ios-simulator-wk2/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
* platform/wk2/TestExpectations:
* storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-2-create-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt: Removed.
* storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177867 268f45cc-cd09-0410-ab3c-d52691b4dbfc

22 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/ios-simulator-wk2/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
LayoutTests/platform/wk2/TestExpectations
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt [deleted file]
LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html [deleted file]

index 51e2914..cbd774d 100644 (file)
@@ -1,3 +1,36 @@
+2015-01-02  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of storage tracker layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=140044
+
+        Reviewed by Darin Adler.
+
+        These tests are very flaky since they expect to be run in order. Furthermore, they were testing a WebKit Mac SPI
+        that is pretty hard to test reliably, due to its "design". It's not worth trying to make these tests work
+        or to rewrite them in Objective-C (which would be the right thing to do), so just get rid of them.
+
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+        * platform/ios-simulator-wk2/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * platform/wincairo/TestExpectations:
+        * platform/wk2/TestExpectations:
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-2-create-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt: Removed.
+        * storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html: Removed.
+
 2015-01-02  Alexey Proskuryakov  <ap@apple.com>
 
         js/dom/Promise.html is flaky
index 79cc07c..2d47afb 100644 (file)
@@ -1071,9 +1071,6 @@ webkit.org/b/106507 storage/storagequota-request-quota.html
 webkit.org/b/106507 fast/workers/shared-worker-storagequota-query-usage.html
 webkit.org/b/106507 fast/workers/worker-storagequota-query-usage.html
 
-# EFL's LayoutTestController does not implement originsWithLocalStorage.
-Bug(EFL) storage/domstorage/localstorage/storagetracker
-
 # JSC does not support setIsolatedWorldSecurityOrigin.
 webkit.org/b/61540 http/tests/security/isolatedWorld/cross-origin-xhr.html [ Timeout ]
 
index fe6ae70..027c004 100644 (file)
@@ -157,9 +157,6 @@ http/tests/notifications/legacy/events.html
 http/tests/notifications/legacy/show.html
 http/tests/notifications/legacy/double-show.html
 
-# StorageTracker is not enabled.
-webkit.org/b/98933 storage/domstorage/localstorage/storagetracker [ Skip ]
-
 # Datalist is not yet enabled.
 webkit.org/b/98934 fast/forms/datalist [ Skip ]
 
index c994606..208af25 100644 (file)
@@ -184,16 +184,9 @@ jquery/manipulation.html
 
 # storage tests that time out:
 storage/domstorage/localstorage/close-idle-localstorage-databases-immediately.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html
 storage/domstorage/storage-close-database-on-idle.html
 
 # storage tests that fail:
-storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html [ Failure ]
 storage/websql/sql-error-codes.html [ Failure ]
 
 # ietestcenter tests that fail:
index 7bed723..c6294d4 100644 (file)
@@ -338,14 +338,6 @@ webkit.org/b/82762 fast/animation/request-animation-frame-during-modal.html
 
 webkit.org/b/82805 fast/canvas/webgl/framebuffer-object-attachment.html [ Failure ]
 
-webkit.org/b/82817 storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html [ Pass Failure ]
-webkit.org/b/82817 storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html [ Pass Failure ]
-webkit.org/b/82817 storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html [ Pass Failure ]
-webkit.org/b/57799 storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html [ Pass Failure ]
-webkit.org/b/57799 storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html [ Pass Failure ]
-webkit.org/b/82817 storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html [ Pass Failure ]
-webkit.org/b/82817 storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html [ Pass Failure ]
-
 webkit.org/b/82972 plugins/keyboard-events.html [ Pass Failure ]
 webkit.org/b/82972 plugins/layout-in-beforeload-listener-affects-plugin-loading.html [ Pass Failure ]
 webkit.org/b/82972 plugins/mouse-events-fixedpos.html [ Pass Failure ]
index 9ef5f14..74d94c2 100644 (file)
@@ -1068,9 +1068,6 @@ http/tests/security/no-indexeddb-from-sandbox.html
 crypto/subtle/rsa-indexeddb.html
 inspector-protocol/indexeddb/basics.html
 
-# StorageTracker is not enabled.
-storage/domstorage/localstorage/storagetracker
-
 # This port doesn't support DeviceMotion or DeviceOrientation.
 fast/dom/DeviceMotion
 fast/dom/DeviceOrientation
index ac25c7d..cb36e3c 100644 (file)
@@ -1575,9 +1575,6 @@ http/tests/security/cross-origin-worker-indexeddb.html
 http/tests/security/no-indexeddb-from-sandbox.html
 crypto/subtle/rsa-indexeddb.html
 
-# StorageTracker is not enabled.
-storage/domstorage/localstorage/storagetracker
-
 # This port doesn't support DeviceMotion or DeviceOrientation.
 fast/dom/DeviceMotion
 fast/dom/DeviceOrientation
index 3da6768..0e350dc 100644 (file)
@@ -317,15 +317,6 @@ java
 compositing/plugins/invalidate_rect.html
 plugins/windowless_plugin_paint_test.html
 
-# WebKitTestRunner needs testRunner.originsWithLocalStorage
-storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html
-storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html
-
 # WebKitTestRunner needs eventSender.contextClick()
 # https://bugs.webkit.org/show_bug.cgi?id=86881
 editing/selection/context-menu-text-selection.html
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare-expected.txt
deleted file mode 100644 (file)
index 5cca432..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Prepare for StorageTracker tests by ensuring that every origin with local storage is deleted.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-This test should have no visible output on success.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-1-prepare.html
deleted file mode 100644 (file)
index 61ce1c6..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Prepare for StorageTracker tests by ensuring that every origin with local storage is deleted.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-    
-    debug("This test should have no visible output on success.");
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        testRunner.observeStorageTrackerNotifications(1);
-        testRunner.deleteAllLocalStorage();
-    } else {
-        finishTest();
-    }
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create-expected.txt
deleted file mode 100644 (file)
index 5ae4ee1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Origin identifier: 'file__0'
-StorageTracker test - write local storage for this origin. Should be called after origins-prepare.html.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-2-create.html
deleted file mode 100644 (file)
index 20357b1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("StorageTracker test - write local storage for this origin. Should be called after origins-prepare.html.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-    
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        // An origin already exists so we can exit.
-        testFailed("An origin already existed with local storage.");
-        testRunner.notifyDone();
-    } else {
-        testRunner.syncLocalStorage();
-        
-        localStorage.someData = 'writeme';
-        // LayoutTestController's notifyDone will be called after the origin change notification comes in.
-        testRunner.observeStorageTrackerNotifications(1);
-    }
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all-expected.txt
deleted file mode 100644 (file)
index 4ae49c5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test API to view origins that have local storage and to delete local storage by origin.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.originsWithLocalStorage().toString() is "file__0"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-3-delete-all.html
deleted file mode 100644 (file)
index 200ced8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test API to view origins that have local storage and to delete local storage by origin.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
-        // We're just going to delete the existing origin, so we'll get one origin change notification.
-        testRunner.observeStorageTrackerNotifications(1);
-        testRunner.deleteAllLocalStorage();
-    } else {
-        testRunner.notifyDone();
-        testFailed("Ran with no origins with local storage");
-    }
-
-    // At this point, we're guaranteed to have one origin with local storage.
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create-expected.txt
deleted file mode 100644 (file)
index ab6ea2b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Origin identifier: 'file__0'
-StorageTracker test - write local storage for this origin. Should be called after storage-tracker-3-delete-all.html.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-This test should have no visible output on success.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-4-create.html
deleted file mode 100644 (file)
index 707bb6c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("StorageTracker test - write local storage for this origin. Should be called after storage-tracker-3-delete-all.html.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-    
-    debug("This test should have no visible output on success.");
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        // An origin already exists so we can exit.
-        testFailed("An origin already existed with local storage.");
-        testRunner.notifyDone();
-    } else {
-        testRunner.syncLocalStorage();
-        localStorage.someOtherData = 'writemeMore';
-        testRunner.observeStorageTrackerNotifications(1);
-    }
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one-expected.txt
deleted file mode 100644 (file)
index 4ae49c5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test API to view origins that have local storage and to delete local storage by origin.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.originsWithLocalStorage().toString() is "file__0"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-5-delete-one.html
deleted file mode 100644 (file)
index d5d7b4c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test API to view origins that have local storage and to delete local storage by origin.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
-        // We're just going to delete the existing origin, so we'll get one origin change notification.
-        testRunner.observeStorageTrackerNotifications(1);
-        // At this point, we're guaranteed to have one origin with local storage.
-        testRunner.deleteLocalStorageForOrigin("file://");
-    } else {
-        testFailed("Ran with no origins with local storage.");
-        testRunner.notifyDone();
-    }
-
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create-expected.txt
deleted file mode 100644 (file)
index cabaf2d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Origin identifier: 'file__0'
-StorageTracker test - write local storage for this origin. Should be called after storage-tracker-5-delete-one.html.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-This test should have no visible output on success.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-6-create.html
deleted file mode 100644 (file)
index 73ca332..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("StorageTracker test - write local storage for this origin. Should be called after storage-tracker-5-delete-one.html.");
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-    
-function finishTest() {
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-    
-    debug("This test should have no visible output on success.");
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        // An origin already exists so we can exit.
-        testFailed("An origin already existed with local storage.");
-        testRunner.notifyDone();
-    } else {
-        testRunner.syncLocalStorage();
-        localStorage.someOtherData = 'writemeMore';
-        testRunner.observeStorageTrackerNotifications(1);
-    }
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage-expected.txt
deleted file mode 100644 (file)
index 0cd145a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Test API that reports local storage disk usage by origin. NOTE: this test DEPENDS on storage-tracker-6-create.html to create local storage for the 'file://' origin. If this test runs in a separate DRT instance from storage-tracker-6-create.html, it may FAIL if there is no local storage!
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS testRunner.originsWithLocalStorage().toString() is "file__0"
-PASS testRunner.localStorageDiskUsageForOrigin('file://') > 6100 is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html b/LayoutTests/storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html
deleted file mode 100644 (file)
index 2b75dcd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script>
-description("Test API that reports local storage disk usage by origin. NOTE: this test DEPENDS on storage-tracker-6-create.html to create local storage for the 'file://' origin. If this test runs in a separate DRT instance from storage-tracker-6-create.html, it may FAIL if there is no local storage!");
-
-function test()
-{
-    if (!window.localStorage) {
-        testFailed("localStorage DOES NOT exist");
-        return;
-    }
-
-    if (testRunner.originsWithLocalStorage().length > 0) {
-        shouldBeEqualToString("testRunner.originsWithLocalStorage().toString()", "file__0");
-        shouldBeTrue("testRunner.localStorageDiskUsageForOrigin('file://') > 6100");
-    } else {
-        testFailed("Ran with no origins with local storage.");
-    }
-
-}
-
-test();        
-
-isSuccessfullyParsed();
-</script>
-</body>
-</html>