214194 2020-07-10 12:34:37 -0700 EWS should set cq- flag when a patch fails to build or introduces layout-test failures 2020-09-09 14:52:26 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208941 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap darin jbedard rniwa ryanhaddad tsavell webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1670526 0 aakash_jain 2020-07-10 12:34:37 -0700 EWS should set cq- flag on the patch when that patch fails to build. This would help in two ways: #1: making sure commit-queue doesn't commit a patch if it fails to build webkit on any configuration (e.g.: ios, win, wpe, gtk, watch, tv etc.) #2: Bugzilla would send an email notification when patch fails to build (notification about patch being marked as cq-). Also, if a patch is already marked cq-, subsequent attempt to mark it cq- would be ignored by Bugzilla. So, if a patch fails to build on multiple configuration, bugzilla will set cq- only once and generate only one email notification. 1670528 1 403989 aakash_jain 2020-07-10 12:36:43 -0700 Created attachment 403989 Patch 1670531 2 aakash_jain 2020-07-10 12:38:55 -0700 Sample run: https://ews-build.webkit-uat.org/#/builders/35/builds/2573 1670546 3 403993 aakash_jain 2020-07-10 13:08:56 -0700 Created attachment 403993 Patch 1670554 4 aakash_jain 2020-07-10 13:11:44 -0700 Updated the patch to include the case of patch introducing layout-test failure. EWS should cq- patch in that case as well. 1673291 5 webkit-bug-importer 2020-07-20 16:03:20 -0700 <rdar://problem/65852947> 1673320 6 403993 jbedard 2020-07-20 16:38:29 -0700 Comment on attachment 403993 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403993&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:1941 > + self.build.addStepsAfterCurrentStep([SetCommitQueueMinusFlagOnPatch()]) To clarify, this only does anything if a patch is in commit queue and tests fail before it lands, right? 1680406 7 aakash_jain 2020-08-14 12:26:46 -0700 (In reply to Aakash Jain from comment #4) > Updated the patch to include the case of patch introducing layout-test failure. EWS should cq- patch in that case as well. Since we have various flaky layout tests, they can causing false positives as well (causing cq- flag on the bug unnecessarily). 1686646 8 aakash_jain 2020-09-08 11:37:33 -0700 (In reply to Jonathan Bedard from comment #6) > To clarify, this only does anything if a patch is in commit queue and tests fail before it lands, right? This marks the patch cq- irrespective of whether the patch is in commit-queue or not. If patch is in commit-queue, and patch is marked cq-, commit-queue would not land it. Engineers can always override it by setting cq+ flag again. 1686652 9 408249 aakash_jain 2020-09-08 11:50:09 -0700 Created attachment 408249 Patch 1686677 10 ews-feeder 2020-09-08 12:29:31 -0700 Committed r266741: <https://trac.webkit.org/changeset/266741> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408249. 1687126 11 darin 2020-09-09 14:22:58 -0700 Would be better if this was refined so that it will not add a "commit-queue-" to an obsolete patch. Doing that generates notification mail that's not valuable and has no other practical effect. I’ve been getting that mail. 1687130 12 aakash_jain 2020-09-09 14:39:14 -0700 (In reply to Darin Adler from comment #11) > Would be better if this was refined so that it will not add a "commit-queue-" to an obsolete patch. That's a good point. I will make that change. Also, what should be the behavior in these two scenarios (should the cq- flag be set by ews or not): 1) when the patch is already marked r- 2) when corresponding bug is already resolved (patch already landed either through commit-queue or manually). 1687132 13 darin 2020-09-09 14:52:26 -0700 (In reply to Aakash Jain from comment #12) > Also, what should be the behavior in these two scenarios (should the cq- > flag be set by ews or not): > 1) when the patch is already marked r- > > 2) when corresponding bug is already resolved (patch already landed either > through commit-queue or manually). In both these cases I don’t see a lot of value adding commit-queue-. I suppose that if commit-queue? or commit-queue+ was set, I might think it’s OK to *change* it to commit-queue-. But it’s not great to add a “commit-queue-“ when nothing indicates we intend to commit the patch and no one was saying anything about the commit queue at all. 403989 2020-07-10 12:36:43 -0700 2020-07-10 13:08:53 -0700 Patch bug-214194-20200710153641.patch text/plain 2555 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDIzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTA3LTEwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBld3Mgc2hvdWxkIHNldCBjcS0gZmxhZyB3aGVuIGEgcGF0Y2ggZmFpbHMg dG8gYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQW5hbHl6 ZUNvbXBpbGVXZWJLaXRSZXN1bHRzLnN0YXJ0KToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0QW5hbHl6ZUNvbXBp bGVXZWJLaXRSZXN1bHRzLnRlc3RfcGF0Y2hfd2l0aF9idWlsZF9mYWlsdXJlKToKKwogMjAyMC0w Ny0xMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0VX U10gbGF5b3V0LXRlc3QgcmVzdWx0cyBzaG91bGRuJ3QgYmUgaG9zdGVkIG9uIGV3cyBzZXJ2ZXIK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlz aW9uIDI2NDIzNCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQkod29ya2luZyBjb3B5KQpAQCAtMTM3OSwxMiArMTM3OSwxMiBAQCBjbGFzcyBBbmFseXplQ29t cGlsZVdlYktpdFJlc3VsdHMoYnVpbGRzCiAgICAgICAgIHBhdGNoX2lkID0gc2VsZi5nZXRQcm9w ZXJ0eSgncGF0Y2hfaWQnLCAnJykKICAgICAgICAgbWVzc2FnZSA9ICdQYXRjaCB7fSBkb2VzIG5v dCBidWlsZCcuZm9ybWF0KHBhdGNoX2lkKQogICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9 IG1lc3NhZ2UKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnkn LCBtZXNzYWdlKQogICAgICAgICBpZiBzZWxmLmdldFByb3BlcnR5KCdidWlsZGVybmFtZScsICcn KS5sb3dlcigpID09ICdjb21taXQtcXVldWUnOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0 eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JywgbWVzc2FnZSkKLSAgICAgICAgICAgIHNlbGYuc2V0 UHJvcGVydHkoJ2J1aWxkX2ZpbmlzaF9zdW1tYXJ5JywgbWVzc2FnZSkKICAgICAgICAgICAgIHNl bGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtDb21tZW50T25CdWcoKSwgU2V0Q29t bWl0UXVldWVNaW51c0ZsYWdPblBhdGNoKCldKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAg c2VsZi5idWlsZC5idWlsZEZpbmlzaGVkKFttZXNzYWdlXSwgRkFJTFVSRSkKKyAgICAgICAgICAg IHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtTZXRDb21taXRRdWV1ZU1pbnVz RmxhZ09uUGF0Y2goKV0pCiAKICAgICAgICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKIApJ bmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191 bml0dGVzdC5weQkocmV2aXNpb24gMjY0MjM0KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMDc4LDcgKzEw NzgsNyBAQCBjbGFzcyBUZXN0QW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKEJ1CiAgICAgICAg IHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdQYXRjaCAx MjM0IGRvZXMgbm90IGJ1aWxkIChmYWlsdXJlKScpCiAgICAgICAgIHJjID0gc2VsZi5ydW5TdGVw KCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWd6aWxsYV9j b21tZW50X3RleHQnKSwgTm9uZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFBy b3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScpLCBOb25lKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkX2ZpbmlzaF9zdW1tYXJ5JyksICdQYXRjaCAx MjM0IGRvZXMgbm90IGJ1aWxkJykKICAgICAgICAgcmV0dXJuIHJjCiAKICAgICBkZWYgdGVzdF9w YXRjaF93aXRoX2J1aWxkX2ZhaWx1cmVfb25fY29tbWl0X3F1ZXVlKHNlbGYpOgo= 403993 2020-07-10 13:08:56 -0700 2020-09-08 11:50:06 -0700 Patch bug-214194-20200710160855.patch text/plain 4261 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NDIzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA3LTEwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1Mgc2hvdWxkIHNldCBjcS0gZmxhZyB3aGVuIGEgcGF0Y2ggZmFpbHMg dG8gYnVpbGQgb3IgaW50cm9kdWNlcyBsYXlvdXQtdGVzdCBmYWlsdXJlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTk0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAgIChBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMu c3RhcnQpOiBTZXQgY3EtIG9uIHBhdGNoIHdoZW4gcGF0Y2ggZmFpbHMgdG8gYnVpbGQuCisgICAg ICAgIChBbmFseXplTGF5b3V0VGVzdHNSZXN1bHRzLnJlcG9ydF9mYWlsdXJlKTogU2V0IGNxLSBv biBwYXRjaCB3aGVuIHBhdGNoIGludHJvZHVjZXMgbGF5b3V0LXRlc3QgZmFpbHVyZXMuCisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBVcGRh dGVkIHVuaXQtdGVzdHMuCisgICAgICAgIChUZXN0QW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRz LnRlc3RfcGF0Y2hfd2l0aF9idWlsZF9mYWlsdXJlKToKKyAgICAgICAgKFRlc3RBbmFseXplTGF5 b3V0VGVzdHNSZXN1bHRzLnRlc3RfZmxha3lfYW5kX2NvbnNpc3RlbnRfZmFpbHVyZXNfd2l0aG91 dF9jbGVhbl90cmVlX2ZhaWx1cmVzKToKKwogMjAyMC0wNy0xMCAgQWFrYXNoIEphaW4gIDxhYWth c2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0VXU10gbGF5b3V0LXRlc3QgcmVzdWx0cyBz aG91bGRuJ3QgYmUgaG9zdGVkIG9uIGV3cyBzZXJ2ZXIKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI2NDIzNCkKKysrIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTM3 OSwxMiArMTM3OSwxMiBAQCBjbGFzcyBBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMoYnVpbGRz CiAgICAgICAgIHBhdGNoX2lkID0gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnJykKICAg ICAgICAgbWVzc2FnZSA9ICdQYXRjaCB7fSBkb2VzIG5vdCBidWlsZCcuZm9ybWF0KHBhdGNoX2lk KQogICAgICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IG1lc3NhZ2UKKyAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknLCBtZXNzYWdlKQogICAgICAgICBpZiBz ZWxmLmdldFByb3BlcnR5KCdidWlsZGVybmFtZScsICcnKS5sb3dlcigpID09ICdjb21taXQtcXVl dWUnOgogICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYnVnemlsbGFfY29tbWVudF90ZXh0 JywgbWVzc2FnZSkKLSAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxkX2ZpbmlzaF9z dW1tYXJ5JywgbWVzc2FnZSkKICAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1 cnJlbnRTdGVwKFtDb21tZW50T25CdWcoKSwgU2V0Q29tbWl0UXVldWVNaW51c0ZsYWdPblBhdGNo KCldKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5idWlsZC5idWlsZEZpbmlzaGVk KFttZXNzYWdlXSwgRkFJTFVSRSkKKyAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRl ckN1cnJlbnRTdGVwKFtTZXRDb21taXRRdWV1ZU1pbnVzRmxhZ09uUGF0Y2goKV0pCiAKICAgICAg ICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKIApAQCAtMTkzMiwxMyArMTkzMiwxMyBAQCBj bGFzcyBBbmFseXplTGF5b3V0VGVzdHNSZXN1bHRzKGJ1aWxkc3RlCiAgICAgICAgIGlmIGxlbihu ZXdfZmFpbHVyZXMpID4gc2VsZi5OVU1fRkFJTFVSRVNfVE9fRElTUExBWToKICAgICAgICAgICAg IG1lc3NhZ2UgKz0gJyAuLi4nCiAgICAgICAgIHNlbGYuZGVzY3JpcHRpb25Eb25lID0gbWVzc2Fn ZQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScsIG1lc3Nh Z2UpCiAKICAgICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93 ZXIoKSA9PSAnY29tbWl0LXF1ZXVlJzoKICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1 Z3ppbGxhX2NvbW1lbnRfdGV4dCcsIG1lc3NhZ2UpCi0gICAgICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScsIG1lc3NhZ2UpCiAgICAgICAgICAgICBzZWxmLmJ1 aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1 ZXVlTWludXNGbGFnT25QYXRjaCgpXSkKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYu YnVpbGQuYnVpbGRGaW5pc2hlZChbbWVzc2FnZV0sIEZBSUxVUkUpCisgICAgICAgICAgICBzZWxm LmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbU2V0Q29tbWl0UXVldWVNaW51c0ZsYWdP blBhdGNoKCldKQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCiAgICAgZGVm IHJlcG9ydF9wcmVfZXhpc3RpbmdfZmFpbHVyZXMoc2VsZiwgY2xlYW5fdHJlZV9mYWlsdXJlcywg Zmxha3lfZmFpbHVyZXMpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjY0MjM0KQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xMDc4LDcgKzEwNzgsNyBAQCBjbGFzcyBUZXN0QW5hbHl6ZUNvbXBpbGVXZWJLaXRS ZXN1bHRzKEJ1CiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3Rh dGVfc3RyaW5nPSdQYXRjaCAxMjM0IGRvZXMgbm90IGJ1aWxkIChmYWlsdXJlKScpCiAgICAgICAg IHJjID0gc2VsZi5ydW5TdGVwKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFBy b3BlcnR5KCdidWd6aWxsYV9jb21tZW50X3RleHQnKSwgTm9uZSkKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScpLCBOb25lKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkX2ZpbmlzaF9z dW1tYXJ5JyksICdQYXRjaCAxMjM0IGRvZXMgbm90IGJ1aWxkJykKICAgICAgICAgcmV0dXJuIHJj CiAKICAgICBkZWYgdGVzdF9wYXRjaF93aXRoX2J1aWxkX2ZhaWx1cmVfb25fY29tbWl0X3F1ZXVl KHNlbGYpOgpAQCAtMTg5OCw3ICsxODk4LDcgQEAgY2xhc3MgVGVzdEFuYWx5emVMYXlvdXRUZXN0 c1Jlc3VsdHMoQnVpbAogICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUs IHN0YXRlX3N0cmluZz0nRm91bmQgMSBuZXcgdGVzdCBmYWlsdXJlOiB0ZXN0MSAoZmFpbHVyZSkn KQogICAgICAgICByYyA9IHNlbGYucnVuU3RlcCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c2VsZi5nZXRQcm9wZXJ0eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JyksIE5vbmUpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnkn KSwgTm9uZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWls ZF9maW5pc2hfc3VtbWFyeScpLCAnRm91bmQgMSBuZXcgdGVzdCBmYWlsdXJlOiB0ZXN0MScpCiAg ICAgICAgIHJldHVybiByYwogCiAgICAgZGVmIHRlc3RfY29uc2lzdGVudF9mYWlsdXJlX3dpdGhv dXRfY2xlYW5fdHJlZV9mYWlsdXJlc19jb21taXRfcXVldWUoc2VsZik6Cg== 408249 2020-09-08 11:50:09 -0700 2020-09-08 12:29:31 -0700 Patch bug-214194-20200908145008.patch text/plain 4024 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NjczNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTA5LTA4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBFV1Mgc2hvdWxkIHNldCBjcS0gZmxhZyB3aGVuIGEgcGF0Y2ggZmFpbHMg dG8gYnVpbGQgb3IgaW50cm9kdWNlcyBsYXlvdXQtdGVzdCBmYWlsdXJlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTk0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgSm9uYXRoYW4gQmVkYXJkLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRz LnN0YXJ0KTogU2V0IGNxLSBvbiBwYXRjaCB3aGVuIHBhdGNoIGZhaWxzIHRvIGJ1aWxkLgorICAg ICAgICAoQW5hbHl6ZUxheW91dFRlc3RzUmVzdWx0cy5yZXBvcnRfZmFpbHVyZSk6IFNldCBjcS0g b24gcGF0Y2ggd2hlbiBwYXRjaCBpbnRyb2R1Y2VzIGxheW91dC10ZXN0IGZhaWx1cmVzLgorICAg ICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weTogVXBk YXRlZCB1bml0LXRlc3RzLgorCiAyMDIwLTA5LTA4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWlu QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgaHR0cHMgdXJscyBpbnN0ZWFkIG9mIGh0dHAgaW4g d2Via2l0cHkKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMu cHkJKHJldmlzaW9uIDI2NjczNCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTQ0MywxMiArMTQ0MywxMiBAQCBjbGFzcyBB bmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMoYnVpbGRzCiAgICAgICAgIHNlbGYuc2VuZF9lbWFp bF9mb3JfbmV3X2J1aWxkX2ZhaWx1cmUoKQogCiAgICAgICAgIHNlbGYuZGVzY3JpcHRpb25Eb25l ID0gbWVzc2FnZQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFy eScsIG1lc3NhZ2UpCiAgICAgICAgIGlmIHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywg JycpLmxvd2VyKCkgPT0gJ2NvbW1pdC1xdWV1ZSc6CiAgICAgICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdidWd6aWxsYV9jb21tZW50X3RleHQnLCBtZXNzYWdlKQotICAgICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknLCBtZXNzYWdlKQogICAgICAgICAgICAg c2VsZi5idWlsZC5hZGRTdGVwc0FmdGVyQ3VycmVudFN0ZXAoW0NvbW1lbnRPbkJ1ZygpLCBTZXRD b21taXRRdWV1ZU1pbnVzRmxhZ09uUGF0Y2goKV0pCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICBzZWxmLmJ1aWxkLmJ1aWxkRmluaXNoZWQoW21lc3NhZ2VdLCBGQUlMVVJFKQorICAgICAgICAg ICAgc2VsZi5idWlsZC5hZGRTdGVwc0FmdGVyQ3VycmVudFN0ZXAoW1NldENvbW1pdFF1ZXVlTWlu dXNGbGFnT25QYXRjaCgpXSkKIAogICAgIEBkZWZlci5pbmxpbmVDYWxsYmFja3MKICAgICBkZWYg Z2V0UmVzdWx0cyhzZWxmLCBuYW1lKToKQEAgLTIxMjksMTMgKzIxMjksMTMgQEAgY2xhc3MgQW5h bHl6ZUxheW91dFRlc3RzUmVzdWx0cyhidWlsZHN0ZQogICAgICAgICAgICAgbWVzc2FnZSArPSAn IC4uLicKICAgICAgICAgc2VsZi5kZXNjcmlwdGlvbkRvbmUgPSBtZXNzYWdlCiAgICAgICAgIHNl bGYuc2VuZF9lbWFpbF9mb3JfbmV3X3Rlc3RfZmFpbHVyZXMobmV3X2ZhaWx1cmVzKQorICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScsIG1lc3NhZ2UpCiAKICAg ICAgICAgaWYgc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93ZXIoKSA9PSAn Y29tbWl0LXF1ZXVlJzoKICAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1Z3ppbGxhX2Nv bW1lbnRfdGV4dCcsIG1lc3NhZ2UpCi0gICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWls ZF9maW5pc2hfc3VtbWFyeScsIG1lc3NhZ2UpCiAgICAgICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0 ZXBzQWZ0ZXJDdXJyZW50U3RlcChbQ29tbWVudE9uQnVnKCksIFNldENvbW1pdFF1ZXVlTWludXNG bGFnT25QYXRjaCgpXSkKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuYnVpbGQuYnVp bGRGaW5pc2hlZChbbWVzc2FnZV0sIEZBSUxVUkUpCisgICAgICAgICAgICBzZWxmLmJ1aWxkLmFk ZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbU2V0Q29tbWl0UXVldWVNaW51c0ZsYWdPblBhdGNoKCld KQogICAgICAgICByZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQogCiAgICAgZGVmIHJlcG9ydF9w cmVfZXhpc3RpbmdfZmFpbHVyZXMoc2VsZiwgY2xlYW5fdHJlZV9mYWlsdXJlcywgZmxha3lfZmFp bHVyZXMpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3Vu aXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjY2NzM0KQorKysgVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0x MDgyLDcgKzEwODIsNyBAQCBjbGFzcyBUZXN0QW5hbHl6ZUNvbXBpbGVXZWJLaXRSZXN1bHRzKEJ1 CiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5n PSdQYXRjaCAxMjM0IGRvZXMgbm90IGJ1aWxkIChmYWlsdXJlKScpCiAgICAgICAgIHJjID0gc2Vs Zi5ydW5TdGVwKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdi dWd6aWxsYV9jb21tZW50X3RleHQnKSwgTm9uZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChz ZWxmLmdldFByb3BlcnR5KCdidWlsZF9maW5pc2hfc3VtbWFyeScpLCBOb25lKQorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkX2ZpbmlzaF9zdW1tYXJ5Jyks ICdQYXRjaCAxMjM0IGRvZXMgbm90IGJ1aWxkJykKICAgICAgICAgcmV0dXJuIHJjCiAKICAgICBk ZWYgdGVzdF9wYXRjaF93aXRoX2J1aWxkX2ZhaWx1cmVfb25fY29tbWl0X3F1ZXVlKHNlbGYpOgpA QCAtMTk0MSw3ICsxOTQxLDcgQEAgY2xhc3MgVGVzdEFuYWx5emVMYXlvdXRUZXN0c1Jlc3VsdHMo QnVpbAogICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0 cmluZz0nRm91bmQgMSBuZXcgdGVzdCBmYWlsdXJlOiB0ZXN0MSAoZmFpbHVyZSknKQogICAgICAg ICByYyA9IHNlbGYucnVuU3RlcCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQ cm9wZXJ0eSgnYnVnemlsbGFfY29tbWVudF90ZXh0JyksIE5vbmUpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRfZmluaXNoX3N1bW1hcnknKSwgTm9uZSkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdidWlsZF9maW5pc2hf c3VtbWFyeScpLCAnRm91bmQgMSBuZXcgdGVzdCBmYWlsdXJlOiB0ZXN0MScpCiAgICAgICAgIHJl dHVybiByYwogCiAgICAgZGVmIHRlc3RfY29uc2lzdGVudF9mYWlsdXJlX3dpdGhvdXRfY2xlYW5f dHJlZV9mYWlsdXJlc19jb21taXRfcXVldWUoc2VsZik6Cg==