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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4be32de4a128de089c76d7ce3bc6a8f311dbfa58
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 06:34:25 2010 +0000

    2010-07-15  Yuta Kitamura  <yutak at chromium.org>
    
            Reviewed by Kent Tamura.
    
            WebSocket: Put echo-challenge_wsh.py under workers/resources directory
            https://bugs.webkit.org/show_bug.cgi?id=42439
    
            I have realized that tests under workers/ directory should not depend on
            a pywebsocket script in a directory above.
    
            Putting *_wsh.py files under resources/ directory also benefits Chromium's
            worker test which only copies the contents under workers/resources directory
            when running WebSocket worker tests.
    
            * websocket/tests/workers/resources/echo-challenge_wsh.py: Copied from LayoutTests/websocket/tests/echo-challenge_wsh.py.
            * websocket/tests/workers/resources/worker-handshake-challenge-randomness.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a2d89c6..0d5f5b7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-15  Yuta Kitamura  <yutak at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        WebSocket: Put echo-challenge_wsh.py under workers/resources directory
+        https://bugs.webkit.org/show_bug.cgi?id=42439
+
+        I have realized that tests under workers/ directory should not depend on
+        a pywebsocket script in a directory above.
+
+        Putting *_wsh.py files under resources/ directory also benefits Chromium's
+        worker test which only copies the contents under workers/resources directory
+        when running WebSocket worker tests.
+
+        * websocket/tests/workers/resources/echo-challenge_wsh.py: Copied from LayoutTests/websocket/tests/echo-challenge_wsh.py.
+        * websocket/tests/workers/resources/worker-handshake-challenge-randomness.js:
+
 2010-07-15  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Unreviewed fix for chromium's expectation.
diff --git a/LayoutTests/websocket/tests/echo-challenge_wsh.py b/LayoutTests/websocket/tests/workers/resources/echo-challenge_wsh.py
similarity index 100%
copy from LayoutTests/websocket/tests/echo-challenge_wsh.py
copy to LayoutTests/websocket/tests/workers/resources/echo-challenge_wsh.py
diff --git a/LayoutTests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js b/LayoutTests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js
index 9bd42ac..e68ad95 100644
--- a/LayoutTests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js
+++ b/LayoutTests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js
@@ -14,7 +14,7 @@ function endTest()
 function runTests()
 {
     try {
-        var url = 'ws://localhost:8880/websocket/tests/echo-challenge';
+        var url = 'ws://localhost:8880/websocket/tests/workers/resources/echo-challenge';
         var ws1 = new WebSocket(url);
 
         ws1.onmessage = function(messageEvent)

-- 
WebKit Debian packaging