222672 2021-03-03 11:35:26 -0800 [ews] Add python 3 support - part 4 2021-03-04 16:10:50 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=222355 https://bugs.webkit.org/show_bug.cgi?id=221899 https://bugs.webkit.org/show_bug.cgi?id=220510 https://bugs.webkit.org/show_bug.cgi?id=222744 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap dean_johnson jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1735405 0 aakash_jain 2021-03-03 11:35:26 -0800 Add Python 3 support to ews code, specifically to events.py 1735409 1 webkit-bug-importer 2021-03-03 11:37:10 -0800 <rdar://problem/74995373> 1735413 2 422130 aakash_jain 2021-03-03 11:38:34 -0800 Created attachment 422130 Patch 1735421 3 422131 aakash_jain 2021-03-03 11:43:43 -0800 Created attachment 422131 Patch 1735422 4 422131 aakash_jain 2021-03-03 11:44:36 -0800 Comment on attachment 422131 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422131&action=review > Tools/CISupport/ews-build/events.py:37 > +from zope.interface import implementer Using implementer instead of implements to prevent the error: "builtins.TypeError: Class advice impossible in Python3. Use the @implementer class decorator instead" > Tools/CISupport/ews-build/events.py:48 > + self.body = json.dumps(data, default=self.json_serialize_datetime).encode('utf-8') This is to prevent the error: Failure: twisted.web._newclient.RequestGenerationFailed: [<twisted.python.failure.Failure builtins.TypeError: Must write bytes to a TLS transport, not unicode.>] > Tools/CISupport/ews-build/events.py:76 > + EVENT_SERVER_ENDPOINT = b'https://ews.webkit.org/results/' This is to prevent the error: File "/usr/local/lib64/python3.6/site-packages/twisted/web/_newclient.py", line 646, in _ensureValidURI if _VALID_URI.match(uri): builtins.TypeError: cannot use a bytes pattern on a string-like object > Tools/CISupport/ews-build/events.py:98 > + agent.request(b'POST', self.EVENT_SERVER_ENDPOINT, Headers({'Content-Type': ['application/json']}), body) This is to prevent the error: File "/usr/local/lib64/python3.6/site-packages/twisted/web/client.py", line 1507, in _requestWithEndpoint TypeError: method='POST' is <class 'str'>, but must be bytes 1735441 5 aakash_jain 2021-03-03 12:38:06 -0800 Tested this patch on ews uat instance for both buildbot v1.8.2 and buildbot v2.10.1, by re-installing those buildbot versions (one by one) and running few builds to ensure that the data is sent and received properly. 1735501 6 ews-feeder 2021-03-03 14:00:28 -0800 Committed r273838: <https://commits.webkit.org/r273838> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422131. 422130 2021-03-03 11:38:34 -0800 2021-03-03 11:43:40 -0800 Patch bug-222672-20210303143833.patch text/plain 2503 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzgyOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTAzLTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBZGQgcHl0aG9uIDMgc3VwcG9ydCAtIHBhcnQgNAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNjcyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdz LWJ1aWxkL2V2ZW50cy5weToKKyAgICAgICAgKEpTT05Qcm9kdWNlcik6IFVzZSBpbXBsZW1lbnRl ciAocHl0aG9uIDMgY29tcGF0aWJsZSkgaW5zdGVhZCBvZiBpbXBsZW1lbnRzLgorICAgICAgICAo SlNPTlByb2R1Y2VyLl9faW5pdF9fKTogRW5jb2RlIGRhdGEgYXMgdXRmLTggZXhwbGljaXRseS4K KyAgICAgICAgKEV2ZW50cyk6CisgICAgICAgIChFdmVudHMuc2VuZERhdGEpOgorCiAyMDIxLTAz LTAzICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAg IFJlcG9ydCB0aGUgY29ycmVjdCBkb2N1bWVudCB1cmkgaW4gdGhlIGNhc2Ugb2YgYSBDb250ZW50 U2VjdXJpdHlQb2xpY3lDbGllbnQKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZXZl bnRzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZXZlbnRzLnB5 CShyZXZpc2lvbiAyNzM4MjgpCisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2V2ZW50cy5w eQkod29ya2luZyBjb3B5KQpAQCAtMzQsMTggKzM0LDE4IEBAIGZyb20gdHdpc3RlZC5weXRob24g aW1wb3J0IGxvZwogZnJvbSB0d2lzdGVkLndlYi5jbGllbnQgaW1wb3J0IEFnZW50CiBmcm9tIHR3 aXN0ZWQud2ViLmh0dHBfaGVhZGVycyBpbXBvcnQgSGVhZGVycwogZnJvbSB0d2lzdGVkLndlYi5p d2ViIGltcG9ydCBJQm9keVByb2R1Y2VyCi1mcm9tIHpvcGUuaW50ZXJmYWNlIGltcG9ydCBpbXBs ZW1lbnRzCitmcm9tIHpvcGUuaW50ZXJmYWNlIGltcG9ydCBpbXBsZW1lbnRlcgogCiAKK0BpbXBs ZW1lbnRlcihJQm9keVByb2R1Y2VyKQogY2xhc3MgSlNPTlByb2R1Y2VyKG9iamVjdCk6CiAgICAg IiIiCiAgICAgUGVyZm9ybSBKU09OIGFzeW5jaHJvbm91c2x5IGFzIHRvIG5vdCBsb2NrIHRoZSBi dWlsZGJvdCBtYWluIGV2ZW50IGxvb3AKICAgICAiIiIKLSAgICBpbXBsZW1lbnRzKElCb2R5UHJv ZHVjZXIpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgZGF0YSk6CiAgICAgICAgIHRyeToKLSAg ICAgICAgICAgIHNlbGYuYm9keSA9IGpzb24uZHVtcHMoZGF0YSwgZGVmYXVsdD1zZWxmLmpzb25f c2VyaWFsaXplX2RhdGV0aW1lKQorICAgICAgICAgICAgc2VsZi5ib2R5ID0ganNvbi5kdW1wcyhk YXRhLCBkZWZhdWx0PXNlbGYuanNvbl9zZXJpYWxpemVfZGF0ZXRpbWUpLmVuY29kZSgndXRmLTgn KQogICAgICAgICBleGNlcHQgVHlwZUVycm9yOgogICAgICAgICAgICAgc2VsZi5ib2R5ID0gJycK ICAgICAgICAgc2VsZi5sZW5ndGggPSBsZW4oc2VsZi5ib2R5KQpAQCAtNzMsNyArNzMsNyBAQCBj bGFzcyBKU09OUHJvZHVjZXIob2JqZWN0KToKIAogY2xhc3MgRXZlbnRzKHNlcnZpY2UuQnVpbGRi b3RTZXJ2aWNlKToKIAotICAgIEVWRU5UX1NFUlZFUl9FTkRQT0lOVCA9ICdodHRwczovL2V3cy53 ZWJraXQub3JnL3Jlc3VsdHMvJworICAgIEVWRU5UX1NFUlZFUl9FTkRQT0lOVCA9IGInaHR0cHM6 Ly9ld3Mud2Via2l0LXVhdC5vcmcvcmVzdWx0cy8nCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwg bWFzdGVyX2hvc3RuYW1lLCB0eXBlX3ByZWZpeD0nJywgbmFtZT0nRXZlbnRzJyk6CiAgICAgICAg ICIiIgpAQCAtOTUsNyArOTUsNyBAQCBjbGFzcyBFdmVudHMoc2VydmljZS5CdWlsZGJvdFNlcnZp Y2UpOgogICAgICAgICBhZ2VudCA9IEFnZW50KHJlYWN0b3IpCiAgICAgICAgIGJvZHkgPSBKU09O UHJvZHVjZXIoZGF0YSkKIAotICAgICAgICBhZ2VudC5yZXF1ZXN0KCdQT1NUJywgc2VsZi5FVkVO VF9TRVJWRVJfRU5EUE9JTlQsIEhlYWRlcnMoeydDb250ZW50LVR5cGUnOiBbJ2FwcGxpY2F0aW9u L2pzb24nXX0pLCBib2R5KQorICAgICAgICBhZ2VudC5yZXF1ZXN0KGInUE9TVCcsIHNlbGYuRVZF TlRfU0VSVkVSX0VORFBPSU5ULCBIZWFkZXJzKHsnQ29udGVudC1UeXBlJzogWydhcHBsaWNhdGlv bi9qc29uJ119KSwgYm9keSkKIAogICAgIGRlZiBnZXRCdWlsZGVyTmFtZShzZWxmLCBidWlsZCk6 CiAgICAgICAgIGlmIG5vdCAoYnVpbGQgYW5kICdwcm9wZXJ0aWVzJyBpbiBidWlsZCk6Cg== 422131 2021-03-03 11:43:43 -0800 2021-03-03 14:00:29 -0800 Patch bug-222672-20210303144342.patch text/plain 2499 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MzgyOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTAzLTAzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBBZGQgcHl0aG9uIDMgc3VwcG9ydCAtIHBhcnQgNAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNjcyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdz LWJ1aWxkL2V2ZW50cy5weToKKyAgICAgICAgKEpTT05Qcm9kdWNlcik6IFVzZSBpbXBsZW1lbnRl ciAocHl0aG9uIDMgY29tcGF0aWJsZSkgaW5zdGVhZCBvZiBpbXBsZW1lbnRzLgorICAgICAgICAo SlNPTlByb2R1Y2VyLl9faW5pdF9fKTogRW5jb2RlIGRhdGEgYXMgdXRmLTggZXhwbGljaXRseS4K KyAgICAgICAgKEV2ZW50cyk6CisgICAgICAgIChFdmVudHMuc2VuZERhdGEpOgorCiAyMDIxLTAz LTAzICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAg IFJlcG9ydCB0aGUgY29ycmVjdCBkb2N1bWVudCB1cmkgaW4gdGhlIGNhc2Ugb2YgYSBDb250ZW50 U2VjdXJpdHlQb2xpY3lDbGllbnQKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZXZl bnRzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZXZlbnRzLnB5 CShyZXZpc2lvbiAyNzM4MjgpCisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2V2ZW50cy5w eQkod29ya2luZyBjb3B5KQpAQCAtMzQsMTggKzM0LDE4IEBAIGZyb20gdHdpc3RlZC5weXRob24g aW1wb3J0IGxvZwogZnJvbSB0d2lzdGVkLndlYi5jbGllbnQgaW1wb3J0IEFnZW50CiBmcm9tIHR3 aXN0ZWQud2ViLmh0dHBfaGVhZGVycyBpbXBvcnQgSGVhZGVycwogZnJvbSB0d2lzdGVkLndlYi5p d2ViIGltcG9ydCBJQm9keVByb2R1Y2VyCi1mcm9tIHpvcGUuaW50ZXJmYWNlIGltcG9ydCBpbXBs ZW1lbnRzCitmcm9tIHpvcGUuaW50ZXJmYWNlIGltcG9ydCBpbXBsZW1lbnRlcgogCiAKK0BpbXBs ZW1lbnRlcihJQm9keVByb2R1Y2VyKQogY2xhc3MgSlNPTlByb2R1Y2VyKG9iamVjdCk6CiAgICAg IiIiCiAgICAgUGVyZm9ybSBKU09OIGFzeW5jaHJvbm91c2x5IGFzIHRvIG5vdCBsb2NrIHRoZSBi dWlsZGJvdCBtYWluIGV2ZW50IGxvb3AKICAgICAiIiIKLSAgICBpbXBsZW1lbnRzKElCb2R5UHJv ZHVjZXIpCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgZGF0YSk6CiAgICAgICAgIHRyeToKLSAg ICAgICAgICAgIHNlbGYuYm9keSA9IGpzb24uZHVtcHMoZGF0YSwgZGVmYXVsdD1zZWxmLmpzb25f c2VyaWFsaXplX2RhdGV0aW1lKQorICAgICAgICAgICAgc2VsZi5ib2R5ID0ganNvbi5kdW1wcyhk YXRhLCBkZWZhdWx0PXNlbGYuanNvbl9zZXJpYWxpemVfZGF0ZXRpbWUpLmVuY29kZSgndXRmLTgn KQogICAgICAgICBleGNlcHQgVHlwZUVycm9yOgogICAgICAgICAgICAgc2VsZi5ib2R5ID0gJycK ICAgICAgICAgc2VsZi5sZW5ndGggPSBsZW4oc2VsZi5ib2R5KQpAQCAtNzMsNyArNzMsNyBAQCBj bGFzcyBKU09OUHJvZHVjZXIob2JqZWN0KToKIAogY2xhc3MgRXZlbnRzKHNlcnZpY2UuQnVpbGRi b3RTZXJ2aWNlKToKIAotICAgIEVWRU5UX1NFUlZFUl9FTkRQT0lOVCA9ICdodHRwczovL2V3cy53 ZWJraXQub3JnL3Jlc3VsdHMvJworICAgIEVWRU5UX1NFUlZFUl9FTkRQT0lOVCA9IGInaHR0cHM6 Ly9ld3Mud2Via2l0Lm9yZy9yZXN1bHRzLycKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBtYXN0 ZXJfaG9zdG5hbWUsIHR5cGVfcHJlZml4PScnLCBuYW1lPSdFdmVudHMnKToKICAgICAgICAgIiIi CkBAIC05NSw3ICs5NSw3IEBAIGNsYXNzIEV2ZW50cyhzZXJ2aWNlLkJ1aWxkYm90U2VydmljZSk6 CiAgICAgICAgIGFnZW50ID0gQWdlbnQocmVhY3RvcikKICAgICAgICAgYm9keSA9IEpTT05Qcm9k dWNlcihkYXRhKQogCi0gICAgICAgIGFnZW50LnJlcXVlc3QoJ1BPU1QnLCBzZWxmLkVWRU5UX1NF UlZFUl9FTkRQT0lOVCwgSGVhZGVycyh7J0NvbnRlbnQtVHlwZSc6IFsnYXBwbGljYXRpb24vanNv biddfSksIGJvZHkpCisgICAgICAgIGFnZW50LnJlcXVlc3QoYidQT1NUJywgc2VsZi5FVkVOVF9T RVJWRVJfRU5EUE9JTlQsIEhlYWRlcnMoeydDb250ZW50LVR5cGUnOiBbJ2FwcGxpY2F0aW9uL2pz b24nXX0pLCBib2R5KQogCiAgICAgZGVmIGdldEJ1aWxkZXJOYW1lKHNlbGYsIGJ1aWxkKToKICAg ICAgICAgaWYgbm90IChidWlsZCBhbmQgJ3Byb3BlcnRpZXMnIGluIGJ1aWxkKToK