[webkit-changes] [254346] trunk/Tools

Fri, 10 Jan 2020 10:15:50 -0800

Title: [254346] trunk/Tools
Revision
254346
Author
[email protected]
Date
2020-01-10 10:14:02 -0800 (Fri, 10 Jan 2020)

Log 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.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (254345 => 254346)


--- trunk/Tools/ChangeLog	2020-01-10 18:06:08 UTC (rev 254345)
+++ trunk/Tools/ChangeLog	2020-01-10 18:14:02 UTC (rev 254346)
@@ -1,3 +1,15 @@
+2020-01-10  Jonathan Bedard  <[email protected]>
+
+        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  <[email protected]>
 
         Expand _WKResourceLoadDelegate callbacks

Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (254345 => 254346)


--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py	2020-01-10 18:06:08 UTC (rev 254345)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py	2020-01-10 18:14:02 UTC (rev 254346)
@@ -292,11 +292,11 @@
         # First test the case of not using the JHBuild wrapper.
         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"])
 
         # Now test the case of using JHBuild wrapper.
@@ -303,11 +303,11 @@
         port._filesystem.maybe_make_directory(port.path_from_webkit_base('WebKitBuild', 'Dependencies%s' % port.port_name.upper()))
         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"])
 
         port.clean_up_test_run()
@@ -324,7 +324,7 @@
         port = self.make_port()
         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):
         port = self.make_port()
@@ -340,7 +340,7 @@
 
         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()
 
     def integration_test_websocket_server__normal(self):

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to