Changeset 254346 in webkit

Timestamp:

Jan 10, 2020 10:14:02 AM (4 years ago)

Author:

Jonathan Bedard

Message:

Python 3: Add support to run-webkit-tests (Follow-up fix)
​https://bugs.webkit.org/show_bug.cgi?id=205291

Unreviewed follow-up fix.

• Scripts/webkitpy/port/port_testcase.py:

(PortTestCase.test_diff_image): Diff output is byte array, not string.
(PortTestCase.test_diff_image_failed): Ditto.
(PortTestCase.test_diff_image_crashed): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/port_testcase.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-01-10  Jonathan Bedard  <jbedard@apple.com>
+
+        Python 3: Add support to run-webkit-tests (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=205291
+
+        Unreviewed follow-up fix.
+
+        * Scripts/webkitpy/port/port_testcase.py:
+        (PortTestCase.test_diff_image): Diff output is byte array, not string.
+        (PortTestCase.test_diff_image_failed): Ditto.
+        (PortTestCase.test_diff_image_crashed): Ditto.
+
 2020-01-10  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -293 +293 @@
         self.assertFalse(port._should_use_jhbuild())
 
-        self.assertEqual(port.diff_image('foo', 'bar'), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar'), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, [port._path_to_image_diff(), "--tolerance", "0.1"])
-        self.assertEqual(port.diff_image('foo', 'bar', None), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar', None), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, [port._path_to_image_diff(), "--tolerance", "0.1"])
-        self.assertEqual(port.diff_image('foo', 'bar', 0), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar', 0), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, [port._path_to_image_diff(), "--tolerance", "0"])
 
@@ -304 +304 @@
         self.assertTrue(port._should_use_jhbuild())
 
-        self.assertEqual(port.diff_image('foo', 'bar'), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar'), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, port._jhbuild_wrapper + [port._path_to_image_diff(), "--tolerance", "0.1"])
-        self.assertEqual(port.diff_image('foo', 'bar', None), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar', None), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, port._jhbuild_wrapper + [port._path_to_image_diff(), "--tolerance", "0.1"])
-        self.assertEqual(port.diff_image('foo', 'bar', 0), ('', 100.0, None))
+        self.assertEqual(port.diff_image('foo', 'bar', 0), (b'', 100.0, None))
         self.assertEqual(self.proc.cmd, port._jhbuild_wrapper + [port._path_to_image_diff(), "--tolerance", "0"])
 
@@ -325 +325 @@
         port._server_process_constructor = lambda port, nm, cmd, env: MockServerProcess(lines=['diff: 100% failed\n'])
         image_differ = ImageDiffer(port)
-        self.assertEqual(image_differ.diff_image('foo', 'bar', 0.1), ('', 100.0, None))
+        self.assertEqual(image_differ.diff_image('foo', 'bar', 0.1), (b'', 100.0, None))
 
     def test_diff_image_crashed(self):
@@ -341 +341 @@
         port._server_process_constructor = make_proc
         port.setup_test_run()
-        self.assertEqual(port.diff_image('foo', 'bar'), ('', 0, 'ImageDiff crashed\n'))
+        self.assertEqual(port.diff_image('foo', 'bar'), (b'', 0, 'ImageDiff crashed\n'))
         port.clean_up_test_run()