[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[dimich at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0dc2fb9e7c4539c2d07f86c01bcd81ff7f52302d
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 23:28:16 2010 +0000

    [Chromium] Unreviewed, updated expectations for a test fixed on Chromium side.
    http://code.google.com/p/chromium/issues/detail?id=61655
    
    * platform/chromium-mac/security/block-test-no-port-expected.txt: Added.
    * platform/chromium-win/security/block-test-no-port-expected.txt: Added.
    * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ff4851a..1ba2aaf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-29  Dmitry Titov  <dimich at chromium.org>
+
+        [Chromium] Unreviewed, updated expectations for a test fixed on Chromium side.
+        http://code.google.com/p/chromium/issues/detail?id=61655
+
+        * platform/chromium-mac/security/block-test-no-port-expected.txt: Added.
+        * platform/chromium-win/security/block-test-no-port-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+
 2010-11-29  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt b/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt
new file mode 100644
index 0000000..1cd484b
--- /dev/null
+++ b/LayoutTests/platform/chromium-mac/security/block-test-no-port-expected.txt
@@ -0,0 +1,4 @@
+http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html, http method GET> redirectResponse (null)
+<unknown> - didFinishLoading
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
+This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
diff --git a/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt b/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt
new file mode 100644
index 0000000..1cd484b
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/security/block-test-no-port-expected.txt
@@ -0,0 +1,4 @@
+http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test-no-port.html, http method GET> redirectResponse (null)
+<unknown> - didFinishLoading
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
+This test attempts to change the src of an IMG tag to a blocked IP with no port to confirm that WebKit returns the correct error for it - blocked instead of cannot find. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree. In addition, on some systems the results may depend on the behavior of the proxy.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index f9d496d..f859d47 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3097,9 +3097,7 @@ BUG61406 WIN LINUX : svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequ
 BUG32153and61406 WIN LINUX : svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html = IMAGE
 
 // Flaky: fails about 5% of the time.
-//BUG31342 WIN RELEASE : security/block-test-no-port.html = TEXT PASS
-// Now fails all the time on Win and Linux, see bug for details.
-BUG61655 WIN LINUX : security/block-test-no-port.html = TEXT
+BUG31342 WIN RELEASE : security/block-test-no-port.html = TEXT PASS
 
 // Fails because of http://trac.webkit.org/changeset/71268
 BUG61824 : canvas/philip/tests/2d.pattern.image.string.html = TEXT
@@ -3159,8 +3157,6 @@ BUGWK49477 WIN LINUX : fast/canvas/canvas-arc-360-winding.html = TEXT
 BUG63460 : editing/selection/context-menu-on-text.html = TEXT
 BUG63460 : editing/spelling/context-menu-suggestions.html = TEXT
 
-BUG61655 MAC : security/block-test-no-port.html = TEXT
-
 BUG_LEVIN : fast/dom/StyleSheet/gc-inline-style-cssvalues.html = TEXT
 BUG_LEVIN : fast/dom/StyleSheet/gc-styleheet-wrapper.xhtml = TEXT
 

-- 
WebKit Debian packaging