Title: [94483] trunk/Tools
- Revision
- 94483
- Author
- [email protected]
- Date
- 2011-09-03 00:45:30 -0700 (Sat, 03 Sep 2011)
Log 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 <[email protected]> on 2011-09-03
* Scripts/webkitpy/layout_tests/port/webkit.py:
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (94482 => 94483)
--- trunk/Tools/ChangeLog 2011-09-03 07:45:22 UTC (rev 94482)
+++ trunk/Tools/ChangeLog 2011-09-03 07:45:30 UTC (rev 94483)
@@ -1,5 +1,17 @@
2011-09-03 Sheriff Bot <[email protected]>
+ 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 <[email protected]>
+
Unreviewed, rolling out r94453.
http://trac.webkit.org/changeset/94453
https://bugs.webkit.org/show_bug.cgi?id=67557
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (94482 => 94483)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-09-03 07:45:22 UTC (rev 94482)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-09-03 07:45:30 UTC (rev 94483)
@@ -530,7 +530,7 @@
eof = True
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:
encoding = line.split()[1]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (94482 => 94483)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-09-03 07:45:22 UTC (rev 94482)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-09-03 07:45:30 UTC (rev 94483)
@@ -31,7 +31,7 @@
from webkitpy.common.system.outputcapture import OutputCapture
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
from webkitpy.tool.mocktool import MockExecutive, MockOptions, MockUser
@@ -197,29 +197,3 @@
# Mock out _apache_config_file_name_for_platform to ignore the passed sys.platform value.
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')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
