Changeset 87847 in webkit

Timestamp:

Jun 1, 2011 2:09:05 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-06-01 Dirk Pranke <​dpranke@chromium.org>

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/printing.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mock_drt.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-01  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <ostapenko.viatcheslav@nokia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py

@@ -315 +315 @@
         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):

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py

@@ -149 +149 @@
         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)
@@ -168 +167 @@
             baseline, or update the existing one
         """
-        assert data is not None
+        if data is None:
+            return
         port = self._port
         fs = port._filesystem

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

@@ -217 +217 @@
             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:

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

@@ -472 +472 @@
         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]
@@ -487 +491 @@
             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)