Diff
Modified: trunk/Tools/ChangeLog (87846 => 87847)
--- trunk/Tools/ChangeLog 2011-06-01 21:00:56 UTC (rev 87846)
+++ trunk/Tools/ChangeLog 2011-06-01 21:09:05 UTC (rev 87847)
@@ -1,3 +1,15 @@
+2011-06-01 Dirk Pranke <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ nrwt: make webaudio work w/o content-length header
+ https://bugs.webkit.org/show_bug.cgi?id=61819
+
+ * Scripts/webkitpy/layout_tests/layout_package/printing.py:
+ * Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
+ * Scripts/webkitpy/layout_tests/port/mock_drt.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+
2011-06-01 Viatcheslav Ostapenko <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py (87846 => 87847)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py 2011-06-01 21:00:56 UTC (rev 87846)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py 2011-06-01 21:09:05 UTC (rev 87847)
@@ -314,23 +314,21 @@
filename = result.filename
test_name = self._port.relative_test_filename(filename)
self._write('trace: %s' % test_name)
- txt_file = self._port.expected_filename(filename, '.txt')
- if self._port.path_exists(txt_file):
- self._write(' txt: %s' %
- self._port.relative_test_filename(txt_file))
- else:
- self._write(' txt: <none>')
- png_file = self._port.expected_filename(filename, '.png')
- if self._port.path_exists(png_file):
- self._write(' png: %s' %
- self._port.relative_test_filename(png_file))
- else:
- self._write(' png: <none>')
+ for extension in ('.txt', '.wav', '.png'):
+ self._print_baseline(filename, extension)
self._write(' exp: %s' % exp_str)
self._write(' got: %s' % got_str)
self._write(' took: %-.3f' % result.test_run_time)
self._write('')
+ def _print_baseline(self, filename, extension):
+ baseline = self._port.expected_filename(filename, extension)
+ if self._port.path_exists(baseline):
+ relpath = self._port.relative_test_filename(baseline)
+ else:
+ relpath = '<none>'
+ self._write(' %s: %s' % (extension[1:], relpath))
+
def _print_unexpected_test_result(self, result):
"""Prints one unexpected test result line."""
desc = TestExpectations.EXPECTATION_DESCRIPTIONS[result.type][0]
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py (87846 => 87847)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py 2011-06-01 21:00:56 UTC (rev 87846)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py 2011-06-01 21:09:05 UTC (rev 87847)
@@ -148,10 +148,9 @@
# DumpRenderTree may not output utf-8 text (e.g. webarchives).
self._save_baseline_data(driver_output.text, ".txt",
generate_new_baseline=self._options.new_baseline)
- if driver_output.audio:
- self._save_baseline_data(driver_output.audio, '.wav',
- generate_new_baseline=self._options.new_baseline)
- if self._options.pixel_tests and driver_output.image:
+ self._save_baseline_data(driver_output.audio, '.wav',
+ generate_new_baseline=self._options.new_baseline)
+ if self._options.pixel_tests:
self._save_baseline_data(driver_output.image, ".png",
generate_new_baseline=self._options.new_baseline)
@@ -167,7 +166,8 @@
generate_new_baseline: whether to enerate a new, platform-specific
baseline, or update the existing one
"""
- assert data is not None
+ if data is None:
+ return
port = self._port
fs = port._filesystem
if generate_new_baseline:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py (87846 => 87847)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py 2011-06-01 21:00:56 UTC (rev 87846)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py 2011-06-01 21:09:05 UTC (rev 87847)
@@ -216,7 +216,6 @@
self._stdout.write('Content-Type: audio/wav\n')
self._stdout.write('Content-Transfer-Encoding: base64\n')
output = base64.b64encode(actual_audio)
- self._stdout.write('Content-Length: %s\n' % len(output))
self._stdout.write(output)
else:
self._stdout.write('Content-Type: text/plain\n')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (87846 => 87847)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-01 21:00:56 UTC (rev 87846)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-01 21:09:05 UTC (rev 87847)
@@ -471,9 +471,13 @@
content = ''
timeout = deadline - time.time()
line = self._server_process.read_line(timeout)
- while (not self._server_process.timed_out
- and not self._server_process.crashed
- and line.rstrip() != "#EOF"):
+ eof = False
+ while (not self._server_process.timed_out and not self._server_process.crashed and not eof):
+ chomped_line = line.rstrip()
+ if chomped_line.endswith("#EOF"):
+ eof = True
+ line = chomped_line[:-4]
+
if line.startswith(TYPE_HEADER) and content_type is None:
content_type = line.split()[1]
elif line.startswith(ENCODING_HEADER) and encoding is None:
@@ -486,10 +490,11 @@
content = self._server_process.read(timeout, content_length)
elif line.startswith(HASH_HEADER):
content_hash = line.split()[1]
- else:
+ elif line:
content += line
- line = self._server_process.read_line(timeout)
- timeout = deadline - time.time()
+ if not eof:
+ line = self._server_process.read_line(timeout)
+ timeout = deadline - time.time()
return ContentBlock(content_type, encoding, content_hash, content)
def stop(self):
