[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[ukai at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit df7ebe2ab7d7d0da15c491df0e2625eb6e654e30
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 05:59:44 2010 +0000

    2010-02-04  Fumitoshi Ukai  <ukai at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            websocket/tests/close-on-unload.html failed on Mac Tiger
            https://bugs.webkit.org/show_bug.cgi?id=34563
    
            * platform/mac-tiger/Skipped: remove websocket/tests/close-on-unload*.html
            * websocket/tests/close-on-unload_wsh.py: use dict instead of set.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e64b446..0a84996 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-04  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        websocket/tests/close-on-unload.html failed on Mac Tiger
+        https://bugs.webkit.org/show_bug.cgi?id=34563
+
+        * platform/mac-tiger/Skipped: remove websocket/tests/close-on-unload*.html
+        * websocket/tests/close-on-unload_wsh.py: use dict instead of set.
+
 2010-01-27  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Alexey Proskuryakov and Darin Adler.
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index da1da38..48833be 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -106,8 +106,3 @@ svg/custom/stroke-width-click.svg
 # Fails on Mac
 # https://bugs.webkit.org/show_bug.cgi?id=34331
 http/tests/media/video-referer.html
-
-# Fails on Mac Tiger
-# https://bugs.webkit.org/show_bug.cgi?id=34563
-websocket/tests/close-on-unload.html
-websocket/tests/close-on-navigate-new-location.html
diff --git a/LayoutTests/websocket/tests/close-on-unload_wsh.py b/LayoutTests/websocket/tests/close-on-unload_wsh.py
index e8939fc..b4e641f 100644
--- a/LayoutTests/websocket/tests/close-on-unload_wsh.py
+++ b/LayoutTests/websocket/tests/close-on-unload_wsh.py
@@ -30,7 +30,8 @@
 
 from mod_pywebsocket import msgutil
 
-connections = set()
+# we don't use set() here, because python on mac tiger doesn't support it.
+connections = {}
 
 def web_socket_do_extra_handshake(request):
     pass  # Always accept.
@@ -38,7 +39,7 @@ def web_socket_do_extra_handshake(request):
 
 def web_socket_transfer_data(request):
     global connections
-    connections.add(request)
+    connections[request] = True
     socketName = None
     try:
         socketName = msgutil.receive_message(request)
@@ -48,7 +49,7 @@ def web_socket_transfer_data(request):
         socketName = socketName + ': receive next message'
     finally:
         # request is closed. notify this socketName to other web sockets.
-        connections.remove(request)
-        for ws in connections:
+        del connections[request]
+        for ws in connections.keys():
             msgutil.send_message(ws, socketName)
 

-- 
WebKit Debian packaging