Changeset 251955 in webkit
- Timestamp:
- Nov 1, 2019 4:59:52 PM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r251941 r251955 1 2019-11-01 Jonathan Bedard <jbedard@apple.com> 2 3 Python 3: Add support in webkitpy.common 4 https://bugs.webkit.org/show_bug.cgi?id=202462 5 6 Reviewed by Stephanie Lewis. 7 8 * Scripts/test-webkitpy-python3: Add webkitpy.common. 9 * Scripts/webkitpy/common/find_files_unittest.py: Use full import path. 10 * Scripts/webkitpy/common/lru_cache_unittest.py: 11 (LRUCacheTest.test_size_one_pop): Convert iterator to list 12 * Scripts/webkitpy/common/prettypatch_unittest.py: Check for byte array explicitly. 13 * Scripts/webkitpy/common/read_checksum_from_png_unittest.py: Use unicode compatible 14 StringIO. 15 (ReadChecksumFromPngTest.test_read_checksum): 16 * Scripts/webkitpy/common/timeout_context.py: 17 (Timeout.__enter__): Use range instead of xrange. 18 1 19 2019-11-01 Tim Horton <timothy_horton@apple.com> 2 20 -
trunk/Tools/Scripts/test-webkitpy-python3
r251808 r251955 35 35 36 36 PYTHON3_COMPATIBLE_DIRECTORIES = [ 37 'webkitpy.common.checkout', 38 'webkitpy.common.config', 39 'webkitpy.common.system', 40 'webkitpy.common.thread', 41 'webkitpy.common.net', 42 'webkitpy.common.watchlist', 37 'webkitpy.common', 43 38 'webkitpy.port', 44 39 'webkitpy.results', -
trunk/Tools/Scripts/webkitpy/common/find_files_unittest.py
r192944 r251955 30 30 import unittest 31 31 32 import webkitpy.common.find_files as find_files 33 32 34 from webkitpy.common.system.filesystem import FileSystem 33 import find_files34 35 35 36 -
trunk/Tools/Scripts/webkitpy/common/lru_cache_unittest.py
r174136 r251955 72 72 def test_size_one_pop(self): 73 73 self.lru2['key_2'] = 'item_2' 74 self.assertEqual( self.lru2.keys(), ['key_2'])74 self.assertEqual(list(self.lru2.keys()), ['key_2']) 75 75 76 76 def test_size_one_delete(self): -
trunk/Tools/Scripts/webkitpy/common/prettypatch_unittest.py
r225733 r251955 78 78 pretty = pretty_patch.pretty_diff(self._diff_with_multiple_encodings) 79 79 self.assertTrue(pretty) # We got some output 80 self.assertIsInstance(pretty, str) # It's a byte array, not unicode80 self.assertIsInstance(pretty, bytes) # It's a byte array, not unicode 81 81 82 82 def test_pretty_print_empty_string(self): -
trunk/Tools/Scripts/webkitpy/common/read_checksum_from_png_unittest.py
r174136 r251955 22 22 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 24 import StringIO25 24 import unittest 26 25 from webkitpy.common import read_checksum_from_png 26 from webkitpy.common.unicode_compatibility import StringIO 27 27 28 28 … … 30 30 def test_read_checksum(self): 31 31 # Test a file with the comment. 32 filehandle = StringIO .StringIO('''\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03 \x00\x00\x02X\x08\x02\x00\x00\x00\x15\x14\x15'\x00\x00\x00)tEXtchecksum\x003c4134fe2739880353f91c5b84cadbaaC\xb8?\xec\x00\x00\x16\xfeIDATx\x9c\xed\xdd[\x8cU\xe5\xc1\xff\xf15T\x18\x0ea,)\xa6\x80XZ<\x10\n\xd6H\xc4V\x88}\xb5\xa9\xd6r\xd5\x0bki0\xa6\xb5ih\xd2\xde\x98PHz\xd1\x02=\\q#\x01\x8b\xa5rJ\x8b\x88i\xacM\xc5h\x8cbMk(\x1ez@!\x0c\xd5\xd2\xc2\xb44\x1c\x848\x1dF(\xeb\x7f\xb1\xff\xd9\xef~g\xd6\xde3\xe0o\x10\xec\xe7sa6{\xd6z\xd6\xb3\xd7\xf3\xa8_7\xdbM[Y\x96\x05\x00\x009\xc3\xde\xeb\t\x00\x00\xbc\xdf\x08,\x00\x800\x81\x05\x00\x10&\xb0\x00\x00\xc2\x04\x16\x00@\x98\xc0\x02\x00\x08\x13X\x00\x00a\x02\x0b\x00 L32 filehandle = StringIO('''\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03 \x00\x00\x02X\x08\x02\x00\x00\x00\x15\x14\x15'\x00\x00\x00)tEXtchecksum\x003c4134fe2739880353f91c5b84cadbaaC\xb8?\xec\x00\x00\x16\xfeIDATx\x9c\xed\xdd[\x8cU\xe5\xc1\xff\xf15T\x18\x0ea,)\xa6\x80XZ<\x10\n\xd6H\xc4V\x88}\xb5\xa9\xd6r\xd5\x0bki0\xa6\xb5ih\xd2\xde\x98PHz\xd1\x02=\\q#\x01\x8b\xa5rJ\x8b\x88i\xacM\xc5h\x8cbMk(\x1ez@!\x0c\xd5\xd2\xc2\xb44\x1c\x848\x1dF(\xeb\x7f\xb1\xff\xd9\xef~g\xd6\xde3\xe0o\x10\xec\xe7sa6{\xd6z\xd6\xb3\xd7\xf3\xa8_7\xdbM[Y\x96\x05\x00\x009\xc3\xde\xeb\t\x00\x00\xbc\xdf\x08,\x00\x800\x81\x05\x00\x10&\xb0\x00\x00\xc2\x04\x16\x00@\x98\xc0\x02\x00\x08\x13X\x00\x00a\x02\x0b\x00 L 33 33 x01\x00\x84\t,\x00\x800\x81\x05\x00\x10\xd64\xb0\xda\x9a\xdb\xb6m\xdb\xb4i\xd3\xfa\x9fr\xf3\xcd7\x0f\xe5T\x07\xe5\xd4\xa9''') 34 34 checksum = read_checksum_from_png.read_checksum(filehandle) … … 36 36 37 37 # Test a file without the comment. 38 filehandle = StringIO .StringIO('''\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03 \x00\x00\x02X\x08\x02\x00\x00\x00\x15\x14\x15'\x00\x00\x16\xfeIDATx\x9c\xed\xdd[\x8cU\xe5\xc1\xff\xf15T\x18\x0ea,)\xa6\x80XZ<\x10\n\xd6H\xc4V\x88}\xb5\xa9\xd6r\xd5\x0bki0\xa6\xb5ih\xd2\xde\x98PHz\xd1\x02=\\q#\x01\x8b\xa5rJ\x8b\x88i\xacM\xc5h\x8cbMk(\x1ez@!\x0c\xd5\xd2\xc2\xb44\x1c\x848\x1dF(\xeb\x7f\xb1\xff\xd9\xef~g\xd6\xde3\xe0o\x10\xec\xe7sa6{\xd6z\xd6\xb3\xd7\xf3\xa8_7\xdbM[Y\x96\x05\x00\x009\xc3\xde\xeb\t\x00\x00\xbc\xdf\x08,\x00\x800\x81\x05\x00\x10&\xb0\x00\x00\xc2\x04\x16\x00@\x98\xc0\x02\x00\x08\x13X\x00\x00a\x02\x0b\x00 L38 filehandle = StringIO('''\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03 \x00\x00\x02X\x08\x02\x00\x00\x00\x15\x14\x15'\x00\x00\x16\xfeIDATx\x9c\xed\xdd[\x8cU\xe5\xc1\xff\xf15T\x18\x0ea,)\xa6\x80XZ<\x10\n\xd6H\xc4V\x88}\xb5\xa9\xd6r\xd5\x0bki0\xa6\xb5ih\xd2\xde\x98PHz\xd1\x02=\\q#\x01\x8b\xa5rJ\x8b\x88i\xacM\xc5h\x8cbMk(\x1ez@!\x0c\xd5\xd2\xc2\xb44\x1c\x848\x1dF(\xeb\x7f\xb1\xff\xd9\xef~g\xd6\xde3\xe0o\x10\xec\xe7sa6{\xd6z\xd6\xb3\xd7\xf3\xa8_7\xdbM[Y\x96\x05\x00\x009\xc3\xde\xeb\t\x00\x00\xbc\xdf\x08,\x00\x800\x81\x05\x00\x10&\xb0\x00\x00\xc2\x04\x16\x00@\x98\xc0\x02\x00\x08\x13X\x00\x00a\x02\x0b\x00 L 39 39 x01\x00\x84\t,\x00\x800\x81\x05\x00\x10\xd64\xb0\xda\x9a\xdb\xb6m\xdb\xb4i\xd3\xfa\x9fr\xf3\xcd7\x0f\xe5T\x07\xe5\xd4\xa9S\x8b\x17/\x1e?~\xfc\xf8\xf1\xe3\xef\xbf\xff\xfe\xf7z:M5\xbb\x87\x17\xcbUZ\x8f|V\xd7\xbd\x10\xb6\xcd{b\x88\xf6j\xb3\x9b?\x14\x9b\xa1>\xe6\xf9\xd9\xcf\x00\x17\x93''') 40 40 checksum = read_checksum_from_png.read_checksum(filehandle) -
trunk/Tools/Scripts/webkitpy/common/timeout_context.py
r220483 r251955 95 95 # Another timeout is more urgent. 96 96 if current_timeout and current_timeout.alarm_time < self.data.alarm_time: 97 for i in xrange(len(Timeout._process_to_timeout_map[os.getpid()]) - 1):97 for i in range(len(Timeout._process_to_timeout_map[os.getpid()]) - 1): 98 98 if self.data.alarm_time < Timeout._process_to_timeout_map[os.getpid()][i + 1].alarm_time: 99 99 Timeout._process_to_timeout_map[os.getpid()].insert(i, self.data)
Note: See TracChangeset
for help on using the changeset viewer.