202478 2019-10-02 10:09:41 -0700 Python 3: Add support in webkitpy.results 2019-10-23 13:03:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184986 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain clopez dean_johnson ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1576038 0 jbedard 2019-10-02 10:09:41 -0700 Add webkitpy.results to test-webkitpy-python3 1576043 1 380033 jbedard 2019-10-02 10:22:27 -0700 Created attachment 380033 Patch 1576142 2 380052 jbedard 2019-10-02 13:24:29 -0700 Created attachment 380052 Patch 1576144 3 jbedard 2019-10-02 13:25:21 -0700 Note that this is blocked on <https://bugs.webkit.org/show_bug.cgi?id=201955> 1578016 4 380478 jbedard 2019-10-08 16:49:25 -0700 Created attachment 380478 Patch 1582966 5 jbedard 2019-10-23 13:02:07 -0700 Committed r251491: <https://trac.webkit.org/changeset/251491> 1582967 6 webkit-bug-importer 2019-10-23 13:03:17 -0700 <rdar://problem/56550862> 380033 2019-10-02 10:22:27 -0700 2019-10-02 13:24:28 -0700 Patch bug-202478-20191002102226.patch text/plain 6421 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDYxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTEwLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkucmVzdWx0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyNDc4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3Rlc3Qtd2Via2l0cHktcHl0aG9uMzogQWRkIHdlYmtpdHB5LnJlc3VsdHMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weToKKyAgICAgICAgKFVwbG9hZC5FbmNv ZGVyLmRlZmF1bHQpOiBVc2UgcmFuZ2UgaW5zdGVhZCBvZiB4cmFuZ2UuCisgICAgICAgIChVcGxv YWQuY3JlYXRlX2NvbmZpZ3VyYXRpb24pOiBTdXBwb3J0IGl0ZW1zIGl0ZXJhdGlvbiBmb3IgUHl0 aG9uIDMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3J1bl9zdGF0cyk6IENoYW5nZSBpdGVyaXRl bXMgdG8gaXRlbXMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3Rlc3RfcmVzdWx0KTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weToK KyAgICAgICAgKFVwbG9hZFRlc3QuT3B0aW9ucy5fX2luaXRfXyk6IENoYW5nZSBpdGVyaXRlbXMg dG8gaXRlbXMuCisgICAgICAgIChVcGxvYWRUZXN0Lm5vcm1hbGl6ZSk6IERpdHRvLgorCiAyMDE5 LTEwLTAyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBb ZXdzXSBEZWRpY2F0ZSBhIGJvdCBmb3IgbWFjT1MtSGlnaC1TaWVycmEtRGVidWctQnVpbGQtRVdT IHF1ZXVlCkluZGV4OiBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwkocmV2aXNpb24gMjUw NjA4KQorKysgVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5dGhvbjMJKHdvcmtpbmcgY29w eSkKQEAgLTExLDYgKzExLDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiBQWVRIT04zX0NPTVBBVElCTEVf RElSRUNUT1JJRVMgPSBbCiAgICd3ZWJraXRweS5jb21tb24uc3lzdGVtJywKICAgJ3dlYmtpdHB5 LmNvbW1vbi50aHJlYWQnLAorICAnd2Via2l0cHkucmVzdWx0cycsCiBdCiAKIApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CShyZXZpc2lvbiAyNTA2MDgpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0yMCw3ICsyMCwxMiBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgogCi1pbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkLnJlcXVlc3RzCitp bXBvcnQgc3lzCitpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgorICAgICMgSW4gUHl0aG9u IDMsIHJlcXVlc3RzIGlzIGEgYnVpbHQtaW4KKyAgICBpbXBvcnQgcmVxdWVzdHMKK2Vsc2U6Cisg ICAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZC5yZXF1ZXN0cwogCiBp bXBvcnQganNvbgogaW1wb3J0IHJlcXVlc3RzCkBAIC02Nyw3ICs3Miw3IEBAIGNsYXNzIFVwbG9h ZChvYmplY3QpOgogICAgICAgICAgICAgYnVpbGRib3RfYXJncyA9IFtkZXRhaWxzLmdldChhcmcs IE5vbmUpIGlzIE5vbmUgZm9yIGFyZyBpbiBvYmouQlVJTERCT1RfREVUQUlMU10KICAgICAgICAg ICAgIGlmIGFueShidWlsZGJvdF9hcmdzKSBhbmQgbm90IGFsbChidWlsZGJvdF9hcmdzKToKICAg ICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCdBbGwgYnVpbGRib3QgZGV0YWlscyBtdXN0 IGJlIGRlZmluZWQgZm9yIHVwbG9hZCwgZGV0YWlscyBtaXNzaW5nOiB7fScuZm9ybWF0KCcsICcu am9pbigKLSAgICAgICAgICAgICAgICAgICAgW29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBp IGluIHhyYW5nZShsZW4ob2JqLkJVSUxEQk9UX0RFVEFJTFMpKSBpZiBidWlsZGJvdF9hcmdzW2ld XSwKKyAgICAgICAgICAgICAgICAgICAgW29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBpIGlu IHJhbmdlKGxlbihvYmouQlVJTERCT1RfREVUQUlMUykpIGlmIGJ1aWxkYm90X2FyZ3NbaV1dLAog ICAgICAgICAgICAgICAgICkpKQogCiAgICAgICAgICAgICBkZWYgdW5wYWNrX3Rlc3QoY3VycmVu dCwgcGF0aF90b190ZXN0LCBkYXRhKToKQEAgLTc5LDggKzg0LDE0IEBAIGNsYXNzIFVwbG9hZChv YmplY3QpOgogICAgICAgICAgICAgICAgIHVucGFja190ZXN0KGN1cnJlbnRbcGF0aF90b190ZXN0 WzBdXSwgcGF0aF90b190ZXN0WzE6XSwgZGF0YSkKIAogICAgICAgICAgICAgcmVzdWx0cyA9IHt9 Ci0gICAgICAgICAgICBmb3IgdGVzdCwgZGF0YSBpbiBvYmoucmVzdWx0cy5pdGVyaXRlbXMoKToK LSAgICAgICAgICAgICAgICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRh dGEpCisKKyAgICAgICAgICAgICMgRklYTUU6IFB5dGhvbiAyIHJlbW92YWwsIHRoaXMgZGljdGlv bmFyeSBpcyBsYXJnZSBlbm91Z2ggdGhhdCBQeXRob24gMiBjYW4ndCBqdXN0IHVzZSBpdGVtcwor ICAgICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKKyAgICAgICAgICAgICAg ICBmb3IgdGVzdCwgZGF0YSBpbiBvYmoucmVzdWx0cy5pdGVtcygpOgorICAgICAgICAgICAgICAg ICAgICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCisgICAgICAg ICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGZvciB0ZXN0LCBkYXRhIGluIG9iai5yZXN1bHRz Lml0ZXJpdGVtcygpOgorICAgICAgICAgICAgICAgICAgICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0 ZXN0LnNwbGl0KCcvJyksIGRhdGEpCiAKICAgICAgICAgICAgIHJlc3VsdCA9IGRpY3QoCiAgICAg ICAgICAgICAgICAgdmVyc2lvbj1vYmouVkVSU0lPTiwKQEAgLTEyNyw3ICsxMzgsNyBAQCBjbGFz cyBVcGxvYWQob2JqZWN0KToKICAgICAgICAgICAgIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUg b3IgaG9zdF9wbGF0Zm9ybS5tYWNoaW5lKCksCiAgICAgICAgICkKICAgICAgICAgb3B0aW9uYWxf ZGF0YSA9IGRpY3QodmVyc2lvbl9uYW1lPXZlcnNpb25fbmFtZSwgbW9kZWw9bW9kZWwsIHN0eWxl PXN0eWxlLCBmbGF2b3I9Zmxhdm9yLCBzZGs9c2RrKQotICAgICAgICBjb25maWcudXBkYXRlKHtr ZXk6IHZhbHVlIGZvciBrZXksIHZhbHVlIGluIG9wdGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYg dmFsdWUgaXMgbm90IE5vbmV9KQorICAgICAgICBjb25maWcudXBkYXRlKHtrZXk6IHZhbHVlIGZv ciBrZXksIHZhbHVlIGluIG9wdGlvbmFsX2RhdGEuaXRlbXMoKSBpZiB2YWx1ZSBpcyBub3QgTm9u ZX0pCiAgICAgICAgIHJldHVybiBjb25maWcKIAogICAgIEBzdGF0aWNtZXRob2QKQEAgLTE1NSw3 ICsxNjYsNyBAQCBjbGFzcyBVcGxvYWQob2JqZWN0KToKICAgICBkZWYgY3JlYXRlX3J1bl9zdGF0 cyhzdGFydF90aW1lPU5vbmUsIGVuZF90aW1lPU5vbmUsIHRlc3RzX3NraXBwZWQ9Tm9uZSwgKipr d2FyZ3MpOgogICAgICAgICBzdGF0cyA9IGRpY3QoKiprd2FyZ3MpCiAgICAgICAgIG9wdGlvbmFs X2RhdGEgPSBkaWN0KHN0YXJ0X3RpbWU9c3RhcnRfdGltZSwgZW5kX3RpbWU9ZW5kX3RpbWUsIHRl c3RzX3NraXBwZWQ9dGVzdHNfc2tpcHBlZCkKLSAgICAgICAgc3RhdHMudXBkYXRlKHtrZXk6IHZh bHVlIGZvciBrZXksIHZhbHVlIGluIG9wdGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYgdmFsdWUg aXMgbm90IE5vbmV9KQorICAgICAgICBzdGF0cy51cGRhdGUoe2tleTogdmFsdWUgZm9yIGtleSwg dmFsdWUgaW4gb3B0aW9uYWxfZGF0YS5pdGVtcygpIGlmIHZhbHVlIGlzIG5vdCBOb25lfSkKICAg ICAgICAgcmV0dXJuIHN0YXRzCiAKICAgICBAc3RhdGljbWV0aG9kCkBAIC0xNjQsNyArMTc1LDcg QEAgY2xhc3MgVXBsb2FkKG9iamVjdCk6CiAKICAgICAgICAgIyBUZXN0cyB3aGljaCBkb24ndCBk ZWNsYXJlIGV4cGVjdGF0aW9ucyBvciByZXN1bHRzIGFyZSBhc3N1bWVkIHRvIGhhdmUgcGFzc2Vk LgogICAgICAgICBvcHRpb25hbF9kYXRhID0gZGljdChleHBlY3RlZD1leHBlY3RlZCwgYWN0dWFs PWFjdHVhbCwgbG9nPWxvZykKLSAgICAgICAgcmVzdWx0LnVwZGF0ZSh7a2V5OiB2YWx1ZSBmb3Ig a2V5LCB2YWx1ZSBpbiBvcHRpb25hbF9kYXRhLml0ZXJpdGVtcygpIGlmIHZhbHVlIGlzIG5vdCBO b25lfSkKKyAgICAgICAgcmVzdWx0LnVwZGF0ZSh7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBp biBvcHRpb25hbF9kYXRhLml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5vbmV9KQogICAgICAgICBy ZXR1cm4gcmVzdWx0CiAKICAgICBkZWYgdXBsb2FkKHNlbGYsIGhvc3RuYW1lLCBsb2dfbGluZV9m dW5jPWxhbWJkYSB2YWw6IHN5cy5zdGRvdXQud3JpdGUodmFsICsgJ1xuJykpOgpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNTA2MDgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2Fk X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw3ICsyMCwxMyBAQAogIyBPUiBUT1JU IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgd2Via2l0cHkudGhpcmRwYXJ0 eS5hdXRvaW5zdGFsbGVkLnJlcXVlc3RzCitpbXBvcnQgc3lzCitpZiBzeXMudmVyc2lvbl9pbmZv ID4gKDMsIDApOgorICAgICMgSW4gUHl0aG9uIDMsIHJlcXVlc3RzIGlzIGEgYnVpbHQtaW4KKyAg ICBpbXBvcnQgcmVxdWVzdHMKKyAgICBiYXNlc3RyaW5nID0gc3RyCitlbHNlOgorICAgIGltcG9y dCB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQucmVxdWVzdHMKIAogaW1wb3J0IGNv bGxlY3Rpb25zCiBpbXBvcnQganNvbgpAQCAtMzYsNyArNDIsNyBAQCBjbGFzcyBVcGxvYWRUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGNsYXNzIE9wdGlvbnMob2JqZWN0KToKICAgICAg ICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKLSAgICAgICAgICAgIGZvciBrZXksIHZh bHVlIGluIGt3YXJncy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgIGZvciBrZXksIHZhbHVlIGlu IGt3YXJncy5pdGVtcygpOgogICAgICAgICAgICAgICAgIHNldGF0dHIoc2VsZiwga2V5LCB2YWx1 ZSkKIAogICAgIGNsYXNzIE1vY2tSZXNwb25zZShvYmplY3QpOgpAQCAtNTIsNyArNTgsNyBAQCBj bGFzcyBVcGxvYWRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgaWYgaXNpbnN0YW5j ZShkYXRhLCBiYXNlc3RyaW5nKToKICAgICAgICAgICAgIHJldHVybiBzdHIoZGF0YSkKICAgICAg ICAgZWxpZiBpc2luc3RhbmNlKGRhdGEsIGNvbGxlY3Rpb25zLk1hcHBpbmcpOgotICAgICAgICAg ICAgcmV0dXJuIGRpY3QobWFwKFVwbG9hZFRlc3Qubm9ybWFsaXplLCBkYXRhLml0ZXJpdGVtcygp KSkKKyAgICAgICAgICAgIHJldHVybiBkaWN0KG1hcChVcGxvYWRUZXN0Lm5vcm1hbGl6ZSwgZGF0 YS5pdGVtcygpKSkKICAgICAgICAgZWxpZiBpc2luc3RhbmNlKGRhdGEsIGNvbGxlY3Rpb25zLkl0 ZXJhYmxlKToKICAgICAgICAgICAgIHJldHVybiB0eXBlKGRhdGEpKG1hcChVcGxvYWRUZXN0Lm5v cm1hbGl6ZSwgZGF0YSkpCiAgICAgICAgIHJldHVybiBkYXRhCg== 380052 2019-10-02 13:24:29 -0700 2019-10-08 16:49:24 -0700 Patch bug-202478-20191002132429.patch text/plain 5547 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDYyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTEwLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkucmVzdWx0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyNDc4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3Rlc3Qtd2Via2l0cHktcHl0aG9uMzogQWRkIHdlYmtpdHB5LnJlc3VsdHMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weToKKyAgICAgICAgKFVwbG9hZC5FbmNv ZGVyLmRlZmF1bHQpOiBVc2UgcmFuZ2UgaW5zdGVhZCBvZiB4cmFuZ2UuCisgICAgICAgIChVcGxv YWQuY3JlYXRlX2NvbmZpZ3VyYXRpb24pOiBTdXBwb3J0IGl0ZW1zIGl0ZXJhdGlvbiBmb3IgUHl0 aG9uIDMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3J1bl9zdGF0cyk6IENoYW5nZSBpdGVyaXRl bXMgdG8gaXRlbXMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3Rlc3RfcmVzdWx0KTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weToK KyAgICAgICAgKFVwbG9hZFRlc3QuT3B0aW9ucy5fX2luaXRfXyk6IENoYW5nZSBpdGVyaXRlbXMg dG8gaXRlbXMuCisgICAgICAgIChVcGxvYWRUZXN0Lm5vcm1hbGl6ZSk6IERpdHRvLgorCiAyMDE5 LTEwLTAyICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1NUcmVhbWVyXSBMZXQgcGxheWJpbiBoYW5kbGUgcmVkaXJlY3RzIGZvciB1cyB3aGVuIGFw cHJvcHJpYXRlCkluZGV4OiBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwkocmV2aXNpb24g MjUwNjI0KQorKysgVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5dGhvbjMJKHdvcmtpbmcg Y29weSkKQEAgLTExLDYgKzExLDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiBQWVRIT04zX0NPTVBBVElC TEVfRElSRUNUT1JJRVMgPSBbCiAgICd3ZWJraXRweS5jb21tb24uc3lzdGVtJywKICAgJ3dlYmtp dHB5LmNvbW1vbi50aHJlYWQnLAorICAnd2Via2l0cHkucmVzdWx0cycsCiBdCiAKIApJbmRleDog VG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CShyZXZpc2lvbiAyNTA2MjQp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CSh3b3JraW5nIGNv cHkpCkBAIC02Nyw3ICs2Nyw3IEBAIGNsYXNzIFVwbG9hZChvYmplY3QpOgogICAgICAgICAgICAg YnVpbGRib3RfYXJncyA9IFtkZXRhaWxzLmdldChhcmcsIE5vbmUpIGlzIE5vbmUgZm9yIGFyZyBp biBvYmouQlVJTERCT1RfREVUQUlMU10KICAgICAgICAgICAgIGlmIGFueShidWlsZGJvdF9hcmdz KSBhbmQgbm90IGFsbChidWlsZGJvdF9hcmdzKToKICAgICAgICAgICAgICAgICByYWlzZSBWYWx1 ZUVycm9yKCdBbGwgYnVpbGRib3QgZGV0YWlscyBtdXN0IGJlIGRlZmluZWQgZm9yIHVwbG9hZCwg ZGV0YWlscyBtaXNzaW5nOiB7fScuZm9ybWF0KCcsICcuam9pbigKLSAgICAgICAgICAgICAgICAg ICAgW29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBpIGluIHhyYW5nZShsZW4ob2JqLkJVSUxE Qk9UX0RFVEFJTFMpKSBpZiBidWlsZGJvdF9hcmdzW2ldXSwKKyAgICAgICAgICAgICAgICAgICAg W29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBpIGluIHJhbmdlKGxlbihvYmouQlVJTERCT1Rf REVUQUlMUykpIGlmIGJ1aWxkYm90X2FyZ3NbaV1dLAogICAgICAgICAgICAgICAgICkpKQogCiAg ICAgICAgICAgICBkZWYgdW5wYWNrX3Rlc3QoY3VycmVudCwgcGF0aF90b190ZXN0LCBkYXRhKToK QEAgLTc5LDggKzc5LDE0IEBAIGNsYXNzIFVwbG9hZChvYmplY3QpOgogICAgICAgICAgICAgICAg IHVucGFja190ZXN0KGN1cnJlbnRbcGF0aF90b190ZXN0WzBdXSwgcGF0aF90b190ZXN0WzE6XSwg ZGF0YSkKIAogICAgICAgICAgICAgcmVzdWx0cyA9IHt9Ci0gICAgICAgICAgICBmb3IgdGVzdCwg ZGF0YSBpbiBvYmoucmVzdWx0cy5pdGVyaXRlbXMoKToKLSAgICAgICAgICAgICAgICB1bnBhY2tf dGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCisKKyAgICAgICAgICAgICMgRklY TUU6IFB5dGhvbiAyIHJlbW92YWwsIHRoaXMgZGljdGlvbmFyeSBpcyBsYXJnZSBlbm91Z2ggdGhh dCBQeXRob24gMiBjYW4ndCBqdXN0IHVzZSBpdGVtcworICAgICAgICAgICAgaWYgc3lzLnZlcnNp b25faW5mbyA+ICgzLCAwKToKKyAgICAgICAgICAgICAgICBmb3IgdGVzdCwgZGF0YSBpbiBvYmou cmVzdWx0cy5pdGVtcygpOgorICAgICAgICAgICAgICAgICAgICB1bnBhY2tfdGVzdChyZXN1bHRz LCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAg ICAgIGZvciB0ZXN0LCBkYXRhIGluIG9iai5yZXN1bHRzLml0ZXJpdGVtcygpOgorICAgICAgICAg ICAgICAgICAgICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCiAK ICAgICAgICAgICAgIHJlc3VsdCA9IGRpY3QoCiAgICAgICAgICAgICAgICAgdmVyc2lvbj1vYmou VkVSU0lPTiwKQEAgLTEyNyw3ICsxMzMsNyBAQCBjbGFzcyBVcGxvYWQob2JqZWN0KToKICAgICAg ICAgICAgIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUgb3IgaG9zdF9wbGF0Zm9ybS5tYWNoaW5l KCksCiAgICAgICAgICkKICAgICAgICAgb3B0aW9uYWxfZGF0YSA9IGRpY3QodmVyc2lvbl9uYW1l PXZlcnNpb25fbmFtZSwgbW9kZWw9bW9kZWwsIHN0eWxlPXN0eWxlLCBmbGF2b3I9Zmxhdm9yLCBz ZGs9c2RrKQotICAgICAgICBjb25maWcudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBrZXksIHZhbHVl IGluIG9wdGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5vbmV9KQorICAg ICAgICBjb25maWcudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBrZXksIHZhbHVlIGluIG9wdGlvbmFs X2RhdGEuaXRlbXMoKSBpZiB2YWx1ZSBpcyBub3QgTm9uZX0pCiAgICAgICAgIHJldHVybiBjb25m aWcKIAogICAgIEBzdGF0aWNtZXRob2QKQEAgLTE1NSw3ICsxNjEsNyBAQCBjbGFzcyBVcGxvYWQo b2JqZWN0KToKICAgICBkZWYgY3JlYXRlX3J1bl9zdGF0cyhzdGFydF90aW1lPU5vbmUsIGVuZF90 aW1lPU5vbmUsIHRlc3RzX3NraXBwZWQ9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBzdGF0cyA9 IGRpY3QoKiprd2FyZ3MpCiAgICAgICAgIG9wdGlvbmFsX2RhdGEgPSBkaWN0KHN0YXJ0X3RpbWU9 c3RhcnRfdGltZSwgZW5kX3RpbWU9ZW5kX3RpbWUsIHRlc3RzX3NraXBwZWQ9dGVzdHNfc2tpcHBl ZCkKLSAgICAgICAgc3RhdHMudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBrZXksIHZhbHVlIGluIG9w dGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5vbmV9KQorICAgICAgICBz dGF0cy51cGRhdGUoe2tleTogdmFsdWUgZm9yIGtleSwgdmFsdWUgaW4gb3B0aW9uYWxfZGF0YS5p dGVtcygpIGlmIHZhbHVlIGlzIG5vdCBOb25lfSkKICAgICAgICAgcmV0dXJuIHN0YXRzCiAKICAg ICBAc3RhdGljbWV0aG9kCkBAIC0xNjQsNyArMTcwLDcgQEAgY2xhc3MgVXBsb2FkKG9iamVjdCk6 CiAKICAgICAgICAgIyBUZXN0cyB3aGljaCBkb24ndCBkZWNsYXJlIGV4cGVjdGF0aW9ucyBvciBy ZXN1bHRzIGFyZSBhc3N1bWVkIHRvIGhhdmUgcGFzc2VkLgogICAgICAgICBvcHRpb25hbF9kYXRh ID0gZGljdChleHBlY3RlZD1leHBlY3RlZCwgYWN0dWFsPWFjdHVhbCwgbG9nPWxvZykKLSAgICAg ICAgcmVzdWx0LnVwZGF0ZSh7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBpbiBvcHRpb25hbF9k YXRhLml0ZXJpdGVtcygpIGlmIHZhbHVlIGlzIG5vdCBOb25lfSkKKyAgICAgICAgcmVzdWx0LnVw ZGF0ZSh7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBpbiBvcHRpb25hbF9kYXRhLml0ZW1zKCkg aWYgdmFsdWUgaXMgbm90IE5vbmV9KQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAgICBkZWYg dXBsb2FkKHNlbGYsIGhvc3RuYW1lLCBsb2dfbGluZV9mdW5jPWxhbWJkYSB2YWw6IHN5cy5zdGRv dXQud3JpdGUodmFsICsgJ1xuJykpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1 bHRzL3VwbG9hZF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTA2MjQpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0zNiw3ICszNiw3IEBAIGNsYXNzIFVwbG9hZFRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogCiAgICAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgICAgICBkZWYgX19pbml0X18oc2Vs ZiwgKiprd2FyZ3MpOgotICAgICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0ZXJp dGVtcygpOgorICAgICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0ZW1zKCk6CiAg ICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCBrZXksIHZhbHVlKQogCiAgICAgY2xhc3MgTW9j a1Jlc3BvbnNlKG9iamVjdCk6CkBAIC01Miw3ICs1Miw3IEBAIGNsYXNzIFVwbG9hZFRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICBpZiBpc2luc3RhbmNlKGRhdGEsIGJhc2VzdHJpbmcp OgogICAgICAgICAgICAgcmV0dXJuIHN0cihkYXRhKQogICAgICAgICBlbGlmIGlzaW5zdGFuY2Uo ZGF0YSwgY29sbGVjdGlvbnMuTWFwcGluZyk6Ci0gICAgICAgICAgICByZXR1cm4gZGljdChtYXAo VXBsb2FkVGVzdC5ub3JtYWxpemUsIGRhdGEuaXRlcml0ZW1zKCkpKQorICAgICAgICAgICAgcmV0 dXJuIGRpY3QobWFwKFVwbG9hZFRlc3Qubm9ybWFsaXplLCBkYXRhLml0ZW1zKCkpKQogICAgICAg ICBlbGlmIGlzaW5zdGFuY2UoZGF0YSwgY29sbGVjdGlvbnMuSXRlcmFibGUpOgogICAgICAgICAg ICAgcmV0dXJuIHR5cGUoZGF0YSkobWFwKFVwbG9hZFRlc3Qubm9ybWFsaXplLCBkYXRhKSkKICAg ICAgICAgcmV0dXJuIGRhdGEK 380478 2019-10-08 16:49:25 -0700 2019-10-23 12:34:51 -0700 Patch bug-202478-20191008164924.patch text/plain 5835 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDg3NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBQeXRob24gMzogQWRkIHN1cHBvcnQgaW4gd2Via2l0cHkucmVzdWx0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyNDc4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3Rlc3Qtd2Via2l0cHktcHl0aG9uMzogQWRkIHdlYmtpdHB5LnJlc3VsdHMuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weToKKyAgICAgICAgKFVwbG9hZC5FbmNv ZGVyLmRlZmF1bHQpOiBVc2UgcmFuZ2UgaW5zdGVhZCBvZiB4cmFuZ2UuCisgICAgICAgIChVcGxv YWQuY3JlYXRlX2NvbmZpZ3VyYXRpb24pOiBTdXBwb3J0IGl0ZW1zIGl0ZXJhdGlvbiBmb3IgUHl0 aG9uIDMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3J1bl9zdGF0cyk6IENoYW5nZSBpdGVyaXRl bXMgdG8gaXRlbXMuCisgICAgICAgIChVcGxvYWQuY3JlYXRlX3Rlc3RfcmVzdWx0KTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weToK KyAgICAgICAgKFVwbG9hZFRlc3QuT3B0aW9ucy5fX2luaXRfXyk6IENoYW5nZSBpdGVyaXRlbXMg dG8gaXRlbXMuCisgICAgICAgIChVcGxvYWRUZXN0Lm5vcm1hbGl6ZSk6IERpdHRvLgorCiAyMDE5 LTEwLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMjUwMzc1KTogW29sZCBFV1NdIEpTQyBFV1MgaXMgYWx3YXlzIG1hcmtpbmcg UGF0Y2hlcyBhcyBzdWNjZXNzCkluZGV4OiBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0 aG9uMwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHktcHl0aG9uMwko cmV2aXNpb24gMjUwODc3KQorKysgVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5LXB5dGhvbjMJ KHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAgaW1wb3J0IHVuaXR0ZXN0CiBQWVRIT04z X0NPTVBBVElCTEVfRElSRUNUT1JJRVMgPSBbCiAgICd3ZWJraXRweS5jb21tb24uc3lzdGVtJywK ICAgJ3dlYmtpdHB5LmNvbW1vbi50aHJlYWQnLAorICAnd2Via2l0cHkucmVzdWx0cycsCiBdCiAK IApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9yZXN1bHRzL3VwbG9hZC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CShyZXZpc2lv biAyNTA4NzcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw3IEBAIGNsYXNzIFVwbG9hZChvYmplY3QpOgogICAg ICAgICAgICAgYnVpbGRib3RfYXJncyA9IFtkZXRhaWxzLmdldChhcmcsIE5vbmUpIGlzIE5vbmUg Zm9yIGFyZyBpbiBvYmouQlVJTERCT1RfREVUQUlMU10KICAgICAgICAgICAgIGlmIGFueShidWls ZGJvdF9hcmdzKSBhbmQgbm90IGFsbChidWlsZGJvdF9hcmdzKToKICAgICAgICAgICAgICAgICBy YWlzZSBWYWx1ZUVycm9yKCdBbGwgYnVpbGRib3QgZGV0YWlscyBtdXN0IGJlIGRlZmluZWQgZm9y IHVwbG9hZCwgZGV0YWlscyBtaXNzaW5nOiB7fScuZm9ybWF0KCcsICcuam9pbigKLSAgICAgICAg ICAgICAgICAgICAgW29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBpIGluIHhyYW5nZShsZW4o b2JqLkJVSUxEQk9UX0RFVEFJTFMpKSBpZiBidWlsZGJvdF9hcmdzW2ldXSwKKyAgICAgICAgICAg ICAgICAgICAgW29iai5CVUlMREJPVF9ERVRBSUxTW2ldIGZvciBpIGluIHJhbmdlKGxlbihvYmou QlVJTERCT1RfREVUQUlMUykpIGlmIGJ1aWxkYm90X2FyZ3NbaV1dLAogICAgICAgICAgICAgICAg ICkpKQogCiAgICAgICAgICAgICBkZWYgdW5wYWNrX3Rlc3QoY3VycmVudCwgcGF0aF90b190ZXN0 LCBkYXRhKToKQEAgLTc5LDggKzc5LDE0IEBAIGNsYXNzIFVwbG9hZChvYmplY3QpOgogICAgICAg ICAgICAgICAgIHVucGFja190ZXN0KGN1cnJlbnRbcGF0aF90b190ZXN0WzBdXSwgcGF0aF90b190 ZXN0WzE6XSwgZGF0YSkKIAogICAgICAgICAgICAgcmVzdWx0cyA9IHt9Ci0gICAgICAgICAgICBm b3IgdGVzdCwgZGF0YSBpbiBvYmoucmVzdWx0cy5pdGVyaXRlbXMoKToKLSAgICAgICAgICAgICAg ICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCisKKyAgICAgICAg ICAgICMgRklYTUU6IFB5dGhvbiAyIHJlbW92YWwsIHRoaXMgZGljdGlvbmFyeSBpcyBsYXJnZSBl bm91Z2ggdGhhdCBQeXRob24gMiBjYW4ndCBqdXN0IHVzZSBpdGVtcworICAgICAgICAgICAgaWYg c3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKKyAgICAgICAgICAgICAgICBmb3IgdGVzdCwgZGF0 YSBpbiBvYmoucmVzdWx0cy5pdGVtcygpOgorICAgICAgICAgICAgICAgICAgICB1bnBhY2tfdGVz dChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyksIGRhdGEpCisgICAgICAgICAgICBlbHNlOgorICAg ICAgICAgICAgICAgIGZvciB0ZXN0LCBkYXRhIGluIG9iai5yZXN1bHRzLml0ZXJpdGVtcygpOgor ICAgICAgICAgICAgICAgICAgICB1bnBhY2tfdGVzdChyZXN1bHRzLCB0ZXN0LnNwbGl0KCcvJyks IGRhdGEpCiAKICAgICAgICAgICAgIHJlc3VsdCA9IGRpY3QoCiAgICAgICAgICAgICAgICAgdmVy c2lvbj1vYmouVkVSU0lPTiwKQEAgLTEyNyw3ICsxMzMsNyBAQCBjbGFzcyBVcGxvYWQob2JqZWN0 KToKICAgICAgICAgICAgIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUgb3IgaG9zdF9wbGF0Zm9y bS5tYWNoaW5lKCksCiAgICAgICAgICkKICAgICAgICAgb3B0aW9uYWxfZGF0YSA9IGRpY3QodmVy c2lvbl9uYW1lPXZlcnNpb25fbmFtZSwgbW9kZWw9bW9kZWwsIHN0eWxlPXN0eWxlLCBmbGF2b3I9 Zmxhdm9yLCBzZGs9c2RrKQotICAgICAgICBjb25maWcudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBr ZXksIHZhbHVlIGluIG9wdGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5v bmV9KQorICAgICAgICBjb25maWcudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBrZXksIHZhbHVlIGlu IG9wdGlvbmFsX2RhdGEuaXRlbXMoKSBpZiB2YWx1ZSBpcyBub3QgTm9uZX0pCiAgICAgICAgIHJl dHVybiBjb25maWcKIAogICAgIEBzdGF0aWNtZXRob2QKQEAgLTE1NSw3ICsxNjEsNyBAQCBjbGFz cyBVcGxvYWQob2JqZWN0KToKICAgICBkZWYgY3JlYXRlX3J1bl9zdGF0cyhzdGFydF90aW1lPU5v bmUsIGVuZF90aW1lPU5vbmUsIHRlc3RzX3NraXBwZWQ9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBzdGF0cyA9IGRpY3QoKiprd2FyZ3MpCiAgICAgICAgIG9wdGlvbmFsX2RhdGEgPSBkaWN0KHN0 YXJ0X3RpbWU9c3RhcnRfdGltZSwgZW5kX3RpbWU9ZW5kX3RpbWUsIHRlc3RzX3NraXBwZWQ9dGVz dHNfc2tpcHBlZCkKLSAgICAgICAgc3RhdHMudXBkYXRlKHtrZXk6IHZhbHVlIGZvciBrZXksIHZh bHVlIGluIG9wdGlvbmFsX2RhdGEuaXRlcml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5vbmV9KQor ICAgICAgICBzdGF0cy51cGRhdGUoe2tleTogdmFsdWUgZm9yIGtleSwgdmFsdWUgaW4gb3B0aW9u YWxfZGF0YS5pdGVtcygpIGlmIHZhbHVlIGlzIG5vdCBOb25lfSkKICAgICAgICAgcmV0dXJuIHN0 YXRzCiAKICAgICBAc3RhdGljbWV0aG9kCkBAIC0xNjQsNyArMTcwLDcgQEAgY2xhc3MgVXBsb2Fk KG9iamVjdCk6CiAKICAgICAgICAgIyBUZXN0cyB3aGljaCBkb24ndCBkZWNsYXJlIGV4cGVjdGF0 aW9ucyBvciByZXN1bHRzIGFyZSBhc3N1bWVkIHRvIGhhdmUgcGFzc2VkLgogICAgICAgICBvcHRp b25hbF9kYXRhID0gZGljdChleHBlY3RlZD1leHBlY3RlZCwgYWN0dWFsPWFjdHVhbCwgbG9nPWxv ZykKLSAgICAgICAgcmVzdWx0LnVwZGF0ZSh7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBpbiBv cHRpb25hbF9kYXRhLml0ZXJpdGVtcygpIGlmIHZhbHVlIGlzIG5vdCBOb25lfSkKKyAgICAgICAg cmVzdWx0LnVwZGF0ZSh7a2V5OiB2YWx1ZSBmb3Iga2V5LCB2YWx1ZSBpbiBvcHRpb25hbF9kYXRh Lml0ZW1zKCkgaWYgdmFsdWUgaXMgbm90IE5vbmV9KQogICAgICAgICByZXR1cm4gcmVzdWx0CiAK ICAgICBkZWYgdXBsb2FkKHNlbGYsIGhvc3RuYW1lLCBsb2dfbGluZV9mdW5jPWxhbWJkYSB2YWw6 IHN5cy5zdGRvdXQud3JpdGUodmFsICsgJ1xuJykpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9yZXN1bHRzL3VwbG9hZF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTA4Nzcp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Jlc3VsdHMvdXBsb2FkX3VuaXR0ZXN0LnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0yNSwxOCArMjUsMjIgQEAgaW1wb3J0IHdlYmtpdHB5LnRoaXJkcGFy dHkuYXV0b2luc3RhbGxlZAogaW1wb3J0IGNvbGxlY3Rpb25zCiBpbXBvcnQganNvbgogaW1wb3J0 IHJlcXVlc3RzCitpbXBvcnQgc3lzCiBpbXBvcnQgdGltZQogaW1wb3J0IHVuaXR0ZXN0CiAKIGZy b20gd2Via2l0cHkucmVzdWx0cy51cGxvYWQgaW1wb3J0IFVwbG9hZAogZnJvbSB3ZWJraXRweS50 aGlyZHBhcnR5IGltcG9ydCBtb2NrCiAKK2lmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6Cisg ICAgYmFzZXN0cmluZyA9IHN0cgorCiAKIGNsYXNzIFVwbG9hZFRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogCiAgICAgY2xhc3MgT3B0aW9ucyhvYmplY3QpOgogICAgICAgICBkZWYgX19pbml0X18o c2VsZiwgKiprd2FyZ3MpOgotICAgICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0 ZXJpdGVtcygpOgorICAgICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0ZW1zKCk6 CiAgICAgICAgICAgICAgICAgc2V0YXR0cihzZWxmLCBrZXksIHZhbHVlKQogCiAgICAgY2xhc3Mg TW9ja1Jlc3BvbnNlKG9iamVjdCk6CkBAIC01Miw3ICs1Niw3IEBAIGNsYXNzIFVwbG9hZFRlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBpZiBpc2luc3RhbmNlKGRhdGEsIGJhc2VzdHJp bmcpOgogICAgICAgICAgICAgcmV0dXJuIHN0cihkYXRhKQogICAgICAgICBlbGlmIGlzaW5zdGFu Y2UoZGF0YSwgY29sbGVjdGlvbnMuTWFwcGluZyk6Ci0gICAgICAgICAgICByZXR1cm4gZGljdCht YXAoVXBsb2FkVGVzdC5ub3JtYWxpemUsIGRhdGEuaXRlcml0ZW1zKCkpKQorICAgICAgICAgICAg cmV0dXJuIGRpY3QobWFwKFVwbG9hZFRlc3Qubm9ybWFsaXplLCBkYXRhLml0ZW1zKCkpKQogICAg ICAgICBlbGlmIGlzaW5zdGFuY2UoZGF0YSwgY29sbGVjdGlvbnMuSXRlcmFibGUpOgogICAgICAg ICAgICAgcmV0dXJuIHR5cGUoZGF0YSkobWFwKFVwbG9hZFRlc3Qubm9ybWFsaXplLCBkYXRhKSkK ICAgICAgICAgcmV0dXJuIGRhdGEK