summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/worker/worker_uitest.cc3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-script-error-expected.txt3
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 065ae87..69906c4 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -268,7 +268,8 @@ TEST_F(WorkerTest, WorkerReplaceSelf) {
RunWorkerFastLayoutTest("worker-replace-self.html");
}
-TEST_F(WorkerTest, WorkerScriptError) {
+// http://crbug.com/38918
+TEST_F(WorkerTest, DISABLED_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 5c2c8c9..3f15859 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,12 +3,9 @@ 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