Title: [135333] trunk/LayoutTests
- Revision
- 135333
- Author
- dgro...@chromium.org
- Date
- 2012-11-20 16:45:17 -0800 (Tue, 20 Nov 2012)
Log Message
IndexedDB: remove setVersion from pending-version-change-on-exit.html
https://bugs.webkit.org/show_bug.cgi?id=102457
Reviewed by Tony Chang.
This test doesn't work in single-process mode because of
http://wkb.ug/82776. We run it in content_shell in chromium.
* platform/chromium/TestExpectations:
* storage/indexeddb/pending-version-change-on-exit-expected.txt:
* storage/indexeddb/pending-version-change-on-exit.html:
* storage/indexeddb/resources/pending-version-change-on-exit.js:
(request.onblocked):
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (135332 => 135333)
--- trunk/LayoutTests/ChangeLog 2012-11-21 00:35:09 UTC (rev 135332)
+++ trunk/LayoutTests/ChangeLog 2012-11-21 00:45:17 UTC (rev 135333)
@@ -1,3 +1,19 @@
+2012-11-20 David Grogan <dgro...@chromium.org>
+
+ IndexedDB: remove setVersion from pending-version-change-on-exit.html
+ https://bugs.webkit.org/show_bug.cgi?id=102457
+
+ Reviewed by Tony Chang.
+
+ This test doesn't work in single-process mode because of
+ http://wkb.ug/82776. We run it in content_shell in chromium.
+
+ * platform/chromium/TestExpectations:
+ * storage/indexeddb/pending-version-change-on-exit-expected.txt:
+ * storage/indexeddb/pending-version-change-on-exit.html:
+ * storage/indexeddb/resources/pending-version-change-on-exit.js:
+ (request.onblocked):
+
2012-11-20 Bear Travis <betra...@adobe.com>
[CSS Exclusions] Support outside-shape value on shape-inside
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (135332 => 135333)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-21 00:35:09 UTC (rev 135332)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-21 00:45:17 UTC (rev 135333)
@@ -3363,6 +3363,7 @@
webkit.org/b/82776 storage/indexeddb/dont-commit-on-blocked.html
webkit.org/b/82776 storage/indexeddb/pending-version-change-stuck.html
webkit.org/b/82776 storage/indexeddb/pending-version-change-stuck-works-with-terminate.html
+webkit.org/b/82776 storage/indexeddb/pending-version-change-on-exit.html
webkit.org/b/ [ Win Release ] http/tests/xmlhttprequest/redirect-cross-origin-post.html [ Failure Pass ]
Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit-expected.txt (135332 => 135333)
--- trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit-expected.txt 2012-11-21 00:35:09 UTC (rev 135332)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit-expected.txt 2012-11-21 00:45:17 UTC (rev 135333)
@@ -1,11 +1,8 @@
-CONSOLE MESSAGE: The setVersion() method is non-standard and will be removed. Use the "upgradeneeded" event instead.
No crashes when there are event listeners in a worker on shutdown
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
-
PASS Didn't crash!
PASS successfullyParsed is true
Modified: trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit.html (135332 => 135333)
--- trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit.html 2012-11-21 00:35:09 UTC (rev 135332)
+++ trunk/LayoutTests/storage/indexeddb/pending-version-change-on-exit.html 2012-11-21 00:45:17 UTC (rev 135333)
@@ -8,34 +8,41 @@
description("No crashes when there are event listeners in a worker on shutdown");
-function test() {
- removeVendorPrefixes();
- if (self.location.search == "?second") {
- testPassed("Didn't crash!");
- finishJSTest();
- return;
- }
- dbname = "pending-version-change-on-exit";
- evalAndLog("request = indexedDB.open(\"" + dbname + "\")");
- request._onsuccess_ = startTheWorker;
- request._onblocked_ = unexpectedBlockedCallback;
- request._onerror_ = unexpectedErrorCallback;
+if (self.location.search == "?second") {
+ testPassed("Didn't crash!");
+ finishJSTest();
+} else {
+ evalAndLog("gotVersionChangeEvent = false");
+ indexedDBTest(prepareDatabase, startTheWorker);
}
+function prepareDatabase()
+{
+ debug("inside prepareDatabase");
+ preamble();
+ db = event.target.result;
+ db._onversionchange_ = function(e) {
+ evalAndLog("gotVersionChangeEvent = true");
+ debug("Got a version change event, e.oldVersion = " + e.oldVersion +
+ " e.newVersion = " + e.newVersion);
+ };
+}
+
function startTheWorker() {
- var worker = startWorker("resources/pending-version-change-on-exit.js");
+ var worker = startWorker("resources/pending-version-change-on-exit.js?" + encodeURIComponent(dbname));
realFinishJSTest = finishJSTest;
worker._onerror_ = function(e) {
testFailed(e.message);
realFinishJSTest();
};
finishJSTest = function() {
- self.location = self.location + "?second";
+ shouldBeTrue("gotVersionChangeEvent");
+ if (gotVersionChangeEvent)
+ self.location = self.location + "?second";
+ else
+ realFinishJSTest();
}
}
-
-test();
-
</script>
<script src=""
</body>
Modified: trunk/LayoutTests/storage/indexeddb/resources/pending-version-change-on-exit.js (135332 => 135333)
--- trunk/LayoutTests/storage/indexeddb/resources/pending-version-change-on-exit.js 2012-11-21 00:35:09 UTC (rev 135332)
+++ trunk/LayoutTests/storage/indexeddb/resources/pending-version-change-on-exit.js 2012-11-21 00:45:17 UTC (rev 135333)
@@ -3,19 +3,11 @@
importScripts('shared.js');
}
-function test() {
- removeVendorPrefixes();
- dbname = "pending-version-change-on-exit";
- evalAndLog("request = indexedDB.open(\"" + dbname + "\")");
- request._onsuccess_ = function(e) {
- db = request.result;
- evalAndLog("request = db.setVersion(1)");
- request._onsuccess_ = unexpectedSuccessCallback;
- request._onblocked_ = function() {
- testPassed("worker received blocked event.");
- finishJSTest();
- };
- };
-}
-
-test();
+removeVendorPrefixes();
+dbname = decodeURIComponent(self.location.search.substring(1));
+evalAndLog("request = indexedDB.open(\"" + dbname + "\", 2)");
+request._onupgradeneeded_ = unexpectedUpgradeNeededCallback;
+request._onblocked_ = function(e) {
+ testPassed("worker received blocked event.");
+ finishJSTest();
+};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
