[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[yutak at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 4f2efaaa733399e6a144d94970fc5f070b5e68f5
Author: yutak at chromium.org <yutak at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 06:45:46 2010 +0000

    2010-12-20  Yuta Kitamura  <yutak at chromium.org>
    
            Unreviewed.
    
            Update test expectations of http/tests/inspector/console-websocket-error.html
            on Mac, and add the test to GTK's Skipped list.
    
            * platform/gtk/Skipped:
            * platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt: Copied from LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt.
            * platform/mac/http/tests/inspector/console-websocket-error-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 09cc803..abd2298 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-12-20  Yuta Kitamura  <yutak at chromium.org>
 
+        Unreviewed.
+
+        Update test expectations of http/tests/inspector/console-websocket-error.html
+        on Mac, and add the test to GTK's Skipped list.
+
+        * platform/gtk/Skipped:
+        * platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt: Copied from LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt.
+        * platform/mac/http/tests/inspector/console-websocket-error-expected.txt:
+
+2010-12-20  Yuta Kitamura  <yutak at chromium.org>
+
         Reviewed by Alexey Proskuryakov.
 
         WebSocket errors should be logged to console
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index d9c39c7..9fcd73f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5581,3 +5581,6 @@ fast/events/pageshow-pagehide-on-back-cached-with-frames.html
 # These require DRT setSerializeHTTPLoads implementation to be reliable.
 http/tests/local/link-stylesheet-load-order.html
 http/tests/local/link-stylesheet-load-order-preload.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=51380
+http/tests/inspector/console-websocket-error.html
diff --git a/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt b/LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
copy to LayoutTests/platform/mac-leopard/http/tests/inspector/console-websocket-error-expected.txt
diff --git a/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt b/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
index 8399386..07d1e04 100644
--- a/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
+++ b/LayoutTests/platform/mac/http/tests/inspector/console-websocket-error-expected.txt
@@ -5,7 +5,7 @@ CONSOLE MESSAGE: line 55: testSSLCertificate: onclose is called.
 WebSocket's network errors should be logged to console.
 
 console-websocket-error.html:27testDNSLookup: Test started.
-ws://nonexistent.domain.invalid:80/WebSocket network error: Operation could not be completed. (kCFErrorDomainCFNetwork error 2.)
+ws://nonexistent.domain.invalid:80/WebSocket network error: The operation couldn’t be completed. (kCFErrorDomainCFNetwork error 2.)
 console-websocket-error.html:36testDNSLookup: onclose is called.
 console-websocket-error.html:43testSSLCertificate: Test started.
 wss://127.0.0.1:8443/WebSocket network error: OSStatus Error -9812: valid cert chain, untrusted root 

-- 
WebKit Debian packaging