From 114830cf3874d82c64572150a188f6bbb3ea07de Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 30 Jun 2010 19:13:28 +0100 Subject: 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 --- .../platform/android-v8/storage/sql-error-codes-expected.txt | 10 ++++++++++ LayoutTests/storage/sql-error-codes-expected.txt | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt delete mode 100644 LayoutTests/storage/sql-error-codes-expected.txt (limited to 'LayoutTests') diff --git a/LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt b/LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt new file mode 100644 index 0000000..58c60be --- /dev/null +++ b/LayoutTests/platform/android-v8/storage/sql-error-codes-expected.txt @@ -0,0 +1,10 @@ +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 +The transaction in testBindParameterOfWrongType() was successful. +PASS: expected and got error code QUOTA_ERR +PASS: expected and got error code VERSION_ERR + diff --git a/LayoutTests/storage/sql-error-codes-expected.txt b/LayoutTests/storage/sql-error-codes-expected.txt deleted file mode 100644 index 1a9caa7..0000000 --- a/LayoutTests/storage/sql-error-codes-expected.txt +++ /dev/null @@ -1,11 +0,0 @@ -CONSOLE MESSAGE: line 0: Exception thrown in transaction callback. -CONSOLE MESSAGE: line 0: Cannot call toString() on this object. -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 -PASS: expected and got error code QUOTA_ERR -PASS: expected and got error code VERSION_ERR - -- cgit v1.1