225784 2021-05-13 15:03:39 -0700 [ews] Style fixes in steps.py 2021-05-13 16:32:20 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain dewei_zhu jbedard webkit-bug-importer oldest_to_newest 1759850 0 aakash_jain 2021-05-13 15:03:39 -0700 check-webkit-style reports various issues in Tools/CISupport/ews-build/steps.py. We should fix them. 1759851 1 428566 aakash_jain 2021-05-13 15:04:14 -0700 Created attachment 428566 [fast-cq] Patch 1759856 2 428566 dewei_zhu 2021-05-13 15:25:17 -0700 Comment on attachment 428566 [fast-cq] Patch r=me 1759891 3 ews-feeder 2021-05-13 16:31:19 -0700 Committed r277465 (237708@main): <https://commits.webkit.org/237708@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428566. 1759892 4 webkit-bug-importer 2021-05-13 16:32:20 -0700 <rdar://problem/77992967> 428566 2021-05-13 15:04:14 -0700 2021-05-13 16:31:20 -0700 [fast-cq] Patch bug-225784-20210513180413.patch text/plain 6604 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NzQ1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA1LTEzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzXSBTdHlsZSBmaXhlcyBpbiBzdGVwcy5weQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1Nzg0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tPdXRTb3VyY2UuX19pbml0X18pOgorICAgICAgICAo U2hvd0lkZW50aWZpZXIuaGlkZVN0ZXBJZik6CisgICAgICAgIChCdWd6aWxsYU1peGluLmdldF9i dWd6aWxsYV9hcGlfa2V5KToKKyAgICAgICAgKFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMuY29tbWFu ZENvbXBsZXRlKToKKyAgICAgICAgKEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMuc2VuZF9lbWFpbF9m b3JfcHJlX2V4aXN0aW5nX2ZhaWx1cmUpOgorICAgICAgICAoQW5hbHl6ZUxheW91dFRlc3RzUmVz dWx0cy5fcmVwb3J0X2ZsYWt5X3Rlc3RzKToKKyAgICAgICAgKERvd25sb2FkQnVpbHRQcm9kdWN0 KToKKyAgICAgICAgKEFuYWx5emVBUElUZXN0c1Jlc3VsdHMuYW5hbHl6ZVJlc3VsdHMuZ2V0QVBJ VGVzdEZhaWx1cmVzKToKKyAgICAgICAgKEFuYWx5emVBUElUZXN0c1Jlc3VsdHMuc2VuZF9lbWFp bF9mb3JfcHJlX2V4aXN0aW5nX2ZhaWx1cmUpOgorCiAyMDIxLTA1LTEzICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIHVuaXQgdGVzdCB1 c2luZyBXS0hUVFBDb29raWVTdG9yZU9ic2VydmVyIGFuZCBjb29raWVzIHJlY2VpdmVkIGZyb20g SFRUUApJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNzc0NTMp CisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0xMTEsMTMgKzExMSwxMyBAQCBjbGFzcyBDaGVja091dFNvdXJjZShnaXQuR2l0KToKIAogICAg IGRlZiBfX2luaXRfXyhzZWxmLCByZXBvdXJsPSdodHRwczovL2dpdGh1Yi5jb20vV2ViS2l0L1dl YktpdC5naXQnLCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKENoZWNrT3V0U291cmNlLCBzZWxm KS5fX2luaXRfXyhyZXBvdXJsPXJlcG91cmwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXRyeT1zZWxmLkNIRUNLT1VUX0RFTEFZX0FORF9NQVhfUkVU UklFU19QQUlSLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdGltZW91dD0yICogNjAgKiA2MCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFsd2F5c1VzZUxhdGVzdD1UcnVlLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ldGhvZD0nY2xlYW4nLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvZ3Jlc3M9 VHJ1ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICoq a3dhcmdzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0 cnk9c2VsZi5DSEVDS09VVF9ERUxBWV9BTkRfTUFYX1JFVFJJRVNfUEFJUiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9MiAqIDYwICogNjAsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbHdheXNVc2VMYXRl c3Q9VHJ1ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxv Z0Vudmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtZXRob2Q9J2NsZWFuJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHByb2dyZXNzPVRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAqKmt3YXJncykKIAogICAgIGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYp OgogICAgICAgICBpZiBzZWxmLnJlc3VsdHMgPT0gRkFJTFVSRToKQEAgLTI1NCw2ICsyNTQsNyBA QCBjbGFzcyBTaG93SWRlbnRpZmllcihzaGVsbC5TaGVsbENvbW1hbmQpCiAgICAgZGVmIGhpZGVT dGVwSWYoc2VsZiwgcmVzdWx0cywgc3RlcCk6CiAgICAgICAgIHJldHVybiByZXN1bHRzID09IFNV Q0NFU1MKIAorCiBjbGFzcyBDbGVhbldvcmtpbmdEaXJlY3Rvcnkoc2hlbGwuU2hlbGxDb21tYW5k KToKICAgICBuYW1lID0gJ2NsZWFuLXdvcmtpbmctZGlyZWN0b3J5JwogICAgIGRlc2NyaXB0aW9u ID0gWydjbGVhbi13b3JraW5nLWRpcmVjdG9yeSBydW5uaW5nJ10KQEAgLTcxNSw3ICs3MTYsNyBA QCBjbGFzcyBCdWd6aWxsYU1peGluKG9iamVjdCk6CiAgICAgICAgIHRyeToKICAgICAgICAgICAg IHBhc3N3b3JkcyA9IGpzb24ubG9hZChvcGVuKCdwYXNzd29yZHMuanNvbicpKQogICAgICAgICAg ICAgcmV0dXJuIHBhc3N3b3Jkcy5nZXQoJ0JVR1pJTExBX0FQSV9LRVknLCAnJykKLSAgICAgICAg ZXhjZXB0OgorICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICBwcmlu dCgnRXJyb3IgaW4gcmVhZGluZyBCdWd6aWxsYSBhcGkga2V5JykKICAgICAgICAgICAgIHJldHVy biAnJwogCkBAIC0xODM2LDE1ICsxODM3LDE1IEBAIGNsYXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVz dHMoc2hlbGwuVGVzdCkKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRlcnInLCAnRVJS T1I6IHVuYWJsZSB0byBwYXJzZSBkYXRhLCBleGNlcHRpb246IHt9Jy5mb3JtYXQoZXgpKQogICAg ICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxNYXNtVGVz dHNQYXNzZWQnKSA9PSBGYWxzZToKKyAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxNYXNt VGVzdHNQYXNzZWQnKSBpcyBGYWxzZToKICAgICAgICAgICAgIHNlbGYuYmluYXJ5RmFpbHVyZXMu YXBwZW5kKCd0ZXN0bWFzbScpCi0gICAgICAgIGlmIGpzY19yZXN1bHRzLmdldCgnYWxsQWlyVGVz dHNQYXNzZWQnKSA9PSBGYWxzZToKKyAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxBaXJU ZXN0c1Bhc3NlZCcpIGlzIEZhbHNlOgogICAgICAgICAgICAgc2VsZi5iaW5hcnlGYWlsdXJlcy5h cHBlbmQoJ3Rlc3RhaXInKQotICAgICAgICBpZiBqc2NfcmVzdWx0cy5nZXQoJ2FsbEIzVGVzdHNQ YXNzZWQnKSA9PSBGYWxzZToKKyAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxCM1Rlc3Rz UGFzc2VkJykgaXMgRmFsc2U6CiAgICAgICAgICAgICBzZWxmLmJpbmFyeUZhaWx1cmVzLmFwcGVu ZCgndGVzdGIzJykKLSAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxERkdUZXN0c1Bhc3Nl ZCcpID09IEZhbHNlOgorICAgICAgICBpZiBqc2NfcmVzdWx0cy5nZXQoJ2FsbERGR1Rlc3RzUGFz c2VkJykgaXMgRmFsc2U6CiAgICAgICAgICAgICBzZWxmLmJpbmFyeUZhaWx1cmVzLmFwcGVuZCgn dGVzdGRmZycpCi0gICAgICAgIGlmIGpzY19yZXN1bHRzLmdldCgnYWxsQXBpVGVzdHNQYXNzZWQn KSA9PSBGYWxzZToKKyAgICAgICAgaWYganNjX3Jlc3VsdHMuZ2V0KCdhbGxBcGlUZXN0c1Bhc3Nl ZCcpIGlzIEZhbHNlOgogICAgICAgICAgICAgc2VsZi5iaW5hcnlGYWlsdXJlcy5hcHBlbmQoJ3Rl c3RhcGknKQogCiAgICAgICAgIHNlbGYuc3RyZXNzVGVzdEZhaWx1cmVzID0ganNjX3Jlc3VsdHMu Z2V0KCdzdHJlc3NUZXN0RmFpbHVyZXMnKQpAQCAtMjAyNSw3ICsyMDI2LDYgQEAgY2xhc3MgQW5h bHl6ZUpTQ1Rlc3RzUmVzdWx0cyhidWlsZHN0ZXAuQgogICAgICAgICAgICAgcHJpbnQoJ0Vycm9y IGluIHNlbmRpbmcgZW1haWwgZm9yIHByZS1leGlzdGluZyBmYWlsdXJlOiB7fScuZm9ybWF0KGUp KQogCiAKLQogY2xhc3MgQ2xlYW5CdWlsZChzaGVsbC5Db21waWxlKToKICAgICBuYW1lID0gJ2Rl bGV0ZS1XZWJLaXRCdWlsZC1kaXJlY3RvcnknCiAgICAgZGVzY3JpcHRpb24gPSBbJ2RlbGV0aW5n IFdlYktpdEJ1aWxkIGRpcmVjdG9yeSddCkBAIC0yNTQzLDcgKzI1NDMsNyBAQCBjbGFzcyBBbmFs eXplTGF5b3V0VGVzdHNSZXN1bHRzKGJ1aWxkc3RlCiAgICAgICAgICAgICBwcmludCgnRXJyb3Ig aW4gc2VuZGluZyBlbWFpbCBmb3IgbmV3IGxheW91dCB0ZXN0IGZhaWx1cmVzOiB7fScuZm9ybWF0 KGUpKQogCiAgICAgZGVmIF9yZXBvcnRfZmxha3lfdGVzdHMoc2VsZiwgZmxha3lfdGVzdHMpOgot ICAgICAgICAjVE9ETzogaW1wbGVtZW50IHRoaXMKKyAgICAgICAgIyBUT0RPOiBpbXBsZW1lbnQg dGhpcwogICAgICAgICBwYXNzCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CkBAIC0yNzAwLDggKzI3 MDAsOCBAQCBjbGFzcyBUcmFuc2ZlclRvUzMobWFzdGVyLk1hc3RlclNoZWxsQ29tCiAKIGNsYXNz IERvd25sb2FkQnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgY29tbWFuZCA9 IFsncHl0aG9uJywgJ1Rvb2xzL0NJU3VwcG9ydC9kb3dubG9hZC1idWlsdC1wcm9kdWN0JywKLSAg ICAgICAgV2l0aFByb3BlcnRpZXMoJy0tJShjb25maWd1cmF0aW9uKXMnKSwKLSAgICAgICAgV2l0 aFByb3BlcnRpZXMoUzNVUkwgKyAnZXdzLWFyY2hpdmVzLndlYmtpdC5vcmcvJShmdWxsUGxhdGZv cm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAn KV0KKyAgICAgICAgICAgICAgIFdpdGhQcm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyks CisgICAgICAgICAgICAgICBXaXRoUHJvcGVydGllcyhTM1VSTCArICdld3MtYXJjaGl2ZXMud2Vi a2l0Lm9yZy8lKGZ1bGxQbGF0Zm9ybSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9u KXMvJShwYXRjaF9pZClzLnppcCcpXQogICAgIG5hbWUgPSAnZG93bmxvYWQtYnVpbHQtcHJvZHVj dCcKICAgICBkZXNjcmlwdGlvbiA9IFsnZG93bmxvYWRpbmcgYnVpbHQgcHJvZHVjdCddCiAgICAg ZGVzY3JpcHRpb25Eb25lID0gWydEb3dubG9hZGVkIGJ1aWx0IHByb2R1Y3QnXQpAQCAtMjg3NCw4 ICsyODc0LDggQEAgY2xhc3MgQW5hbHl6ZUFQSVRlc3RzUmVzdWx0cyhidWlsZHN0ZXAuQgogICAg ICAgICAgICAgICAgIHJldHVybiBzZXQoW10pCiAgICAgICAgICAgICAjIFRPRE86IEFuYWx5emUg VGltZS1vdXQsIENyYXNoIGFuZCBGYWlsdXJlIGluZGVwZW5kZW50bHkKICAgICAgICAgICAgIHJl dHVybiBzZXQoW2ZhaWx1cmUuZ2V0KCduYW1lJykgZm9yIGZhaWx1cmUgaW4gcmVzdWx0LmdldCgn VGltZWRvdXQnLCBbXSldICsKLSAgICAgICAgICAgICAgICBbZmFpbHVyZS5nZXQoJ25hbWUnKSBm b3IgZmFpbHVyZSBpbiByZXN1bHQuZ2V0KCdDcmFzaGVkJywgW10pXSArCi0gICAgICAgICAgICAg ICAgW2ZhaWx1cmUuZ2V0KCduYW1lJykgZm9yIGZhaWx1cmUgaW4gcmVzdWx0LmdldCgnRmFpbGVk JywgW10pXSkKKyAgICAgICAgICAgICAgICAgICAgICAgW2ZhaWx1cmUuZ2V0KCduYW1lJykgZm9y IGZhaWx1cmUgaW4gcmVzdWx0LmdldCgnQ3Jhc2hlZCcsIFtdKV0gKworICAgICAgICAgICAgICAg ICAgICAgICBbZmFpbHVyZS5nZXQoJ25hbWUnKSBmb3IgZmFpbHVyZSBpbiByZXN1bHQuZ2V0KCdG YWlsZWQnLCBbXSldKQogCiAgICAgICAgIGZpcnN0X3J1bl9mYWlsdXJlcyA9IGdldEFQSVRlc3RG YWlsdXJlcyhmaXJzdF9ydW5fcmVzdWx0cykKICAgICAgICAgc2Vjb25kX3J1bl9mYWlsdXJlcyA9 IGdldEFQSVRlc3RGYWlsdXJlcyhzZWNvbmRfcnVuX3Jlc3VsdHMpCkBAIC0yOTg4LDYgKzI5ODgs NyBAQCBjbGFzcyBBbmFseXplQVBJVGVzdHNSZXN1bHRzKGJ1aWxkc3RlcC5CCiAgICAgICAgIGV4 Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIHByaW50KCdFcnJvciBpbiBzZW5kaW5n IGVtYWlsIGZvciBwcmUtZXhpc3RpbmcgZmFpbHVyZToge30nLmZvcm1hdChlKSkKIAorCiBjbGFz cyBBcmNoaXZlVGVzdFJlc3VsdHMoc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBjb21tYW5kID0g WydweXRob24nLCAnVG9vbHMvQ0lTdXBwb3J0L3Rlc3QtcmVzdWx0LWFyY2hpdmUnLAogICAgICAg ICAgICAgICAgSW50ZXJwb2xhdGUoJy0tcGxhdGZvcm09JShwcm9wOnBsYXRmb3JtKXMnKSwgSW50 ZXJwb2xhdGUoJy0tJShwcm9wOmNvbmZpZ3VyYXRpb24pcycpLCAnYXJjaGl2ZSddCg==