diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 23:28:10 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 23:28:10 +0000 |
| commit | b2b53cf095b0d200d0ada9d608e3ced12912e070 (patch) | |
| tree | 772ec6f8c6d3b793d47ba16a1966f3540a4b794b | |
| parent | e99836f6330b6518d2aa91a0be6ee656f7d6e3d1 (diff) | |
| download | chromium_src-b2b53cf095b0d200d0ada9d608e3ced12912e070.zip chromium_src-b2b53cf095b0d200d0ada9d608e3ced12912e070.tar.gz chromium_src-b2b53cf095b0d200d0ada9d608e3ced12912e070.tar.bz2 | |
LayoutTests\http\tests\security\frameNavigation\xss-DENIED-plugin-navigation.html is no longer timing out. Rebaseline to match win/linux expectations
BUG=none
TEST=green build
Review URL: http://codereview.chromium.org/345003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30279 0039d316-1c4b-4281-b951-d872f2087c98
2 files changed, 22 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt new file mode 100644 index 0000000..6d586cd --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation-expected.txt @@ -0,0 +1,21 @@ +CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to initiate a navigation change for frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe.html from frame with URL http://localhost:8000/security/frameNavigation/resources/frame-with-plugin-to-navigate.html. + +CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to initiate a navigation change for frame with URL http://127.0.0.1:8000/security/resources/cross-frame-iframe.html from frame with URL http://localhost:8000/security/frameNavigation/resources/frame-with-plugin-to-navigate.html. + + + +-------- +Frame: '<!--framePath //<!--frame0-->-->' +-------- + +Frame-with-plugin-to-navigate + +localhost + +Test PASSED + + +-------- +Frame: 'toNavigate' +-------- +Inner iframe. diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 6dbe72c..9ec2d54 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3001,7 +3001,6 @@ BUG20438 MAC : chrome/plugins/get-url-with-iframe-target-no-crash.html = TIMEOUT // Mac LayoutTest/http errors after removing blanket exception. BUG20748 MAC : LayoutTests/http/tests/plugins/npapi-response-headers.html = TIMEOUT -BUG20748 MAC : LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html = TIMEOUT BUG20748 MAC : LayoutTests/http/tests/plugins/get-url.html = TIMEOUT BUG20748 MAC : LayoutTests/http/tests/plugins/interrupted-get-url.html = TIMEOUT @@ -3303,6 +3302,7 @@ BUG_JORLOW LINUX : LayoutTests/transitions/background-transitions.html = TIMEOUT BUG_JORLOW LINUX : LayoutTests/transitions/multiple-background-size-transitions.html = TIMEOUT BUG25955 LINUX : LayoutTests/fast/forms/textarea-placeholder-set-value.html = PASS CRASH BUG_JORLOW WIN : LayoutTests/fast/parser/remove-node-stack.html = CRASH +BUG_JORLOW LINUX : LayoutTests/fast/multicol/column-rules-stacking.html = PASS FAIL // The following should be uncommented when the next line is no longer needed. // BUG24182 WIN LINUX DEBUG SLOW : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS |