summaryrefslogtreecommitdiffstats
path: root/LayoutTests
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-06-30 19:13:28 +0100
committerKristian Monsen <kristianm@google.com>2010-07-02 10:29:57 +0100
commit114830cf3874d82c64572150a188f6bbb3ea07de (patch)
treec6c77210246613ad63db5761ab8e52ac444281de /LayoutTests
parent970d7cef781d3c9acbeb98f8c7038531a42e0ab8 (diff)
downloadexternal_webkit-114830cf3874d82c64572150a188f6bbb3ea07de.zip
external_webkit-114830cf3874d82c64572150a188f6bbb3ea07de.tar.gz
external_webkit-114830cf3874d82c64572150a188f6bbb3ea07de.tar.bz2
Merge WebKit at r61871: Update expected layout test.
The initial chromium expected matches what we see on android so using that. http://trac.webkit.org/changeset/61352 Change-Id: Ie8dec2c650f45fe6c84884d800043b42897bc7bc
Diffstat (limited to 'LayoutTests')
-rw-r--r--LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt (renamed from LayoutTests/storage/sql-error-codes-expected.txt)5
1 files changed, 2 insertions, 3 deletions
diff --git a/LayoutTests/storage/sql-error-codes-expected.txt b/LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt
index 1a9caa7..58c60be 100644
--- a/LayoutTests/storage/sql-error-codes-expected.txt
+++ b/LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt
@@ -1,11 +1,10 @@
-CONSOLE MESSAGE: line 0: Exception thrown in transaction callback.
-CONSOLE MESSAGE: line 0: Cannot call toString() on this object.
+CONSOLE MESSAGE: line 37: Uncaught Exception thrown in transaction callback.
This test tests the error codes reported in exceptional situations.
PASS: expected and got error code UNKNOWN_ERR
PASS: expected and got error code UNKNOWN_ERR
PASS: expected and got error code SYNTAX_ERR
PASS: expected and got error code SYNTAX_ERR
-PASS: expected and got error code UNKNOWN_ERR
+The transaction in testBindParameterOfWrongType() was successful.
PASS: expected and got error code QUOTA_ERR
PASS: expected and got error code VERSION_ERR