summaryrefslogtreecommitdiffstats
path: root/LayoutTests/platform
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-26 09:40:59 -0700
committerSteve Block <steveblock@google.com>2010-04-27 17:09:14 +0100
commit3ff18e91319b06245b45f7b66cdb8ba9bb3b8859 (patch)
tree9cae91b3f89998a0ff0bfe0c757df4f81ff273c4 /LayoutTests/platform
parent5b71639dd156f6224bbb25ed257ac70374641f6b (diff)
downloadexternal_webkit-3ff18e91319b06245b45f7b66cdb8ba9bb3b8859.zip
external_webkit-3ff18e91319b06245b45f7b66cdb8ba9bb3b8859.tar.gz
external_webkit-3ff18e91319b06245b45f7b66cdb8ba9bb3b8859.tar.bz2
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
Update the V8 expected output to reflect updated test at r55033. Change-Id: I35363367af1ed5adf59e0c22e328256e3ac361f3
Diffstat (limited to 'LayoutTests/platform')
-rw-r--r--LayoutTests/platform/android-v8/storage/statement-error-callback-expected.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/LayoutTests/platform/android-v8/storage/statement-error-callback-expected.txt b/LayoutTests/platform/android-v8/storage/statement-error-callback-expected.txt
index 44eef7a..8d35ed9 100644
--- a/LayoutTests/platform/android-v8/storage/statement-error-callback-expected.txt
+++ b/LayoutTests/platform/android-v8/storage/statement-error-callback-expected.txt
@@ -1,5 +1,10 @@
-CONSOLE MESSAGE: line 54: Uncaught Exception in Statement error callback
-This test confirms that if the statement error callback returns true or throws an exception we do not execute any further statements in that transaction and instead execute the transaction error callback immediately.
+CONSOLE MESSAGE: line 75: Uncaught Exception in statement error callback
+This test confirms that a transaction is immediately rolled back if and only if a statement's error callback throws an exception, returns true, or doesn't return any value.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
+PASS - the transaction error callback was invoked.
PASS - the transaction error callback was invoked.
PASS - the transaction error callback was invoked.
Test Complete