Changeset 94483 in webkit

Timestamp:

Sep 3, 2011, 12:45:30 AM (14 years ago)

Author:

rniwa@webkit.org

Message:

Unreviewed, rolling out r94458.
​http://trac.webkit.org/changeset/94458
​https://bugs.webkit.org/show_bug.cgi?id=67558

Caused appcache test to fail on various bots (Requested by
rniwa on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-09-03

• Scripts/webkitpy/layout_tests/port/webkit.py:
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-03  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94458.
+        http://trac.webkit.org/changeset/94458
+        https://bugs.webkit.org/show_bug.cgi?id=67558
+
+        Caused appcache test to fail on various bots (Requested by
+        rniwa on #webkit).
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
 2011-09-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -531 +531 @@
                 line = chomped_line[:-4]
 
-            if line.startswith(self.TYPE_HEADER) and content_type is None:
+            if line.startswith(TYPE_HEADER) and content_type is None:
                 content_type = line.split()[1]
             elif line.startswith(ENCODING_HEADER) and encoding is None:

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py

@@ -32 +32 @@
 
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.webkit import WebKitPort, WebKitDriver
+from webkitpy.layout_tests.port.webkit import WebKitPort
 from webkitpy.layout_tests.port import port_testcase
 
@@ -198 +198 @@
         port._apache_config_file_name_for_platform = lambda platform: 'httpd.conf'
         self.assertEquals(port._path_to_apache_config_file(), '/mock-checkout/LayoutTests/http/conf/httpd.conf')
-
-
-class MockServerProcess(object):
-    def __init__(self, lines=None):
-        self.timed_out = False
-        self.crashed = False
-        self.lines = lines or []
-
-    def read_line(self, timeout):
-        return self.lines.pop(0)
-
-
-class WebKitDriverTest(unittest.TestCase):
-    def test_read_block(self):
-        port = TestWebKitPort()
-        driver = WebKitDriver(port, 0)
-        driver._server_process = MockServerProcess([
-            'ActualHash: foobar',
-            'Content-Type: my_type',
-            'Content-Transfer-Encoding: none',
-            "#EOF",
-        ])
-        content_block = driver._read_block(0)
-        self.assertEquals(content_block.content_type, 'my_type')
-        self.assertEquals(content_block.encoding, 'none')
-        self.assertEquals(content_block.content_hash, 'foobar')