diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-16 16:30:59 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-18 12:20:52 +0100 |
| commit | 0939fa36856168302a4558cf3cf2eb842dfe6c0a (patch) | |
| tree | aedee72f4aaaadcb401e6114f836202d13c5b392 /LayoutTests | |
| parent | 0915185a5f84521ded7e10197568db45599d6269 (diff) | |
| download | external_webkit-0939fa36856168302a4558cf3cf2eb842dfe6c0a.zip external_webkit-0939fa36856168302a4558cf3cf2eb842dfe6c0a.tar.gz external_webkit-0939fa36856168302a4558cf3cf2eb842dfe6c0a.tar.bz2 | |
Merge webkit.org at r61121: Update LayoutTest expectations.
Change-Id: I0730b5799c10408e17c2e60f95be21145e19dd18
Diffstat (limited to 'LayoutTests')
4 files changed, 23 insertions, 1 deletions
diff --git a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt new file mode 100644 index 0000000..5b4fd95 --- /dev/null +++ b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt @@ -0,0 +1,10 @@ +Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS No callbacks invoked +PASS successfullyParsed is true + +TEST COMPLETE + diff --git a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt new file mode 100644 index 0000000..77f5ce9 --- /dev/null +++ b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt @@ -0,0 +1,2 @@ +ALERT: unload-called +You should have seen one unload alert appear. diff --git a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt index eece14f..5734463 100644 --- a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt +++ b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-exception-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 22: Uncaught Error: Exception in success callback +CONSOLE MESSAGE: line 25: Uncaught Error: Exception in success callback Tests that when an exception is thrown in the success callback, the error callback is not invoked. Note that this test throws an exception which is not caught. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". diff --git a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt new file mode 100644 index 0000000..5b4fd95 --- /dev/null +++ b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt @@ -0,0 +1,10 @@ +Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS No callbacks invoked +PASS successfullyParsed is true + +TEST COMPLETE + |