diff options
-rw-r--r-- | chrome/worker/worker_uitest.cc | 3 | ||||
-rw-r--r-- | webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 69906c4..065ae87 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -268,8 +268,7 @@ TEST_F(WorkerTest, WorkerReplaceSelf) { RunWorkerFastLayoutTest("worker-replace-self.html"); } -// http://crbug.com/38918 -TEST_F(WorkerTest, DISABLED_WorkerScriptError) { +TEST_F(WorkerTest, WorkerScriptError) { RunWorkerFastLayoutTest("worker-script-error.html"); } diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt index 3f15859..5c2c8c9 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt @@ -3,9 +3,12 @@ Test Worker script error handling functionality. Should print a series of PASS m PASS: onerror invoked for a script that has invalid syntax. PASS: onerror invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 1. PASS: event listener invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 1. +PASS: onerror invoked for a script that has script error 'Uncaught ReferenceError: bar is not defined' at line 3. PASS: onerror invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 7. PASS: onerror invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 7. PASS: onerror invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 7. PASS: message received from WorkerGlobalScope.onerror: onerror invoked for a script that has script error 'Uncaught ReferenceError: foo is not defined' at line 7. DONE +PASS: onerror invoked for an exception in setTimeout callback. +DONE |