summaryrefslogtreecommitdiffstats
path: root/LayoutTests/storage/open-database-creation-callback.html
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-07-08 12:51:48 +0100
committerSteve Block <steveblock@google.com>2010-07-09 15:33:40 +0100
commitca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch)
treebb45155550ec013adc0ad10f4d7d354c6469b022 /LayoutTests/storage/open-database-creation-callback.html
parentd4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff)
downloadexternal_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip
external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz
external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'LayoutTests/storage/open-database-creation-callback.html')
-rw-r--r--LayoutTests/storage/open-database-creation-callback.html5
1 files changed, 3 insertions, 2 deletions
diff --git a/LayoutTests/storage/open-database-creation-callback.html b/LayoutTests/storage/open-database-creation-callback.html
index ac24942..081645c 100644
--- a/LayoutTests/storage/open-database-creation-callback.html
+++ b/LayoutTests/storage/open-database-creation-callback.html
@@ -26,7 +26,8 @@ function runTest()
// Open a new database with a creation callback, and make sure the creation callback is queued
var creationCallbackCalled1 = false;
- var db1 = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1,
+ var db1Name = "OpenDatabaseCreationCallback1" + (new Date()).getTime();
+ var db1 = openDatabase(db1Name, "1.0", "", 1,
function(db) {
creationCallbackCalled1 = true;
if (db.version != "") {
@@ -52,7 +53,7 @@ function runTest()
// a null handle and throw a INVALID_STATE_ERR exception.
var db1Fail = null;
try {
- db1Fail = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1);
+ db1Fail = openDatabase(db1Name, "1.0", "", 1);
log("This statement should not have been executed; an INVALID_STATE_ERR exception should've been thrown.");
finishTest();
} catch(err) {