208938 2020-03-11 12:48:34 -0700 commit-queue should skip testing if patch already passed tests on mac-wk2 queue 2020-03-21 02:51:09 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=208941 InRadar P2 Normal --- 208940 209342 1 aakash_jain aakash_jain aakash_jain ap jbedard webkit-bug-importer oldest_to_newest 1628798 0 aakash_jain 2020-03-11 12:48:34 -0700 commit-queue should skip building and testing if patch already passed tests on mac-wk2 queue. Both commit-queue and mac-wk2 queue run same tests (WK2 layout-tests in release mode). 1628806 1 ap 2020-03-11 12:56:45 -0700 IIRC the old queue would re-test if substantial amount of time passed since the EWS run. We had a lot of discussion about stricter logic in the past (e.g. don't land until all EWSes were done), but no concrete changes planned. 1632227 2 394113 aakash_jain 2020-03-20 13:00:00 -0700 Created attachment 394113 Patch 1632228 3 394113 aakash_jain 2020-03-20 13:00:19 -0700 Comment on attachment 394113 Patch Sample run: https://ews-build.webkit-uat.org/#/builders/26/builds/1660 1632240 4 aakash_jain 2020-03-20 13:22:25 -0700 (In reply to Alexey Proskuryakov from comment #1) > IIRC the old queue would re-test if substantial amount of time passed since the EWS run. I don't see any logic regarding time limit for re-testing in old EWS code https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/tool/commands/queues.py#L434 (and the code hasn't changed in a long time) 1632268 5 394122 aakash_jain 2020-03-20 14:02:09 -0700 Created attachment 394122 Patch 1632271 6 394125 aakash_jain 2020-03-20 14:13:18 -0700 Created attachment 394125 Patch for landing 1632291 7 ews-feeder 2020-03-20 14:38:42 -0700 Committed r258790: <https://trac.webkit.org/changeset/258790> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394125. 1632293 8 webkit-bug-importer 2020-03-20 14:39:13 -0700 <rdar://problem/60705157> 1632450 9 aakash_jain 2020-03-21 02:51:09 -0700 Updated bug title to reflect that commit-queue only skips testing. It never skips building. Although since the builds are incremental, they are usually fast. Also deployed on production server. 394113 2020-03-20 13:00:00 -0700 2020-03-20 14:02:06 -0700 Patch bug-208938-20200320155959.patch text/plain 9420 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODc3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIwLTAzLTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHNraXAgYnVpbGRpbmcgYW5kIHRlc3Rp bmcgaWYgcGF0Y2ggYWxyZWFkeSBwYXNzZWQgdGVzdHMgb24gbWFjLXdrMiBxdWV1ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAgIChSdW5XZWJLaXRUZXN0cy5kb1N0ZXBJ Zik6IFNraXAgdGVzdGluZyBpZiBwYXRjaCBhbHJlYWR5IHBhc3NlZCBtYWMtd2syIHRlc3RzLgor ICAgICAgICAoQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKTogQnVpbGQtc3RlcCB0byBjaGVj ayBwYXRjaCBzdGF0dXMgb24gb3RoZXIgcXVldWVzLgorICAgICAgICAoQ2hlY2tQYXRjaFN0YXR1 c09uRVdTUXVldWVzLmdldF9wYXRjaF9zdGF0dXMpOgorICAgICAgICAoQ2hlY2tQYXRjaFN0YXR1 c09uRVdTUXVldWVzLnN0YXJ0KToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHNfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X3NraXBfZm9yX21hY193azJfcGFz c2VkX3BhdGNoX29uX2NvbW1pdF9xdWV1ZSk6IEFkZGVkIHVuaXQtdGVzdHMuCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weTogQWRkZWQgYnVpbGQtc3Rl cCB0byBjaGVjayB0aGUgcGF0Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcy4KKyAgICAgICAgKiBC dWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0LnB5OiBVcGRhdGVk IHVuaXQtdGVzdC4KKwogMjAyMC0wMy0yMCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBVcHN0cmVhbSBhIHZhcmlldHkgb2YgQ29jb2EtcGxhdGZvcm0g SEFWRSBhbmQgRU5BQkxFIG1hY3JvcwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL2ZhY3Rvcmllcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNTg3NzkpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NSw3ICsyNSw3IEBAIGZyb20gYnVpbGRib3QucHJvY2VzcyBpbXBvcnQgZmFjdG9yeQogZnJvbSBi dWlsZGJvdC5zdGVwcyBpbXBvcnQgdHJpZ2dlcgogCiBmcm9tIHN0ZXBzIGltcG9ydCAoQXBwbHlQ YXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmljUmV2 aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsCi0gICAgICAgICAgICAgICAgICAgQ2hlY2tTdHls ZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2Fs R0lUQ29tbWl0LAorICAgICAgICAgICAgICAgICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVl cywgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQs IENyZWF0ZUxvY2FsR0lUQ29tbWl0LAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBGaW5kTW9kaWZpZWRDaGFuZ2VMb2dzLCBJbnN0 YWxsR3RrRGVwZW5kZW5jaWVzLAogICAgICAgICAgICAgICAgICAgIEluc3RhbGxXcGVEZXBlbmRl bmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50Q29uZmlndXJhdGlvbiwgUHVzaENvbW1pdFRv V2ViS2l0UmVwbywKICAgICAgICAgICAgICAgICAgICBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NU ZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVzdHMsIFJ1bkVXU0J1aWxkYm90Q2hlY2tDb25m aWcsIFJ1bkVXU1VuaXRUZXN0cywKQEAgLTIxNSw2ICsyMTUsNyBAQCBjbGFzcyBDb21taXRRdWV1 ZUZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhCiAgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2Vi S2l0KHNraXBVcGxvYWQ9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChLaWxsT2xkUHJvY2Vz c2VzKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0VGVzdHMoKSkK ICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goYWRkVVJMcz1GYWxzZSwgdmVyaWZ5 Y3FwbHVzPVRydWUpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU4Nzc5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MTkxLDYgKzE5MSw3IEBAIGNsYXNzIFRlc3RDb21taXRRdWV1ZUZhY3RvcnkoVGVzdENhc2UpOgog ICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29tcGlsZVdlYktpdCwgc2tpcFVw bG9hZD1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLktpbGxPbGRQ cm9jZXNzZXMpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRhdGVQ YXRjaCwgYWRkVVJMcz1GYWxzZSwgdmVyaWZ5Y3FwbHVzPVRydWUpLAorICAgICAgICAgICAgX0J1 aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKSwKICAgICAg ICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlJ1bldlYktpdFRlc3RzKSwKICAgICAgICAg ICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gsIGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LkNoZWNrT3V0U291cmNlKSwKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI1ODc3OSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTYzNCw3ICsxNjM0LDggQEAg Y2xhc3MgUnVuV2ViS2l0VGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgICAgIHNlbGYuaW5jb3JyZWN0 TGF5b3V0TGluZXMgPSBbXQogCiAgICAgZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXApOgotICAgICAg ICByZXR1cm4gbm90IChzZWxmLmdldFByb3BlcnR5KCdyZXZlcnQnKSBhbmQgc2VsZi5nZXRQcm9w ZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93ZXIoKSA9PSAnY29tbWl0LXF1ZXVlJykKKyAgICAg ICAgcmV0dXJuIG5vdCAoKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywgJycpLmxvd2Vy KCkgPT0gJ2NvbW1pdC1xdWV1ZScpIGFuZAorICAgICAgICAgICAgICAgICAgICAoc2VsZi5nZXRQ cm9wZXJ0eSgncmV2ZXJ0Jykgb3Igc2VsZi5nZXRQcm9wZXJ0eSgncGFzc2VkX21hY193azInKSkp CiAKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIHNlbGYubG9nX29ic2VydmVyID0gbG9n b2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIod2FudFN0ZGVycj1UcnVlKQpAQCAtMjU4MiwzICsy NTgzLDM5IEBAIGNsYXNzIFB1c2hDb21taXRUb1dlYktpdFJlcG8oc2hlbGwuU2hlbGwKICAgICAg ICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3Rl cCc6IHUnRmFpbGVkIHRvIHB1c2ggY29tbWl0IHRvIFdlYmtpdCByZXBvc2l0b3J5J30KICAgICAg ICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5nZXRSZXN1bHRTdW1tYXJ5KHNlbGYpCisKKwor Y2xhc3MgQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1 Z3ppbGxhTWl4aW4pOgorICAgIG5hbWUgPSAnY2hlY2stc3RhdHVzLW9uLW90aGVyLWV3c2VzJwor ICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ2hlY2tlZCBwYXRjaCBzdGF0dXMgb24gb3RoZXIgcXVl dWVzJ10KKworICAgIGRlZiBnZXRfcGF0Y2hfc3RhdHVzKHNlbGYsIHBhdGNoX2lkLCBxdWV1ZSk6 CisgICAgICAgIHVybCA9ICd7fXN0YXR1cy97fScuZm9ybWF0KEVXU19VUkwsIHBhdGNoX2lkKQor ICAgICAgICB0cnk6CisgICAgICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldCh1cmwpCisg ICAgICAgICAgICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSAhPSAyMDA6CisgICAgICAgICAgICAg ICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ0ZhaWxlZCB0byBhY2Nlc3Mge30gd2l0aCBzdGF0 dXMgY29kZToge31cbicuZm9ybWF0KHNlbGYudXJsLCByZXNwb25zZS5zdGF0dXNfY29kZSkpCisg ICAgICAgICAgICAgICAgcmV0dXJuIC0xCisgICAgICAgICAgICBxdWV1ZV9kYXRhID0gcmVzcG9u c2UuanNvbigpLmdldChxdWV1ZSkKKyAgICAgICAgICAgIGlmIG5vdCBxdWV1ZV9kYXRhOgorICAg ICAgICAgICAgICAgIHJldHVybiAtMQorICAgICAgICAgICAgcmV0dXJuIHF1ZXVlX2RhdGEuZ2V0 KCdzdGF0ZScpCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAgIHNl bGYuX2FkZFRvTG9nKCdzdGRpbycsICdGYWlsZWQgdG8gYWNjZXNzIHt1cmx9XG4nLmZvcm1hdCh1 cmw9c2VsZi51cmwpKQorICAgICAgICAgICAgcmV0dXJuIC0xCisKKyAgICBAZGVmZXIuaW5saW5l Q2FsbGJhY2tzCisgICAgZGVmIF9hZGRUb0xvZyhzZWxmLCBsb2dOYW1lLCBtZXNzYWdlKToKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgbG9nID0gc2VsZi5nZXRMb2cobG9nTmFtZSkKKyAgICAg ICAgZXhjZXB0IEtleUVycm9yOgorICAgICAgICAgICAgbG9nID0geWllbGQgc2VsZi5hZGRMb2co bG9nTmFtZSkKKyAgICAgICAgbG9nLmFkZFN0ZG91dChtZXNzYWdlKQorCisgICAgZGVmIHN0YXJ0 KHNlbGYpOgorICAgICAgICBwYXRjaF9pZCA9IHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoX2lkJywg JycpCisgICAgICAgIHBhdGNoX3N0YXR1c19vbl9tYWNfd2syID0gc2VsZi5nZXRfcGF0Y2hfc3Rh dHVzKHBhdGNoX2lkLCAnbWFjLXdrMicpCisgICAgICAgIGlmIHBhdGNoX3N0YXR1c19vbl9tYWNf d2syID09IFNVQ0NFU1M6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXNzZWRfbWFj X3drMicsIFRydWUpCisgICAgICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKKyAgICAgICAgcmV0 dXJuIE5vbmUKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI1ODc3OSkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MzYsOCArMzYsOCBAQCBmcm9tIHR3aXN0ZWQudHJpYWwgaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20g c3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHRzLCBBbmFseXplQ29tcGlsZVdlYktp dFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMsCiAgICAgICAgICAgICAgICAgICAgQW5h bHl6ZUxheW91dFRlc3RzUmVzdWx0cywgQXBwbHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIEFyY2hp dmVCdWlsdFByb2R1Y3QsIEFyY2hpdmVUZXN0UmVzdWx0cywKLSAgICAgICAgICAgICAgICAgICBD aGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZh bmNlLCBDaGVja1N0eWxlLCBDbGVhbkJ1aWxkLAotICAgICAgICAgICAgICAgICAgIENsZWFuVXBH aXRJbmRleExvY2ssIENsZWFuV29ya2luZ0RpcmVjdG9yeSwgQ29tcGlsZUpTQywgQ29tcGlsZUpT Q1RvVCwgQ29tcGlsZVdlYktpdCwKKyAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwg Q2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1BhdGNo U3RhdHVzT25FV1NRdWV1ZXMsIENoZWNrU3R5bGUsCisgICAgICAgICAgICAgICAgICAgQ2xlYW5C dWlsZCwgQ2xlYW5VcEdpdEluZGV4TG9jaywgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LCBDb21waWxl SlNDLCBDb21waWxlSlNDVG9ULCBDb21waWxlV2ViS2l0LAogICAgICAgICAgICAgICAgICAgIENv bXBpbGVXZWJLaXRUb1QsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVMb2NhbEdJVENvbW1pdCwKICAg ICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93bmxvYWRCdWlsdFByb2R1 Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3VsdHMsCiAg ICAgICAgICAgICAgICAgICAgRmluZE1vZGlmaWVkQ2hhbmdlTG9ncywgSW5zdGFsbEd0a0RlcGVu ZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywKQEAgLTE1 NDUsNiArMTU0NSwxNiBAQCB0cyIsInZlcnNpb24iOjQsIm51bV9wYXNzZXMiOjQyMTU4LCJwaXhl CiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U0tJUFBFRCwgc3RhdGVfc3RyaW5n PSdsYXlvdXQtdGVzdHMgKHNraXBwZWQpJykKICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgp CiAKKyAgICBkZWYgdGVzdF9za2lwX2Zvcl9tYWNfd2syX3Bhc3NlZF9wYXRjaF9vbl9jb21taXRf cXVldWUoc2VsZik6CisgICAgICAgIHNlbGYuY29uZmlndXJlU3RlcCgpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdidWlsZGVybmFtZScsICdDb21taXQtUXVldWUnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdmdWxsUGxhdGZvcm0nLCAnbWFjJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmln dXJhdGlvbicsICdkZWJ1ZycpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3Bhc3NlZF9tYWNf d2syJywgVHJ1ZSkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TS0lQUEVELCBz dGF0ZV9zdHJpbmc9J2xheW91dC10ZXN0cyAoc2tpcHBlZCknKQorICAgICAgICByZXR1cm4gc2Vs Zi5ydW5TdGVwKCkKKwogICAgIGRlZiB0ZXN0X3BhcnNlX3Jlc3VsdHNfanNvbl9yZWdyZXNzaW9u KHNlbGYpOgogICAgICAgICBzZWxmLmNvbmZpZ3VyZVN0ZXAoKQogICAgICAgICBzZWxmLnNldFBy b3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnaW9zLXNpbXVsYXRvcicpCkBAIC0zMjgzLDYgKzMyOTMs MzMgQEAgY2xhc3MgVGVzdFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcihCdQogICAgICAgICBz ZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nY29tbWl0dGVy QHdlYmtpdC5vcmcgZG9lcyBub3QgaGF2ZSByZXZpZXdlciBwZXJtaXNzaW9ucycpCiAgICAgICAg IHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCisKK2NsYXNzIFRlc3RDaGVja1BhdGNoU3RhdHVzT25F V1NRdWV1ZXMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAg ICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAg ICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxm KToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRl c3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzLmdl dF9wYXRjaF9zdGF0dXMgPSBsYW1iZGEgY2xzLCBwYXRjaF9pZCwgcXVldWU6IFNVQ0NFU1MKKyAg ICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKCkpCisgICAg ICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4 cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nQ2hlY2tlZCBwYXRjaCBz dGF0dXMgb24gb3RoZXIgcXVldWVzJykKKyAgICAgICAgcmMgPSBzZWxmLnJ1blN0ZXAoKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ3Bhc3NlZF9tYWNfd2syJyks IFRydWUpCisgICAgICAgIHJldHVybiByYworCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToK KyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKCkpCisg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBDaGVj a1BhdGNoU3RhdHVzT25FV1NRdWV1ZXMuZ2V0X3BhdGNoX3N0YXR1cyA9IGxhbWJkYSBjbHMsIHBh dGNoX2lkLCBxdWV1ZTogRkFJTFVSRQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0 UHJvcGVydHkoJ3Bhc3NlZF9tYWNfd2syJyksIE5vbmUpCisgICAgICAgIHNlbGYuZXhwZWN0T3V0 Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdDaGVja2VkIHBhdGNoIHN0YXR1cyBv biBvdGhlciBxdWV1ZXMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworCiBjbGFz cyBUZXN0UHVzaENvbW1pdFRvV2ViS2l0UmVwbyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25n TWVzc2FnZSA9IFRydWUK 394122 2020-03-20 14:02:09 -0700 2020-03-20 14:13:15 -0700 Patch bug-208938-20200320170208.patch text/plain 10446 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAzLTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHNraXAgYnVpbGRpbmcgYW5kIHRlc3Rp bmcgaWYgcGF0Y2ggYWxyZWFkeSBwYXNzZWQgdGVzdHMgb24gbWFjLXdrMiBxdWV1ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9uYXRoYW4gQmVkYXJkLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoUnVuV2ViS2l0VGVzdHMuZG9TdGVw SWYpOiBTa2lwIHRlc3RpbmcgaWYgcGF0Y2ggYWxyZWFkeSBwYXNzZWQgbWFjLXdrMiB0ZXN0cy4K KyAgICAgICAgKENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcyk6IEJ1aWxkLXN0ZXAgdG8gY2hl Y2sgcGF0Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcy4KKyAgICAgICAgKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcy5nZXRfcGF0Y2hfc3RhdHVzKToKKyAgICAgICAgKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcy5zdGFydCk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9za2lwX2Zvcl9tYWNfd2syX3Bh c3NlZF9wYXRjaF9vbl9jb21taXRfcXVldWUpOiBBZGRlZCB1bml0LXRlc3RzLgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6IEFkZGVkIGJ1aWxkLXN0 ZXAgdG8gY2hlY2sgdGhlIHBhdGNoIHN0YXR1cyBvbiBvdGhlciBxdWV1ZXMuCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weTogVXBkYXRl ZCB1bml0LXRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3Mvdmll d3Mvc3RhdHVzYnViYmxlLnB5OiBBZGRlZCB0aGUgbmV3IHN0ZXAgc3RhdHVzIHRvIFNURVBTX1RP X0hJREUuCisKIDIwMjAtMDMtMjAgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtld3NdIEJldHRlciBvcmdhbml6ZSBwYXRjaCBzdGF0dXMgYXBpIGRhdGEK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1 YmJsZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHJldmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weQkod29ya2luZyBj b3B5KQpAQCAtNjIsNyArNjIsNyBAQCBjbGFzcyBTdGF0dXNCdWJibGUoVmlldyk6CiAgICAgICAg ICAgICAgICAgICAgICAnXlByaW50ZWQgY29uZmlndXJhdGlvbiQnLCAnXkNoZWNrZWQgcGF0Y2gg cmVsZXZhbmNlJCcsICdeRGVsZXRlZCAuZ2l0L2luZGV4LmxvY2skJywKICAgICAgICAgICAgICAg ICAgICAgICdedHJpZ2dlcmVkLiokJywgJ15Gb3VuZCBtb2RpZmllZCBDaGFuZ2VMb2dzJCcsICde Q3JlYXRlZCBsb2NhbCBnaXQgY29tbWl0JCcsICdeU2V0IGJ1aWxkIHN1bW1hcnkkJywKICAgICAg ICAgICAgICAgICAgICAgICdeVmFsaWRhdGVkIGNvbW1pdGVyJCcsICdeVmFsaWRhdGVkIGNvbW1p dGVyIGFuZCByZXZpZXdlciQnLCAnXlZhbGlkYXRlZCBDaGFuZ2VMb2cgYW5kIFJldmlld2VyJCcs Ci0gICAgICAgICAgICAgICAgICAgICAnXlJlbW92ZWQgZmxhZ3Mgb24gYnVnemlsbGEgcGF0Y2gk J10KKyAgICAgICAgICAgICAgICAgICAgICdeUmVtb3ZlZCBmbGFncyBvbiBidWd6aWxsYSBwYXRj aCQnLCAnXkNoZWNrZWQgcGF0Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcyQnXQogICAgIERBWVNf VE9fQ0hFQ0sgPSAzCiAgICAgQlVJTERFUl9JQ09OID0gdSdcVTAwMDFmNmUwJwogICAgIFRFU1RF Ul9JQ09OID0gdSdcVTAwMDFmNTJjJwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL2ZhY3Rvcmllcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNTg3ODYpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NSw3ICsyNSw3IEBAIGZyb20gYnVpbGRib3QucHJvY2VzcyBpbXBvcnQgZmFjdG9yeQogZnJvbSBi dWlsZGJvdC5zdGVwcyBpbXBvcnQgdHJpZ2dlcgogCiBmcm9tIHN0ZXBzIGltcG9ydCAoQXBwbHlQ YXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmljUmV2 aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsCi0gICAgICAgICAgICAgICAgICAgQ2hlY2tTdHls ZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2Fs R0lUQ29tbWl0LAorICAgICAgICAgICAgICAgICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVl cywgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQs IENyZWF0ZUxvY2FsR0lUQ29tbWl0LAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBGaW5kTW9kaWZpZWRDaGFuZ2VMb2dzLCBJbnN0 YWxsR3RrRGVwZW5kZW5jaWVzLAogICAgICAgICAgICAgICAgICAgIEluc3RhbGxXcGVEZXBlbmRl bmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50Q29uZmlndXJhdGlvbiwgUHVzaENvbW1pdFRv V2ViS2l0UmVwbywKICAgICAgICAgICAgICAgICAgICBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NU ZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVzdHMsIFJ1bkVXU0J1aWxkYm90Q2hlY2tDb25m aWcsIFJ1bkVXU1VuaXRUZXN0cywKQEAgLTIxNSw2ICsyMTUsNyBAQCBjbGFzcyBDb21taXRRdWV1 ZUZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhCiAgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2Vi S2l0KHNraXBVcGxvYWQ9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChLaWxsT2xkUHJvY2Vz c2VzKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0VGVzdHMoKSkK ICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goYWRkVVJMcz1GYWxzZSwgdmVyaWZ5 Y3FwbHVzPVRydWUpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU4Nzg2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MTkxLDYgKzE5MSw3IEBAIGNsYXNzIFRlc3RDb21taXRRdWV1ZUZhY3RvcnkoVGVzdENhc2UpOgog ICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29tcGlsZVdlYktpdCwgc2tpcFVw bG9hZD1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLktpbGxPbGRQ cm9jZXNzZXMpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRhdGVQ YXRjaCwgYWRkVVJMcz1GYWxzZSwgdmVyaWZ5Y3FwbHVzPVRydWUpLAorICAgICAgICAgICAgX0J1 aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKSwKICAgICAg ICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlJ1bldlYktpdFRlc3RzKSwKICAgICAgICAg ICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gsIGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LkNoZWNrT3V0U291cmNlKSwKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTYzNCw3ICsxNjM0LDggQEAg Y2xhc3MgUnVuV2ViS2l0VGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgICAgIHNlbGYuaW5jb3JyZWN0 TGF5b3V0TGluZXMgPSBbXQogCiAgICAgZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXApOgotICAgICAg ICByZXR1cm4gbm90IChzZWxmLmdldFByb3BlcnR5KCdyZXZlcnQnKSBhbmQgc2VsZi5nZXRQcm9w ZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93ZXIoKSA9PSAnY29tbWl0LXF1ZXVlJykKKyAgICAg ICAgcmV0dXJuIG5vdCAoKHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1lJywgJycpLmxvd2Vy KCkgPT0gJ2NvbW1pdC1xdWV1ZScpIGFuZAorICAgICAgICAgICAgICAgICAgICAoc2VsZi5nZXRQ cm9wZXJ0eSgncmV2ZXJ0Jykgb3Igc2VsZi5nZXRQcm9wZXJ0eSgncGFzc2VkX21hY193azInKSkp CiAKICAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIHNlbGYubG9nX29ic2VydmVyID0gbG9n b2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIod2FudFN0ZGVycj1UcnVlKQpAQCAtMjU4MiwzICsy NTgzLDM5IEBAIGNsYXNzIFB1c2hDb21taXRUb1dlYktpdFJlcG8oc2hlbGwuU2hlbGwKICAgICAg ICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3Rl cCc6IHUnRmFpbGVkIHRvIHB1c2ggY29tbWl0IHRvIFdlYmtpdCByZXBvc2l0b3J5J30KICAgICAg ICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5nZXRSZXN1bHRTdW1tYXJ5KHNlbGYpCisKKwor Y2xhc3MgQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKGJ1aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1 Z3ppbGxhTWl4aW4pOgorICAgIG5hbWUgPSAnY2hlY2stc3RhdHVzLW9uLW90aGVyLWV3c2VzJwor ICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ2hlY2tlZCBwYXRjaCBzdGF0dXMgb24gb3RoZXIgcXVl dWVzJ10KKworICAgIGRlZiBnZXRfcGF0Y2hfc3RhdHVzKHNlbGYsIHBhdGNoX2lkLCBxdWV1ZSk6 CisgICAgICAgIHVybCA9ICd7fXN0YXR1cy97fScuZm9ybWF0KEVXU19VUkwsIHBhdGNoX2lkKQor ICAgICAgICB0cnk6CisgICAgICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLmdldCh1cmwpCisg ICAgICAgICAgICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSAhPSAyMDA6CisgICAgICAgICAgICAg ICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ0ZhaWxlZCB0byBhY2Nlc3Mge30gd2l0aCBzdGF0 dXMgY29kZToge31cbicuZm9ybWF0KHNlbGYudXJsLCByZXNwb25zZS5zdGF0dXNfY29kZSkpCisg ICAgICAgICAgICAgICAgcmV0dXJuIC0xCisgICAgICAgICAgICBxdWV1ZV9kYXRhID0gcmVzcG9u c2UuanNvbigpLmdldChxdWV1ZSkKKyAgICAgICAgICAgIGlmIG5vdCBxdWV1ZV9kYXRhOgorICAg ICAgICAgICAgICAgIHJldHVybiAtMQorICAgICAgICAgICAgcmV0dXJuIHF1ZXVlX2RhdGEuZ2V0 KCdzdGF0ZScpCisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAgICAgICAgIHNl bGYuX2FkZFRvTG9nKCdzdGRpbycsICdGYWlsZWQgdG8gYWNjZXNzIHt1cmx9XG4nLmZvcm1hdCh1 cmw9c2VsZi51cmwpKQorICAgICAgICAgICAgcmV0dXJuIC0xCisKKyAgICBAZGVmZXIuaW5saW5l Q2FsbGJhY2tzCisgICAgZGVmIF9hZGRUb0xvZyhzZWxmLCBsb2dOYW1lLCBtZXNzYWdlKToKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgbG9nID0gc2VsZi5nZXRMb2cobG9nTmFtZSkKKyAgICAg ICAgZXhjZXB0IEtleUVycm9yOgorICAgICAgICAgICAgbG9nID0geWllbGQgc2VsZi5hZGRMb2co bG9nTmFtZSkKKyAgICAgICAgbG9nLmFkZFN0ZG91dChtZXNzYWdlKQorCisgICAgZGVmIHN0YXJ0 KHNlbGYpOgorICAgICAgICBwYXRjaF9pZCA9IHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoX2lkJywg JycpCisgICAgICAgIHBhdGNoX3N0YXR1c19vbl9tYWNfd2syID0gc2VsZi5nZXRfcGF0Y2hfc3Rh dHVzKHBhdGNoX2lkLCAnbWFjLXdrMicpCisgICAgICAgIGlmIHBhdGNoX3N0YXR1c19vbl9tYWNf d2syID09IFNVQ0NFU1M6CisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXNzZWRfbWFj X3drMicsIFRydWUpCisgICAgICAgIHNlbGYuZmluaXNoZWQoU1VDQ0VTUykKKyAgICAgICAgcmV0 dXJuIE5vbmUKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MzYsOCArMzYsOCBAQCBmcm9tIHR3aXN0ZWQudHJpYWwgaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20g c3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1bHRzLCBBbmFseXplQ29tcGlsZVdlYktp dFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMsCiAgICAgICAgICAgICAgICAgICAgQW5h bHl6ZUxheW91dFRlc3RzUmVzdWx0cywgQXBwbHlQYXRjaCwgQXBwbHlXYXRjaExpc3QsIEFyY2hp dmVCdWlsdFByb2R1Y3QsIEFyY2hpdmVUZXN0UmVzdWx0cywKLSAgICAgICAgICAgICAgICAgICBD aGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZh bmNlLCBDaGVja1N0eWxlLCBDbGVhbkJ1aWxkLAotICAgICAgICAgICAgICAgICAgIENsZWFuVXBH aXRJbmRleExvY2ssIENsZWFuV29ya2luZ0RpcmVjdG9yeSwgQ29tcGlsZUpTQywgQ29tcGlsZUpT Q1RvVCwgQ29tcGlsZVdlYktpdCwKKyAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwg Q2hlY2tPdXRTcGVjaWZpY1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1BhdGNo U3RhdHVzT25FV1NRdWV1ZXMsIENoZWNrU3R5bGUsCisgICAgICAgICAgICAgICAgICAgQ2xlYW5C dWlsZCwgQ2xlYW5VcEdpdEluZGV4TG9jaywgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LCBDb21waWxl SlNDLCBDb21waWxlSlNDVG9ULCBDb21waWxlV2ViS2l0LAogICAgICAgICAgICAgICAgICAgIENv bXBpbGVXZWJLaXRUb1QsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVMb2NhbEdJVENvbW1pdCwKICAg ICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93bmxvYWRCdWlsdFByb2R1 Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3VsdHMsCiAg ICAgICAgICAgICAgICAgICAgRmluZE1vZGlmaWVkQ2hhbmdlTG9ncywgSW5zdGFsbEd0a0RlcGVu ZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywKQEAgLTE1 NDUsNiArMTU0NSwxNiBAQCB0cyIsInZlcnNpb24iOjQsIm51bV9wYXNzZXMiOjQyMTU4LCJwaXhl CiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U0tJUFBFRCwgc3RhdGVfc3RyaW5n PSdsYXlvdXQtdGVzdHMgKHNraXBwZWQpJykKICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgp CiAKKyAgICBkZWYgdGVzdF9za2lwX2Zvcl9tYWNfd2syX3Bhc3NlZF9wYXRjaF9vbl9jb21taXRf cXVldWUoc2VsZik6CisgICAgICAgIHNlbGYuY29uZmlndXJlU3RlcCgpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdidWlsZGVybmFtZScsICdDb21taXQtUXVldWUnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdmdWxsUGxhdGZvcm0nLCAnbWFjJykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmln dXJhdGlvbicsICdkZWJ1ZycpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3Bhc3NlZF9tYWNf d2syJywgVHJ1ZSkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TS0lQUEVELCBz dGF0ZV9zdHJpbmc9J2xheW91dC10ZXN0cyAoc2tpcHBlZCknKQorICAgICAgICByZXR1cm4gc2Vs Zi5ydW5TdGVwKCkKKwogICAgIGRlZiB0ZXN0X3BhcnNlX3Jlc3VsdHNfanNvbl9yZWdyZXNzaW9u KHNlbGYpOgogICAgICAgICBzZWxmLmNvbmZpZ3VyZVN0ZXAoKQogICAgICAgICBzZWxmLnNldFBy b3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnaW9zLXNpbXVsYXRvcicpCkBAIC0zMjgzLDYgKzMyOTMs MzMgQEAgY2xhc3MgVGVzdFZhbGlkYXRlQ29tbWl0ZXJBbmRSZXZpZXdlcihCdQogICAgICAgICBz ZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nY29tbWl0dGVy QHdlYmtpdC5vcmcgZG9lcyBub3QgaGF2ZSByZXZpZXdlciBwZXJtaXNzaW9ucycpCiAgICAgICAg IHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCisKK2NsYXNzIFRlc3RDaGVja1BhdGNoU3RhdHVzT25F V1NRdWV1ZXMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAg ICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAg ICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxm KToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRl c3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzLmdl dF9wYXRjaF9zdGF0dXMgPSBsYW1iZGEgY2xzLCBwYXRjaF9pZCwgcXVldWU6IFNVQ0NFU1MKKyAg ICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKCkpCisgICAg ICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4 cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nQ2hlY2tlZCBwYXRjaCBz dGF0dXMgb24gb3RoZXIgcXVldWVzJykKKyAgICAgICAgcmMgPSBzZWxmLnJ1blN0ZXAoKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ3Bhc3NlZF9tYWNfd2syJyks IFRydWUpCisgICAgICAgIHJldHVybiByYworCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToK KyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKCkpCisg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBDaGVj a1BhdGNoU3RhdHVzT25FV1NRdWV1ZXMuZ2V0X3BhdGNoX3N0YXR1cyA9IGxhbWJkYSBjbHMsIHBh dGNoX2lkLCBxdWV1ZTogRkFJTFVSRQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0 UHJvcGVydHkoJ3Bhc3NlZF9tYWNfd2syJyksIE5vbmUpCisgICAgICAgIHNlbGYuZXhwZWN0T3V0 Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdDaGVja2VkIHBhdGNoIHN0YXR1cyBv biBvdGhlciBxdWV1ZXMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworCiBjbGFz cyBUZXN0UHVzaENvbW1pdFRvV2ViS2l0UmVwbyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25n TWVzc2FnZSA9IFRydWUK 394125 2020-03-20 14:13:18 -0700 2020-03-20 14:38:42 -0700 Patch for landing bug-208938-20200320171317.patch text/plain 11322 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTAzLTIwICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBjb21taXQtcXVldWUgc2hvdWxkIHNraXAgYnVpbGRpbmcgYW5kIHRlc3Rp bmcgaWYgcGF0Y2ggYWxyZWFkeSBwYXNzZWQgdGVzdHMgb24gbWFjLXdrMiBxdWV1ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4OTM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9uYXRoYW4gQmVkYXJkLgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoUnVuV2ViS2l0VGVzdHMuZG9TdGVw SWYpOiBTa2lwIHRlc3RpbmcgaWYgcGF0Y2ggYWxyZWFkeSBwYXNzZWQgbWFjLXdrMiB0ZXN0cy4K KyAgICAgICAgKENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcyk6IEJ1aWxkLXN0ZXAgdG8gY2hl Y2sgcGF0Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcy4KKyAgICAgICAgKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcy5nZXRfcGF0Y2hfc3RhdHVzKToKKyAgICAgICAgKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcy5zdGFydCk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9za2lwX2Zvcl9tYWNfd2syX3Bh c3NlZF9wYXRjaF9vbl9jb21taXRfcXVldWUpOiBBZGRlZCB1bml0LXRlc3RzLgorICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6IEFkZGVkIGJ1aWxkLXN0 ZXAgdG8gY2hlY2sgdGhlIHBhdGNoIHN0YXR1cyBvbiBvdGhlciBxdWV1ZXMuCisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weTogVXBkYXRl ZCB1bml0LXRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWFwcC9ld3Mvdmll d3Mvc3RhdHVzYnViYmxlLnB5OiBBZGRlZCB0aGUgbmV3IHN0ZXAgc3RhdHVzIHRvIFNURVBTX1RP X0hJREUuCisKIDIwMjAtMDMtMjAgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtld3NdIEJldHRlciBvcmdhbml6ZSBwYXRjaCBzdGF0dXMgYXBpIGRhdGEK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1 YmJsZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYXBwL2V3 cy92aWV3cy9zdGF0dXNidWJibGUucHkJKHJldmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2V3cy1hcHAvZXdzL3ZpZXdzL3N0YXR1c2J1YmJsZS5weQkod29ya2luZyBj b3B5KQpAQCAtNjIsNyArNjIsNyBAQCBjbGFzcyBTdGF0dXNCdWJibGUoVmlldyk6CiAgICAgICAg ICAgICAgICAgICAgICAnXlByaW50ZWQgY29uZmlndXJhdGlvbiQnLCAnXkNoZWNrZWQgcGF0Y2gg cmVsZXZhbmNlJCcsICdeRGVsZXRlZCAuZ2l0L2luZGV4LmxvY2skJywKICAgICAgICAgICAgICAg ICAgICAgICdedHJpZ2dlcmVkLiokJywgJ15Gb3VuZCBtb2RpZmllZCBDaGFuZ2VMb2dzJCcsICde Q3JlYXRlZCBsb2NhbCBnaXQgY29tbWl0JCcsICdeU2V0IGJ1aWxkIHN1bW1hcnkkJywKICAgICAg ICAgICAgICAgICAgICAgICdeVmFsaWRhdGVkIGNvbW1pdGVyJCcsICdeVmFsaWRhdGVkIGNvbW1p dGVyIGFuZCByZXZpZXdlciQnLCAnXlZhbGlkYXRlZCBDaGFuZ2VMb2cgYW5kIFJldmlld2VyJCcs Ci0gICAgICAgICAgICAgICAgICAgICAnXlJlbW92ZWQgZmxhZ3Mgb24gYnVnemlsbGEgcGF0Y2gk J10KKyAgICAgICAgICAgICAgICAgICAgICdeUmVtb3ZlZCBmbGFncyBvbiBidWd6aWxsYSBwYXRj aCQnLCAnXkNoZWNrZWQgcGF0Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcyQnXQogICAgIERBWVNf VE9fQ0hFQ0sgPSAzCiAgICAgQlVJTERFUl9JQ09OID0gdSdcVTAwMDFmNmUwJwogICAgIFRFU1RF Ul9JQ09OID0gdSdcVTAwMDFmNTJjJwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL2ZhY3Rvcmllcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNTg3ODYpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0y NSw3ICsyNSw3IEBAIGZyb20gYnVpbGRib3QucHJvY2VzcyBpbXBvcnQgZmFjdG9yeQogZnJvbSBi dWlsZGJvdC5zdGVwcyBpbXBvcnQgdHJpZ2dlcgogCiBmcm9tIHN0ZXBzIGltcG9ydCAoQXBwbHlQ YXRjaCwgQXBwbHlXYXRjaExpc3QsIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmljUmV2 aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsCi0gICAgICAgICAgICAgICAgICAgQ2hlY2tTdHls ZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2Fs R0lUQ29tbWl0LAorICAgICAgICAgICAgICAgICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVl cywgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktpdCwgQ29uZmlndXJlQnVpbGQs IENyZWF0ZUxvY2FsR0lUQ29tbWl0LAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBGaW5kTW9kaWZpZWRDaGFuZ2VMb2dzLCBJbnN0 YWxsR3RrRGVwZW5kZW5jaWVzLAogICAgICAgICAgICAgICAgICAgIEluc3RhbGxXcGVEZXBlbmRl bmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50Q29uZmlndXJhdGlvbiwgUHVzaENvbW1pdFRv V2ViS2l0UmVwbywKICAgICAgICAgICAgICAgICAgICBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NU ZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVzdHMsIFJ1bkVXU0J1aWxkYm90Q2hlY2tDb25m aWcsIFJ1bkVXU1VuaXRUZXN0cywKQEAgLTIxNSw2ICsyMTUsNyBAQCBjbGFzcyBDb21taXRRdWV1 ZUZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhCiAgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlV2Vi S2l0KHNraXBVcGxvYWQ9VHJ1ZSkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChLaWxsT2xkUHJvY2Vz c2VzKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hTdGF0 dXNPbkVXU1F1ZXVlcygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0VGVzdHMoKSkK ICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlUGF0Y2goYWRkVVJMcz1GYWxzZSwgdmVyaWZ5 Y3FwbHVzPVRydWUpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rv cmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU4Nzg2KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAt MTkxLDYgKzE5MSw3IEBAIGNsYXNzIFRlc3RDb21taXRRdWV1ZUZhY3RvcnkoVGVzdENhc2UpOgog ICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ29tcGlsZVdlYktpdCwgc2tpcFVw bG9hZD1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLktpbGxPbGRQ cm9jZXNzZXMpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRhdGVQ YXRjaCwgYWRkVVJMcz1GYWxzZSwgdmVyaWZ5Y3FwbHVzPVRydWUpLAorICAgICAgICAgICAgX0J1 aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKSwKICAgICAg ICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlJ1bldlYktpdFRlc3RzKSwKICAgICAgICAg ICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLlZhbGlkYXRlUGF0Y2gsIGFkZFVSTHM9RmFsc2Us IHZlcmlmeWNxcGx1cz1UcnVlKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBz LkNoZWNrT3V0U291cmNlKSwKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI1ODc4NikKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsNyArMzcsOCBAQCBpbXBv cnQgb3MKIAogQlVHX1NFUlZFUl9VUkwgPSAnaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvJwogUzNV UkwgPSAnaHR0cHM6Ly9zMy11cy13ZXN0LTIuYW1hem9uYXdzLmNvbS8nCi1FV1NfVVJMID0gJ2h0 dHBzOi8vZXdzLWJ1aWxkLndlYmtpdC5vcmcvJworRVdTX0JVSUxEX1VSTCA9ICdodHRwczovL2V3 cy1idWlsZC53ZWJraXQub3JnLycKK0VXU19VUkwgPSAnaHR0cHM6Ly9ld3Mud2Via2l0Lm9yZy8n CiBXaXRoUHJvcGVydGllcyA9IHByb3BlcnRpZXMuV2l0aFByb3BlcnRpZXMKIEludGVycG9sYXRl ID0gcHJvcGVydGllcy5JbnRlcnBvbGF0ZQogCkBAIC0xNjM0LDcgKzE2MzUsOCBAQCBjbGFzcyBS dW5XZWJLaXRUZXN0cyhzaGVsbC5UZXN0KToKICAgICAgICAgc2VsZi5pbmNvcnJlY3RMYXlvdXRM aW5lcyA9IFtdCiAKICAgICBkZWYgZG9TdGVwSWYoc2VsZiwgc3RlcCk6Ci0gICAgICAgIHJldHVy biBub3QgKHNlbGYuZ2V0UHJvcGVydHkoJ3JldmVydCcpIGFuZCBzZWxmLmdldFByb3BlcnR5KCdi dWlsZGVybmFtZScsICcnKS5sb3dlcigpID09ICdjb21taXQtcXVldWUnKQorICAgICAgICByZXR1 cm4gbm90ICgoc2VsZi5nZXRQcm9wZXJ0eSgnYnVpbGRlcm5hbWUnLCAnJykubG93ZXIoKSA9PSAn Y29tbWl0LXF1ZXVlJykgYW5kCisgICAgICAgICAgICAgICAgICAgIChzZWxmLmdldFByb3BlcnR5 KCdyZXZlcnQnKSBvciBzZWxmLmdldFByb3BlcnR5KCdwYXNzZWRfbWFjX3drMicpKSkKIAogICAg IGRlZiBzdGFydChzZWxmKToKICAgICAgICAgc2VsZi5sb2dfb2JzZXJ2ZXIgPSBsb2dvYnNlcnZl ci5CdWZmZXJMb2dPYnNlcnZlcih3YW50U3RkZXJyPVRydWUpCkBAIC0yMDUwLDcgKzIwNTIsNyBA QCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvCiBjbGFzcyBEb3dubG9h ZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QpOgogICAgIGNvbW1h bmQgPSBbJ3B5dGhvbicsICdUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9kb3dubG9hZC1idWlsdC1w cm9kdWN0JywKICAgICAgICAgV2l0aFByb3BlcnRpZXMoJy0tJShjb25maWd1cmF0aW9uKXMnKSwK LSAgICAgICAgV2l0aFByb3BlcnRpZXMoRVdTX1VSTCArICdhcmNoaXZlcy8lKGZ1bGxQbGF0Zm9y bSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShwYXRjaF9pZClzLnppcCcp XQorICAgICAgICBXaXRoUHJvcGVydGllcyhFV1NfQlVJTERfVVJMICsgJ2FyY2hpdmVzLyUoZnVs bFBsYXRmb3JtKXMtJShhcmNoaXRlY3R1cmUpcy0lKGNvbmZpZ3VyYXRpb24pcy8lKHBhdGNoX2lk KXMuemlwJyldCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKICAgICBmbHVua09uRmFpbHVyZSA9 IFRydWUKIApAQCAtMjU4MiwzICsyNTg0LDM5IEBAIGNsYXNzIFB1c2hDb21taXRUb1dlYktpdFJl cG8oc2hlbGwuU2hlbGwKICAgICAgICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6CiAgICAg ICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnRmFpbGVkIHRvIHB1c2ggY29tbWl0IHRvIFdlYmtp dCByZXBvc2l0b3J5J30KICAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5nZXRSZXN1 bHRTdW1tYXJ5KHNlbGYpCisKKworY2xhc3MgQ2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzKGJ1 aWxkc3RlcC5CdWlsZFN0ZXAsIEJ1Z3ppbGxhTWl4aW4pOgorICAgIG5hbWUgPSAnY2hlY2stc3Rh dHVzLW9uLW90aGVyLWV3c2VzJworICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnQ2hlY2tlZCBwYXRj aCBzdGF0dXMgb24gb3RoZXIgcXVldWVzJ10KKworICAgIGRlZiBnZXRfcGF0Y2hfc3RhdHVzKHNl bGYsIHBhdGNoX2lkLCBxdWV1ZSk6CisgICAgICAgIHVybCA9ICd7fXN0YXR1cy97fScuZm9ybWF0 KEVXU19VUkwsIHBhdGNoX2lkKQorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXNwb25zZSA9 IHJlcXVlc3RzLmdldCh1cmwpCisgICAgICAgICAgICBpZiByZXNwb25zZS5zdGF0dXNfY29kZSAh PSAyMDA6CisgICAgICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlvJywgJ0ZhaWxlZCB0 byBhY2Nlc3Mge30gd2l0aCBzdGF0dXMgY29kZToge31cbicuZm9ybWF0KHVybCwgcmVzcG9uc2Uu c3RhdHVzX2NvZGUpKQorICAgICAgICAgICAgICAgIHJldHVybiAtMQorICAgICAgICAgICAgcXVl dWVfZGF0YSA9IHJlc3BvbnNlLmpzb24oKS5nZXQocXVldWUpCisgICAgICAgICAgICBpZiBub3Qg cXVldWVfZGF0YToKKyAgICAgICAgICAgICAgICByZXR1cm4gLTEKKyAgICAgICAgICAgIHJldHVy biBxdWV1ZV9kYXRhLmdldCgnc3RhdGUnKQorICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6 CisgICAgICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnRmFpbGVkIHRvIGFjY2VzcyB7 fVxuJy5mb3JtYXQodXJsKSkKKyAgICAgICAgICAgIHJldHVybiAtMQorCisgICAgQGRlZmVyLmlu bGluZUNhbGxiYWNrcworICAgIGRlZiBfYWRkVG9Mb2coc2VsZiwgbG9nTmFtZSwgbWVzc2FnZSk6 CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGxvZyA9IHNlbGYuZ2V0TG9nKGxvZ05hbWUpCisg ICAgICAgIGV4Y2VwdCBLZXlFcnJvcjoKKyAgICAgICAgICAgIGxvZyA9IHlpZWxkIHNlbGYuYWRk TG9nKGxvZ05hbWUpCisgICAgICAgIGxvZy5hZGRTdGRvdXQobWVzc2FnZSkKKworICAgIGRlZiBz dGFydChzZWxmKToKKyAgICAgICAgcGF0Y2hfaWQgPSBzZWxmLmdldFByb3BlcnR5KCdwYXRjaF9p ZCcsICcnKQorICAgICAgICBwYXRjaF9zdGF0dXNfb25fbWFjX3drMiA9IHNlbGYuZ2V0X3BhdGNo X3N0YXR1cyhwYXRjaF9pZCwgJ21hYy13azInKQorICAgICAgICBpZiBwYXRjaF9zdGF0dXNfb25f bWFjX3drMiA9PSBTVUNDRVNTOgorICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGFzc2Vk X21hY193azInLCBUcnVlKQorICAgICAgICBzZWxmLmZpbmlzaGVkKFNVQ0NFU1MpCisgICAgICAg IHJldHVybiBOb25lCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTg3ODYpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkK QEAgLTM2LDggKzM2LDggQEAgZnJvbSB0d2lzdGVkLnRyaWFsIGltcG9ydCB1bml0dGVzdAogCiBm cm9tIHN0ZXBzIGltcG9ydCAoQW5hbHl6ZUFQSVRlc3RzUmVzdWx0cywgQW5hbHl6ZUNvbXBpbGVX ZWJLaXRSZXN1bHRzLCBBbmFseXplSlNDVGVzdHNSZXN1bHRzLAogICAgICAgICAgICAgICAgICAg IEFuYWx5emVMYXlvdXRUZXN0c1Jlc3VsdHMsIEFwcGx5UGF0Y2gsIEFwcGx5V2F0Y2hMaXN0LCBB cmNoaXZlQnVpbHRQcm9kdWN0LCBBcmNoaXZlVGVzdFJlc3VsdHMsCi0gICAgICAgICAgICAgICAg ICAgQ2hlY2tPdXRTb3VyY2UsIENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiwgQ2hlY2tQYXRjaFJl bGV2YW5jZSwgQ2hlY2tTdHlsZSwgQ2xlYW5CdWlsZCwKLSAgICAgICAgICAgICAgICAgICBDbGVh blVwR2l0SW5kZXhMb2NrLCBDbGVhbldvcmtpbmdEaXJlY3RvcnksIENvbXBpbGVKU0MsIENvbXBp bGVKU0NUb1QsIENvbXBpbGVXZWJLaXQsCisgICAgICAgICAgICAgICAgICAgQ2hlY2tPdXRTb3Vy Y2UsIENoZWNrT3V0U3BlY2lmaWNSZXZpc2lvbiwgQ2hlY2tQYXRjaFJlbGV2YW5jZSwgQ2hlY2tQ YXRjaFN0YXR1c09uRVdTUXVldWVzLCBDaGVja1N0eWxlLAorICAgICAgICAgICAgICAgICAgIENs ZWFuQnVpbGQsIENsZWFuVXBHaXRJbmRleExvY2ssIENsZWFuV29ya2luZ0RpcmVjdG9yeSwgQ29t cGlsZUpTQywgQ29tcGlsZUpTQ1RvVCwgQ29tcGlsZVdlYktpdCwKICAgICAgICAgICAgICAgICAg ICBDb21waWxlV2ViS2l0VG9ULCBDb25maWd1cmVCdWlsZCwgQ3JlYXRlTG9jYWxHSVRDb21taXQs CiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIERvd25sb2FkQnVpbHRQ cm9kdWN0RnJvbU1hc3RlciwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRz LAogICAgICAgICAgICAgICAgICAgIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEluc3RhbGxHdGtE ZXBlbmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsCkBA IC0xNTQ1LDYgKzE1NDUsMTYgQEAgdHMiLCJ2ZXJzaW9uIjo0LCJudW1fcGFzc2VzIjo0MjE1OCwi cGl4ZQogICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNLSVBQRUQsIHN0YXRlX3N0 cmluZz0nbGF5b3V0LXRlc3RzIChza2lwcGVkKScpCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0 ZXAoKQogCisgICAgZGVmIHRlc3Rfc2tpcF9mb3JfbWFjX3drMl9wYXNzZWRfcGF0Y2hfb25fY29t bWl0X3F1ZXVlKHNlbGYpOgorICAgICAgICBzZWxmLmNvbmZpZ3VyZVN0ZXAoKQorICAgICAgICBz ZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0JykKKyAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnYnVpbGRlcm5hbWUnLCAnQ29tbWl0LVF1ZXVlJykKKyAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ21hYycpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Nv bmZpZ3VyYXRpb24nLCAnZGVidWcnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXNzZWRf bWFjX3drMicsIFRydWUpCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U0tJUFBF RCwgc3RhdGVfc3RyaW5nPSdsYXlvdXQtdGVzdHMgKHNraXBwZWQpJykKKyAgICAgICAgcmV0dXJu IHNlbGYucnVuU3RlcCgpCisKICAgICBkZWYgdGVzdF9wYXJzZV9yZXN1bHRzX2pzb25fcmVncmVz c2lvbihzZWxmKToKICAgICAgICAgc2VsZi5jb25maWd1cmVTdGVwKCkKICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2lvcy1zaW11bGF0b3InKQpAQCAtMzI4Myw2ICsz MjkzLDM0IEBAIGNsYXNzIFRlc3RWYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIoQnUKICAgICAg ICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J2NvbW1p dHRlckB3ZWJraXQub3JnIGRvZXMgbm90IGhhdmUgcmV2aWV3ZXIgcGVybWlzc2lvbnMnKQogICAg ICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAorCitjbGFzcyBUZXN0Q2hlY2tQYXRjaFN0YXR1 c09uRVdTUXVldWVzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6 CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQor ICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVhckRvd24o c2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKKworICAgIGRl ZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVl cy5nZXRfcGF0Y2hfc3RhdHVzID0gbGFtYmRhIGNscywgcGF0Y2hfaWQsIHF1ZXVlOiBTVUNDRVNT CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcygpKQor ICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0JykKKyAgICAgICAgc2Vs Zi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J0NoZWNrZWQgcGF0 Y2ggc3RhdHVzIG9uIG90aGVyIHF1ZXVlcycpCisgICAgICAgIHJjID0gc2VsZi5ydW5TdGVwKCkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdwYXNzZWRfbWFjX3dr MicpLCBUcnVlKQorICAgICAgICByZXR1cm4gcmMKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmUoc2Vs Zik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcygp KQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0JykKKyAgICAgICAg Q2hlY2tQYXRjaFN0YXR1c09uRVdTUXVldWVzLmdldF9wYXRjaF9zdGF0dXMgPSBsYW1iZGEgY2xz LCBwYXRjaF9pZCwgcXVldWU6IEZBSUxVUkUKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJl c3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J0NoZWNrZWQgcGF0Y2ggc3RhdHVzIG9uIG90aGVy IHF1ZXVlcycpCisgICAgICAgIHJjID0gc2VsZi5ydW5TdGVwKCkKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdwYXNzZWRfbWFjX3drMicpLCBOb25lKQorICAgICAg ICByZXR1cm4gcmMKKworCiBjbGFzcyBUZXN0UHVzaENvbW1pdFRvV2ViS2l0UmVwbyhCdWlsZFN0 ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxm KToKICAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUK