224627 2021-04-15 15:14:52 -0700 scm_unittest.py fails at import-time on Python 2 2021-04-22 17:35:54 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 224638 1 gsnedders gsnedders ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1750790 0 gsnedders 2021-04-15 15:14:52 -0700 This isn't run by default (because it's too slow), but as a result we don't even try to import the tests and this has led to us regressing our ability to run them. Notably, ./Tools/Scripts/test-webkitpy-python2 --all currently fails: Checking imports ...Failed to import webkitpy.common.checkout.scm.scm_unittest: Failed to import webkitpy.common.checkout.scm.scm_unittest: Traceback (most recent call last): Traceback (most recent call last): File "/Volumes/gsnedders/projects/Safari/OpenSource/Tools/Scripts/webkitpy/test/main.py", line 290, in _check_imports File "/Volumes/gsnedders/projects/Safari/OpenSource/Tools/Scripts/webkitpy/test/main.py", line 290, in _check_imports __import__(name) __import__(name) File "/Volumes/gsnedders/projects/Safari/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 38, in <module> File "/Volumes/gsnedders/projects/Safari/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py", line 38, in <module> import pathlib import pathlib ImportError: No module named pathlib ImportError: No module named pathlib As part of my medium-term goal of migrating us to using pytest where we're likely to skip specific slow tests rather than merely doing this at a module level, we should make sure this is importable. 1750793 1 426142 gsnedders 2021-04-15 15:18:25 -0700 Created attachment 426142 Patch 1750827 2 ews-feeder 2021-04-15 16:05:04 -0700 Committed r276083 (236595@main): <https://commits.webkit.org/236595@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426142. 1753397 3 ryanhaddad 2021-04-22 17:35:54 -0700 rdar://76735334 426142 2021-04-15 15:18:25 -0700 2021-04-15 16:05:05 -0700 Patch bug-224627-20210415231824.patch text/plain 4710 gsnedders U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTUyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzk1YjliN2YxZWExYTJmYmVkMDkyZGJmZGI3YTljNzM0 MGI0OTkzYy4uYTM4OGZkNzI0ZjA3YTNhYWYyY2Y4MzE0ZTcyMDEyYzlmZjhkMjZmZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIxLTA0LTE1ICBTYW0gU25lZGRvbiAgPGdzbmVkZGVyc0BhcHBsZS5jb20+CisKKyAg ICAgICAgc2NtX3VuaXR0ZXN0LnB5IGZhaWxzIGF0IGltcG9ydC10aW1lIG9uIFB5dGhvbiAyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ2MjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHk6CisgICAg ICAgIChQYWNrYWdlLl9fcmVwcl9fKTogQWRkIGEgX19yZXByX18gZm9yIGRlYnVnIGZyaWVuZGxp bmVzcworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvX19pbml0X18ucHk6IHBhdGhsaWIyIG5l dmVyIHByb3ZpZGVzIHBhdGhsaWIKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX3VuaXR0ZXN0LnB5OiBkaXR0bworCiAyMDIxLTA0LTE0ICBLYXRlIENo ZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2Ugd29y a2VyIHNvZnQtdXBkYXRlIGxvYWRzIG5vdCBiZWluZyBtYXJrZWQgYXBwLWJvdW5kCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1 dG9pbnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtp dGNvcmVweS9hdXRvaW5zdGFsbC5weQppbmRleCA5MGEwMjA5NTEyODk0ZTFkZWIwYTBkZmNiMjI5 NTgyNTkxMmUwNGMxLi43NTgzYjUzMmZlYjc4NTYxYTE2OTdiMWI3ZGY1ZTA5MGU4M2M0MWUyIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L2F1dG9pbnN0YWxsLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNv cmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKQEAgLTEzOSw2ICsxMzksMTggQEAgY2xh c3MgUGFja2FnZShvYmplY3QpOgogICAgICAgICBzZWxmLmFsaWFzZXMgPSBhbGlhc2VzIG9yIFtd CiAgICAgICAgIHNlbGYuaW1wbGljaXRfZGVwcyA9IGltcGxpY2l0X2RlcHMgb3IgW10KIAorICAg IGRlZiBfX3JlcHJfXyhzZWxmKToKKyAgICAgICAgcmV0dXJuICgiUGFja2FnZSgiCisgICAgICAg ICAgICAgICAgImltcG9ydF9uYW1lPXtzZWxmLm5hbWUhcn0sICIKKyAgICAgICAgICAgICAgICAi dmVyc2lvbj17c2VsZi52ZXJzaW9uIXJ9LCAiCisgICAgICAgICAgICAgICAgInB5cGlfbmFtZT17 c2VsZi5weXBpX25hbWUhcn0sICIKKyAgICAgICAgICAgICAgICAic2xvd19pbnN0YWxsPXtzZWxm LnNsb3dfaW5zdGFsbCFyfSwgIgorICAgICAgICAgICAgICAgICJ3aGVlbD17c2VsZi53aGVlbCFy fSwgIgorICAgICAgICAgICAgICAgICJhbGlhc2VzPXtzZWxmLmFsaWFzZXMhcn0sICIKKyAgICAg ICAgICAgICAgICAiaW1wbGljaXRfZGVwcz17c2VsZi5pbXBsaWNpdF9kZXBzIXJ9IgorICAgICAg ICAgICAgICAgICIpIgorICAgICAgICAgICAgICAgICkuZm9ybWF0KHNlbGY9c2VsZikKKwogICAg IEBwcm9wZXJ0eQogICAgIGRlZiBsb2NhdGlvbihzZWxmKToKICAgICAgICAgaWYgbm90IEF1dG9J bnN0YWxsLmRpcmVjdG9yeToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19p bml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5CmluZGV4IGFhZWU2 NmU3MzkxZTExNDUxMmZmNjQ3YWU0ODlhNTIwZDhjYzBkMGEuLmViNjgwZTVhNDg5Y2I2OTYzZmU0 NzgyMGQ0MmY2Yjg5YmMxMjFhNzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv X19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weQpAQCAt MzMsMTUgKzMzLDE1IEBAIGlmIHN5cy5wbGF0Zm9ybSA9PSAnZGFyd2luJzoKIGZyb20gd2Via2l0 Y29yZXB5IGltcG9ydCBBdXRvSW5zdGFsbCwgUGFja2FnZSwgVmVyc2lvbgogQXV0b0luc3RhbGwu c2V0X2RpcmVjdG9yeShvcy5wYXRoLmpvaW4obGlicmFyaWVzLCAnYXV0b2luc3RhbGxlZCcsICdw eXRob24te30nLmZvcm1hdChzeXMudmVyc2lvbl9pbmZvWzBdKSkpCiAKLWlmIHN5cy52ZXJzaW9u X2luZm8gPiAoMywgNCk6Ci0gICAgIyBQeXRob24gPj0zLjUuKgoraWYgc3lzLnZlcnNpb25faW5m byA+PSAoMywgNSk6CiAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncHlsaW50Jywg VmVyc2lvbigyLCA2LCAwKSkpCi1lbHNlOgorZWxpZiBzeXMudmVyc2lvbl9pbmZvID49ICgyLCA3 KSBhbmQgc3lzLnZlcnNpb25faW5mbyA8ICgzLCk6CiAgICAgQXV0b0luc3RhbGwucmVnaXN0ZXIo UGFja2FnZSgncHlsaW50JywgVmVyc2lvbigwLCAyOCwgMCkpKQogICAgIEF1dG9JbnN0YWxsLnJl Z2lzdGVyKFBhY2thZ2UoJ2xvZ2lsYWIuY29tbW9uJywgVmVyc2lvbigwLCA1OCwgMSksIHB5cGlf bmFtZT0nbG9naWxhYi1jb21tb24nLCBhbGlhc2VzPVsnbG9naWxhYiddKSkKICAgICBBdXRvSW5z dGFsbC5yZWdpc3RlcihQYWNrYWdlKCdsb2dpbGFiLmFzdG5nJywgVmVyc2lvbigwLCAyNCwgMSks IHB5cGlfbmFtZT0nbG9naWxhYi1hc3RuZycsIGFsaWFzZXM9Wydsb2dpbGFiJ10pKQotCi0gICAg QXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgncGF0aGxpYicsIFZlcnNpb24oMiwgMywgNSks IHB5cGlfbmFtZT0ncGF0aGxpYjInKSkKKyAgICBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdl KCdwYXRobGliMicsIFZlcnNpb24oMiwgMywgNSkpKQorZWxzZToKKyAgICByYWlzZSBJbXBvcnRF cnJvcigiVW5zdXBwb3J0ZWQgUHl0aG9uIHZlcnNpb24hICglcykiICUgc3lzLnZlcnNpb24pCiAK IEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2F0b21pY3dyaXRlcycsIFZlcnNpb24oMSwg MSwgNSkpKQogQXV0b0luc3RhbGwucmVnaXN0ZXIoUGFja2FnZSgnYXR0cicsIFZlcnNpb24oMTgs IDEsIDApLCBweXBpX25hbWU9J2F0dHJzJykpCkBAIC01OCw3ICs1OCw2IEBAIEF1dG9JbnN0YWxs LnJlZ2lzdGVyKFBhY2thZ2UoJ21vcmVfaXRlcnRvb2xzJywgVmVyc2lvbig0LCAyLCAwKSwgcHlw aV9uYW1lPSdtb3JlCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3pwcm9jZXNzJywg VmVyc2lvbigxLCAyLCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb3psb2cn LCBWZXJzaW9uKDYsIDEpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21venRlcm0n LCBWZXJzaW9uKDEsIDAsIDApKSkKLUF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ3BhdGhs aWIyJywgVmVyc2lvbigyLCAzLCA1KSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdw bHVnZ3knLCBWZXJzaW9uKDAsIDUsIDIpKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2Uo J3B5JywgVmVyc2lvbigxLCA1LCAyKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdw eXRlc3RfdGltZW91dCcsIFZlcnNpb24oMSwgNCwgMiksIHB5cGlfbmFtZT0ncHl0ZXN0LXRpbWVv dXQnKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY21fdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVj a291dC9zY20vc2NtX3VuaXR0ZXN0LnB5CmluZGV4IDI2Yjg3NzM1Mzk0ODFjMDJhZWUwODliZGQ5 ZTIxOWY1Mjc1NDRmMzYuLmNiM2ZlY2VhMWE3Mzg4MzI1M2M2NDAzNmU1MzRmOGVlMzU4NGU3NWQg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9z Y21fdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvc2NtL3NjbV91bml0dGVzdC5weQpAQCAtMzUsNyArMzUsNiBAQCBpbXBvcnQgZ2V0cGFzcwog aW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwogaW1wb3J0IG9zLnBhdGgKLWltcG9ydCBwYXRobGli CiBpbXBvcnQgcmUKIGltcG9ydCBzdGF0CiBpbXBvcnQgc3lzCkBAIC02Miw2ICs2MSwxMSBAQCBm cm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5zY20uc3ZuIGltcG9ydCBTVk4KIAogZnJvbSB3 ZWJraXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUKIAordHJ5OgorICAgIGltcG9ydCBwYXRo bGliCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAgaW1wb3J0IHBhdGhsaWIyIGFzIHBhdGhsaWIK KwogCiAjIFdlIGNhY2hlIHRoZSBtb2NrIFNWTiByZXBvIHNvIHRoYXQgd2UgZG9uJ3QgY3JlYXRl IGl0IGFnYWluIGZvciBlYWNoIGNhbGwgdG8gYW4gU1ZOVGVzdCBvciBHaXRUZXN0IHRlc3RfIG1l dGhvZC4KICMgV2Ugc3RvcmUgaXQgaW4gYSBnbG9iYWwgdmFyaWFibGUgc28gdGhhdCB3ZSBjYW4g ZGVsZXRlIHRoaXMgY2FjaGVkIHJlcG8gb24gZXhpdCgzKS4K