Changeset 204168 in webkit

Timestamp:

Aug 5, 2016 8:39:10 AM (8 years ago)

Author:

Konstantin Tokarev

Message:

Print test name in "Last character read from DRT..." error message.
​https://bugs.webkit.org/show_bug.cgi?id=160559

Reviewed by Michael Catanzaro.

• Scripts/webkitpy/port/driver.py:

(Driver.run_test):
(Driver._read_first_block):
(Driver._read_optional_image_block):
(Driver._read_block):

• Scripts/webkitpy/port/driver_unittest.py:

(DriverTest.test_read_block):
(DriverTest.test_read_binary_block):
(DriverTest.test_read_base64_block):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (5 diffs)
• Scripts/webkitpy/port/driver_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-08-05  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Print test name in "Last character read from DRT..." error message.
+        https://bugs.webkit.org/show_bug.cgi?id=160559
+
+        Reviewed by Michael Catanzaro.
+
+        * Scripts/webkitpy/port/driver.py:
+        (Driver.run_test):
+        (Driver._read_first_block):
+        (Driver._read_optional_image_block):
+        (Driver._read_block):
+        * Scripts/webkitpy/port/driver_unittest.py:
+        (DriverTest.test_read_block):
+        (DriverTest.test_read_binary_block):
+        (DriverTest.test_read_base64_block):
+
 2016-08-05  Commit Queue  <commit-queue@webkit.org>
 

trunk/Tools/Scripts/webkitpy/port/driver.py

@@ -198 +198 @@
 
         self._server_process.write(command)
-        text, audio = self._read_first_block(deadline)  # First block is either text or audio
-        image, actual_image_hash = self._read_optional_image_block(deadline)  # The second (optional) block is image data.
+        text, audio = self._read_first_block(deadline, driver_input.test_name)  # First block is either text or audio
+        image, actual_image_hash = self._read_optional_image_block(deadline, driver_input.test_name)  # The second (optional) block is image data.
 
         crashed = self.has_crashed()
@@ -470 +470 @@
         return command + "\n"
 
-    def _read_first_block(self, deadline):
+    def _read_first_block(self, deadline, test_name):
         # returns (text_content, audio_content)
-        block = self._read_block(deadline)
+        block = self._read_block(deadline, test_name)
         if block.malloc:
             self._measurements['Malloc'] = float(block.malloc)
@@ -481 +481 @@
         return (block.decoded_content, None)
 
-    def _read_optional_image_block(self, deadline):
+    def _read_optional_image_block(self, deadline, test_name):
         # returns (image, actual_image_hash)
-        block = self._read_block(deadline, wait_for_stderr_eof=True)
+        block = self._read_block(deadline, test_name, wait_for_stderr_eof=True)
         if block.content and block.content_type == 'image/png':
             return (block.decoded_content, block.content_hash)
@@ -514 +514 @@
         return line, False
 
-    def _read_block(self, deadline, wait_for_stderr_eof=False):
+    def _read_block(self, deadline, test_name, wait_for_stderr_eof=False):
         block = ContentBlock()
         out_seen_eof = False
@@ -545 +545 @@
                 self._check_for_driver_timeout(out_line)
                 if out_line[-1] != "\n":
-                    _log.error("Last character read from DRT stdout line was not a newline!  This indicates either a NRWT or DRT bug.")
+                    _log.error("  %s -> Last character read from DRT stdout line was not a newline!  This indicates either a NRWT or DRT bug." % test_name)
                 content_length_before_header_check = block._content_length
                 self._process_stdout_line(block, out_line)

trunk/Tools/Scripts/webkitpy/port/driver_unittest.py

@@ -136 +136 @@
             "#EOF",
         ])
-        content_block = driver._read_block(0)
+        content_block = driver._read_block(0, "")
         self.assertEqual(content_block.content_type, 'my_type')
         self.assertEqual(content_block.encoding, 'none')
@@ -153 +153 @@
             "#EOF",
         ])
-        content_block = driver._read_block(0)
+        content_block = driver._read_block(0, "")
         self.assertEqual(content_block.content_type, 'image/png')
         self.assertEqual(content_block.content_hash, 'actual')
@@ -171 +171 @@
             'MTIzNDU2NzgK#EOF',
         ])
-        content_block = driver._read_block(0)
+        content_block = driver._read_block(0, "")
         self.assertEqual(content_block.content_type, 'image/png')
         self.assertEqual(content_block.content_hash, 'actual')