Changeset 83327 in webkit

Timestamp:

Apr 8, 2011 12:48:47 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-08 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: clean up the way we handle missing files,
to be consistent. With this change, the Port.expected_X() and
Driver.run_test() routines should return None if there is no
output, not .

​https://bugs.webkit.org/show_bug.cgi?id=58101

• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-08  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: clean up the way we handle missing files,
+        to be consistent. With this change, the Port.expected_X() and
+        Driver.run_test() routines should return None if there is no
+        output, not ''.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58101
+
+        * Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-04-08  Pere Martir  <pere.martir4@gmail.com>
 

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

@@ -223 +223 @@
     def _compare_text(self, actual_text, expected_text):
         failures = []
-        if self._port.compare_text(self._get_normalized_output_text(actual_text),
-                                   # Assuming expected_text is already normalized.
-                                   expected_text):
-            if expected_text == '':
-                failures.append(test_failures.FailureMissingResult())
-            else:
-                failures.append(test_failures.FailureTextMismatch())
+        if (expected_text and actual_text and
+            # Assuming expected_text is already normalized.
+            self._port.compare_text(self._get_normalized_output_text(actual_text), expected_text)):
+            failures.append(test_failures.FailureTextMismatch())
+        elif actual_text and not expected_text:
+            failures.append(test_failures.FailureMissingResult())
         return failures
 

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

@@ -353 +353 @@
 
     def expected_text(self, test):
-        """Returns the text output we expect the test to produce.
+        """Returns the text output we expect the test to produce, or None
+        if we don't expect there to be any text output.
         End-of-line characters are normalized to '\n'."""
         # FIXME: DRT output is actually utf-8, but since we don't decode the
@@ -360 +361 @@
         path = self.expected_filename(test, '.txt')
         if not self.path_exists(path):
-            return ''
+            return None
         text = self._filesystem.read_binary_file(path)
         return text.replace("\r\n", "\n")

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

@@ -426 +426 @@
             return self._port._filesystem.read_binary_file(png_path)
         else:
-            return ''
+            return None
 
     def _output_image_with_retry(self):
@@ -503 +503 @@
         run_time = time.time() - start_time
         output_image = self._output_image_with_retry()
-        assert output_image is not None
-        return base.DriverOutput(''.join(output), output_image, actual_checksum,
+        text = ''.join(output)
+        if not text:
+            text = None
+
+        return base.DriverOutput(text, output_image, actual_checksum,
                                  crash, run_time, timeout, ''.join(error))
 

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

@@ -410 +410 @@
         actual_image_hash = None
         output = str()  # Use a byte array for output, even though it should be UTF-8.
-        image = str()
+        text = None
+        image = None
 
         timeout = int(driver_input.timeout) / 1000.0
@@ -429 +430 @@
             line = self._server_process.read_line(timeout)
             timeout = deadline - time.time()
+
+        if output:
+            text = output
 
         # Now read a second block of text for the optional image data
@@ -459 +463 @@
         # this reset in.
         self._server_process.error = ""
-        return base.DriverOutput(output, image, actual_image_hash,
+        return base.DriverOutput(text, image, actual_image_hash,
                                  self._server_process.crashed,
                                  time.time() - start_time,