diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 09:05:59 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-23 09:05:59 +0000 |
| commit | 95c5d9faea4ef473e266dd572942ad76de24374a (patch) | |
| tree | 9b832d15e48e8f421fe730ab67e04ca0a937c1e8 | |
| parent | 22c4dca6be19c2ba594076864bff479486787cff (diff) | |
| download | chromium_src-95c5d9faea4ef473e266dd572942ad76de24374a.zip chromium_src-95c5d9faea4ef473e266dd572942ad76de24374a.tar.gz chromium_src-95c5d9faea4ef473e266dd572942ad76de24374a.tar.bz2 | |
Revert 42327 which caused test failures on Mac.
Revert "Update fast/workers/worker-script-error.html expectations in Chromium. Expected results of this test need update due to WebKit change http://trac.webkit.org/changeset/56329 and reenanle WorkerTest.WorkerScriptError"
TBR=pfeldman
Review URL: http://codereview.chromium.org/1174001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42330 0039d316-1c4b-4281-b951-d872f2087c98
| -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, 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 |