[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit d366cc42fa41a28f498ffb7bcfcffb5c5fd56d6d
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 03:09:37 2011 +0000

    2011-01-20  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Adam Barth.
    
            Disable the tests that start and stop the http server and web
            server, so that we don't have to worry about port collisions on
            the bots.
    
            https://bugs.webkit.org/show_bug.cgi?id=52861
    
            * Scripts/webkitpy/layout_tests/port/port_testcase.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76326 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3549991..b7165a1 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-20  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by Adam Barth.
+
+        Disable the tests that start and stop the http server and web
+        server, so that we don't have to worry about port collisions on
+        the bots.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52861
+
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+
+2011-01-20  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Eric Seidel.
 
         nrwt: rewrite google_chrome_unittest to use mock filesystem.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
index 30f3a56..c7846c3 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
@@ -50,7 +50,7 @@ class PortTestCase(unittest.TestCase):
             return
         self.assertTrue(len(port.driver_cmd_line()))
 
-    def test_http_server(self):
+    def disabled_test_http_server(self):
         port = self.make_port()
         if not port:
             return
@@ -82,7 +82,7 @@ class PortTestCase(unittest.TestCase):
 
         port._filesystem.remove(tmpfile)
 
-    def test_websocket_server(self):
+    def disabled_test_websocket_server(self):
         port = self.make_port()
         if not port:
             return

-- 
WebKit Debian packaging