223673 2021-03-23 21:26:29 -0700 [Catalina WK2] 5 media/modern-media-controls/tracks-support tests consistently timing out 2021-03-30 21:20:14 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=223239 InRadar P2 Normal --- 1 ryanhaddad hi ap eric.carlson ews-watchlist glenn hi jer.noble philipj sergio tsavell webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1743143 0 ryanhaddad 2021-03-23 21:26:29 -0700 The following tests have been consistently timing out on Catalina WK2 bots since they were added/enabled with https://trac.webkit.org/changeset/274521/webkit media/modern-media-controls/tracks-support/auto-text-track.html media/modern-media-controls/tracks-support/click-track-in-contextmenu.html media/modern-media-controls/tracks-support/hidden-tracks.html media/modern-media-controls/tracks-support/off-text-track.html media/modern-media-controls/tracks-support/text-track-selected-via-media-api.html https://results.webkit.org/?suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&suite=layout-tests&test=media%2Fmodern-media-controls%2Ftracks-support%2Fauto-text-track.html&test=media%2Fmodern-media-controls%2Ftracks-support%2Fclick-track-in-contextmenu.html&test=media%2Fmodern-media-controls%2Ftracks-support%2Fhidden-tracks.html&test=media%2Fmodern-media-controls%2Ftracks-support%2Foff-text-track.html&test=media%2Fmodern-media-controls%2Ftracks-support%2Ftext-track-selected-via-media-api.html 1743144 1 webkit-bug-importer 2021-03-23 21:26:37 -0700 <rdar://problem/75769577> 1743145 2 ryanhaddad 2021-03-23 21:28:03 -0700 Devin, are these tests supposed to work on Catalina or should they be skipped? 1743565 3 hi 2021-03-24 15:10:38 -0700 Yeah I think these should work in Catalina. I wonder why they're working in Big Sur and not Catalina 🤔 I do see ``` CONSOLE MESSAGE: Unhandled Promise Rejection: TypeError: undefined is not an object (evaluating 'subtitlesMenu.children') ``` in the output, so perhaps adding a ``` -if (subtitlesMenu.children?.length) { +if (subtitlesMenu?.children?.length) { ``` would fix this? 1743583 4 424194 hi 2021-03-24 15:56:13 -0700 Created attachment 424194 [Patch] test for EWS to tell me what `contextmenu` is 1743584 5 424195 hi 2021-03-24 15:57:54 -0700 Created attachment 424195 [Patch] test for EWS to tell me what `contextmenu` is (after removing test expectations) 1743589 6 424197 hi 2021-03-24 16:08:10 -0700 Created attachment 424197 [Patch] test for EWS to tell me what `contextmenu` is (after removing test expectations) 1743665 7 hi 2021-03-24 21:22:09 -0700 This testing patch that I've uploaded suggests that these tests are passing on mac-wk2 (which I believe is Catalina), so I'm not really sure what to do here :/ 1743957 8 tsavell 2021-03-25 16:00:46 -0700 From looking around this issue seems to only reproduce on the Macmini8,1s on Catalina. locally I can only get a timeout running in wk1 which these tests are not ran on in production. 1745405 9 424715 hi 2021-03-30 16:44:13 -0700 Created attachment 424715 Patch 1745498 10 ews-feeder 2021-03-30 21:20:12 -0700 Committed r275265: <https://commits.webkit.org/r275265> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424715. 424194 2021-03-24 15:56:13 -0700 2021-03-24 15:57:54 -0700 [Patch] test for EWS to tell me what `contextmenu` is 223673.diff text/plain 5163 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFj a3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbAppbmRl eCBkM2NmMjQ4NmNiM2QuLmYzYTUzYWE4NWNiNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2F1dG8tdGV4dC10cmFjay5o dG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mt c3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbApAQCAtMjgsNiArMjgsNyBAQCBtZWRpYS5hZGRF dmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGdldFRyYWNrc0Nv bnRleHRNZW51KCksCiAgICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpLAogICAgICAgICAgICAgXSk7CisgICAgICAg ICAgICBkZWJ1ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgICAgICAgICBsZXQg c3VidGl0bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+ IHN1Ym1lbnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRs ZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBl ci5jaG9vc2VNZW51QWN0aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNr LXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvY2xpY2stdHJhY2staW4tY29udGV4dG1lbnUuaHRt bAppbmRleCA5OTcxMDQzM2FkOTIuLjFmOWIyMjEyOGIxNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNr LWluLWNvbnRleHRtZW51Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwK QEAgLTQxLDYgKzQxLDcgQEAgYXN5bmMgZnVuY3Rpb24gY2xpY2tPbkZyZW5jaEF1ZGlvVHJhY2so KQogewogICAgIGRlYnVnKCJTZWxlY3RpbmcgJ0ZyZW5jaCcgdHJhY2suLi4iKTsKICAgICBsZXQg Y29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworICAgIGRlYnVnKEpT T04uc3RyaW5naWZ5KGNvbnRleHRtZW51KSkKICAgICBsZXQgbGFuZ3VhZ2VzTWVudSA9IGNvbnRl eHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUgPT09ICJM YW5ndWFnZXMiKTsKICAgICBpZiAobGFuZ3VhZ2VzTWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAg ICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24obGFuZ3VhZ2VzTWVudS50aXRs ZSk7CkBAIC01Myw2ICs1NCw3IEBAIGFzeW5jIGZ1bmN0aW9uIGNsaWNrT25TcGFuaXNoQXVkaW9U cmFjaygpCiB7CiAgICAgZGVidWcoIlNlbGVjdGluZyAnU3BhbmlzaCcgdHJhY2suLi4iKTsKICAg ICBsZXQgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworICAgIGRl YnVnKEpTT04uc3RyaW5naWZ5KGNvbnRleHRtZW51KSkKICAgICBsZXQgbGFuZ3VhZ2VzTWVudSA9 IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUg PT09ICJMYW5ndWFnZXMiKTsKICAgICBpZiAobGFuZ3VhZ2VzTWVudS5jaGlsZHJlbj8ubGVuZ3Ro KSB7CiAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24obGFuZ3VhZ2VzTWVu dS50aXRsZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdHJhY2tzLXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sIGIvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRt bAppbmRleCBmNjEzZmM4ZTZlMzAuLmVlMmRlMDEzZGU5MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFj a3MuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJh Y2tzLXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sCkBAIC0yOSw2ICsyOSw3IEBAIG1lZGlhLmFk ZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgZ2V0VHJhY2tz Q29udGV4dE1lbnUoKSwKICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290 LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCiAgICAgICAgICAgICBdKTsKKyAgICAg ICAgICAgIGRlYnVnKEpTT04uc3RyaW5naWZ5KGNvbnRleHRtZW51KSkKICAgICAgICAgICAgIGxl dCBzdWJ0aXRsZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkg PT4gc3VibWVudS50aXRsZSA9PT0gIlN1YnRpdGxlcyIpOwogICAgICAgICAgICAgaWYgKHN1YnRp dGxlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVs cGVyLmNob29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2Zm LXRleHQtdHJhY2suaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sCmluZGV4IDhiNzAzYTAwNmE4MC4u NzMyYWE1Nzc1NDNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQt dHJhY2suaHRtbApAQCAtMjUsNiArMjUsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5 IiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGdldFRyYWNrc0NvbnRleHRNZW51KCksCiAgICAg ICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0 b24udHJhY2tzIikpLAogICAgICAgICAgICAgXSk7CisgICAgICAgICAgICBkZWJ1ZyhKU09OLnN0 cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgICAgICAgICBsZXQgc3VidGl0bGVzTWVudSA9IGNv bnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUgPT09 ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51LmNoaWxkcmVuPy5s ZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9u KHN1YnRpdGxlc01lbnUudGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlh LW1lZGlhLWFwaS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sCmlu ZGV4IDBhZmMxMzNkNGUzZC4uMWIxOTg1ZDI4ZjI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4dC10cmFjay1zZWxl Y3RlZC12aWEtbWVkaWEtYXBpLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlh LWFwaS5odG1sCkBAIC0zOCw2ICszOCw3IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXki LCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgICAgIGdldFRyYWNrc0NvbnRleHRNZW51KCksCiAg ICAgICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3Rv cigiYnV0dG9uLnRyYWNrcyIpKSwKICAgICAgICAgICAgICAgICBdKTsKKyAgICAgICAgICAgICAg ICBkZWJ1ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgICAgICAgICAgICAgbGV0 IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9 PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAgICAgICAgICAgaWYgKHN1 YnRpdGxlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICAgICAgICAgICAgICBhd2Fp dCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwpAQCAtNjEs NiArNjIsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAg ICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAogICAgICAgICAgICAgICAgICAg ICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3Mi KSksCiAgICAgICAgICAgICAgICAgXSk7CisgICAgICAgICAgICAgICAgZGVidWcoSlNPTi5zdHJp bmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51ID0g Y29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9 PT0gIlN1YnRpdGxlcyIpOwogICAgICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51LmNoaWxk cmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3Nl TWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsK 424195 2021-03-24 15:57:54 -0700 2021-03-24 16:08:10 -0700 [Patch] test for EWS to tell me what `contextmenu` is (after removing test expectations) 223673.diff text/plain 6171 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IDQxMGNmMzZhYmM5My4uNmU2MGM1NTFkOTI0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTY1LDcgKzY1LDYgQEAgZmFzdC90ZXh0L21hYyBbIFNraXAgXQogc2Ny b2xsaW5nY29vcmRpbmF0b3IgWyBTa2lwIF0KIG1lZGlhL21hYyBbIFNraXAgXQogbWVkaWEvaW9z IFsgU2tpcCBdCi1tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQgWyBT a2lwIF0KIGZhc3QvdGV4dC1hdXRvc2l6aW5nIFsgU2tpcCBdCiBmYXN0L2Nzcy92YXJpYWJsZXMv ZW52L2lvcyBbIFNraXAgXQogaHR0cC90ZXN0cy9ldmVudHMvdG91Y2gvaW9zIFsgU2tpcCBdCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tz LXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKaW5kZXgg ZDNjZjI0ODZjYjNkLi5mM2E1M2FhODVjYjQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRt bAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKQEAgLTI4LDYgKzI4LDcgQEAgbWVkaWEuYWRkRXZl bnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250 ZXh0TWVudSgpLAogICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVl cnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOworICAgICAgICAg ICAgZGVidWcoSlNPTi5zdHJpbmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgbGV0IHN1 YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBz dWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAgICAgICBpZiAoc3VidGl0bGVz TWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIu Y2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10 cmFjay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwK aW5kZXggOTk3MTA0MzNhZDkyLi4xZjliMjIxMjhiMTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1p bi1jb250ZXh0bWVudS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sCkBA IC00MSw2ICs0MSw3IEBAIGFzeW5jIGZ1bmN0aW9uIGNsaWNrT25GcmVuY2hBdWRpb1RyYWNrKCkK IHsKICAgICBkZWJ1ZygiU2VsZWN0aW5nICdGcmVuY2gnIHRyYWNrLi4uIik7CiAgICAgbGV0IGNv bnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKKyAgICBkZWJ1ZyhKU09O LnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgbGV0IGxhbmd1YWdlc01lbnUgPSBjb250ZXh0 bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiTGFu Z3VhZ2VzIik7CiAgICAgaWYgKGxhbmd1YWdlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgewogICAg ICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUudGl0bGUp OwpAQCAtNTMsNiArNTQsNyBAQCBhc3luYyBmdW5jdGlvbiBjbGlja09uU3BhbmlzaEF1ZGlvVHJh Y2soKQogewogICAgIGRlYnVnKCJTZWxlY3RpbmcgJ1NwYW5pc2gnIHRyYWNrLi4uIik7CiAgICAg bGV0IGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKKyAgICBkZWJ1 ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgbGV0IGxhbmd1YWdlc01lbnUgPSBj b250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09 PSAiTGFuZ3VhZ2VzIik7CiAgICAgaWYgKGxhbmd1YWdlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkg ewogICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUu dGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbCBiL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tzLmh0bWwK aW5kZXggZjYxM2ZjOGU2ZTMwLi5lZTJkZTAxM2RlOTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tz Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbApAQCAtMjksNiArMjksNyBAQCBtZWRpYS5hZGRF dmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGdldFRyYWNrc0Nv bnRleHRNZW51KCksCiAgICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpLAogICAgICAgICAgICAgXSk7CisgICAgICAg ICAgICBkZWJ1ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgICAgICAgICBsZXQg c3VidGl0bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+ IHN1Ym1lbnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRs ZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBl ci5jaG9vc2VNZW51QWN0aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10 ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv dHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbAppbmRleCA4YjcwM2EwMDZhODAuLjcz MmFhNTc3NTQzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRy YWNrLmh0bWwKQEAgLTI1LDYgKzI1LDcgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIs ICgpID0+IHsKICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAogICAgICAg ICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9u LnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgZGVidWcoSlNPTi5zdHJp bmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250 ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAi U3VidGl0bGVzIik7CiAgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudS5jaGlsZHJlbj8ubGVu Z3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihz dWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1t ZWRpYS1hcGkuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbAppbmRl eCAwYWZjMTMzZDRlM2QuLjFiMTk4NWQyOGYyOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0 ZWQtdmlhLW1lZGlhLWFwaS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1h cGkuaHRtbApAQCAtMzgsNiArMzgsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5Iiwg KCkgPT4gewogICAgICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAogICAg ICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3Io ImJ1dHRvbi50cmFja3MiKSksCiAgICAgICAgICAgICAgICAgXSk7CisgICAgICAgICAgICAgICAg ZGVidWcoSlNPTi5zdHJpbmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgICAgIGxldCBz dWJ0aXRsZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4g c3VibWVudS50aXRsZSA9PT0gIlN1YnRpdGxlcyIpOwogICAgICAgICAgICAgICAgIGlmIChzdWJ0 aXRsZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICAgICAgYXdhaXQg VUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKQEAgLTYxLDYg KzYyLDcgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAg ICAgICAgICAgICAgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKICAgICAgICAgICAgICAgICAgICAg cHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikp LAogICAgICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgICAgIGRlYnVnKEpTT04uc3RyaW5n aWZ5KGNvbnRleHRtZW51KSkKICAgICAgICAgICAgICAgICBsZXQgc3VidGl0bGVzTWVudSA9IGNv bnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUgPT09 ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudS5jaGlsZHJl bj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1l bnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMmI0MTVkY2I2NjE0Li42MmFhYTFiZWJjMDEg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAg LTE5LDcgKzE5LDYgQEAgZmFzdC9zY3JvbGxpbmcvbWFjIFsgUGFzcyBdCiBmYXN0L3Zpc3VhbC12 aWV3cG9ydC90aWxlZC1kcmF3aW5nIFsgUGFzcyBdCiBmYXN0L3dlYi1zaGFyZSBbIFBhc3MgXQog aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWItc2hhcmUgWyBQYXNzIF0KLW1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydCBbIFBhc3MgXQogc2Nyb2xsaW5n Y29vcmRpbmF0b3IgWyBQYXNzIF0KIHNjcm9sbGluZ2Nvb3JkaW5hdG9yL2lvcyBbIFNraXAgXQog c3dpcGUgWyBQYXNzIF0K 424197 2021-03-24 16:08:10 -0700 2021-03-30 16:44:13 -0700 [Patch] test for EWS to tell me what `contextmenu` is (after removing test expectations) 223673.diff text/plain 6171 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IDQxMGNmMzZhYmM5My4uNmU2MGM1NTFkOTI0IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTY1LDcgKzY1LDYgQEAgZmFzdC90ZXh0L21hYyBbIFNraXAgXQogc2Ny b2xsaW5nY29vcmRpbmF0b3IgWyBTa2lwIF0KIG1lZGlhL21hYyBbIFNraXAgXQogbWVkaWEvaW9z IFsgU2tpcCBdCi1tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQgWyBT a2lwIF0KIGZhc3QvdGV4dC1hdXRvc2l6aW5nIFsgU2tpcCBdCiBmYXN0L2Nzcy92YXJpYWJsZXMv ZW52L2lvcyBbIFNraXAgXQogaHR0cC90ZXN0cy9ldmVudHMvdG91Y2gvaW9zIFsgU2tpcCBdCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tz LXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKaW5kZXgg ZDNjZjI0ODZjYjNkLi5mM2E1M2FhODVjYjQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRt bAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKQEAgLTI4LDYgKzI4LDcgQEAgbWVkaWEuYWRkRXZl bnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250 ZXh0TWVudSgpLAogICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVl cnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOworICAgICAgICAg ICAgZGVidWcoSlNPTi5zdHJpbmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgbGV0IHN1 YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBz dWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAgICAgICBpZiAoc3VidGl0bGVz TWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIu Y2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10 cmFjay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwK aW5kZXggOTk3MTA0MzNhZDkyLi4xZjliMjIxMjhiMTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1p bi1jb250ZXh0bWVudS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sCkBA IC00MSw2ICs0MSw3IEBAIGFzeW5jIGZ1bmN0aW9uIGNsaWNrT25GcmVuY2hBdWRpb1RyYWNrKCkK IHsKICAgICBkZWJ1ZygiU2VsZWN0aW5nICdGcmVuY2gnIHRyYWNrLi4uIik7CiAgICAgbGV0IGNv bnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKKyAgICBkZWJ1ZyhKU09O LnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgbGV0IGxhbmd1YWdlc01lbnUgPSBjb250ZXh0 bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiTGFu Z3VhZ2VzIik7CiAgICAgaWYgKGxhbmd1YWdlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgewogICAg ICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUudGl0bGUp OwpAQCAtNTMsNiArNTQsNyBAQCBhc3luYyBmdW5jdGlvbiBjbGlja09uU3BhbmlzaEF1ZGlvVHJh Y2soKQogewogICAgIGRlYnVnKCJTZWxlY3RpbmcgJ1NwYW5pc2gnIHRyYWNrLi4uIik7CiAgICAg bGV0IGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKKyAgICBkZWJ1 ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgbGV0IGxhbmd1YWdlc01lbnUgPSBj b250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09 PSAiTGFuZ3VhZ2VzIik7CiAgICAgaWYgKGxhbmd1YWdlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkg ewogICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUu dGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbCBiL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tzLmh0bWwK aW5kZXggZjYxM2ZjOGU2ZTMwLi5lZTJkZTAxM2RlOTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tz Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbApAQCAtMjksNiArMjksNyBAQCBtZWRpYS5hZGRF dmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGdldFRyYWNrc0Nv bnRleHRNZW51KCksCiAgICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpLAogICAgICAgICAgICAgXSk7CisgICAgICAg ICAgICBkZWJ1ZyhKU09OLnN0cmluZ2lmeShjb250ZXh0bWVudSkpCiAgICAgICAgICAgICBsZXQg c3VidGl0bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+ IHN1Ym1lbnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRs ZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBl ci5jaG9vc2VNZW51QWN0aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10 ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv dHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbAppbmRleCA4YjcwM2EwMDZhODAuLjcz MmFhNTc3NTQzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRy YWNrLmh0bWwKQEAgLTI1LDYgKzI1LDcgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIs ICgpID0+IHsKICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAogICAgICAg ICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9u LnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgZGVidWcoSlNPTi5zdHJp bmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250 ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAi U3VidGl0bGVzIik7CiAgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudS5jaGlsZHJlbj8ubGVu Z3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihz dWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1t ZWRpYS1hcGkuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbAppbmRl eCAwYWZjMTMzZDRlM2QuLjFiMTk4NWQyOGYyOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0 ZWQtdmlhLW1lZGlhLWFwaS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1h cGkuaHRtbApAQCAtMzgsNiArMzgsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5Iiwg KCkgPT4gewogICAgICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAogICAg ICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3Io ImJ1dHRvbi50cmFja3MiKSksCiAgICAgICAgICAgICAgICAgXSk7CisgICAgICAgICAgICAgICAg ZGVidWcoSlNPTi5zdHJpbmdpZnkoY29udGV4dG1lbnUpKQogICAgICAgICAgICAgICAgIGxldCBz dWJ0aXRsZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4g c3VibWVudS50aXRsZSA9PT0gIlN1YnRpdGxlcyIpOwogICAgICAgICAgICAgICAgIGlmIChzdWJ0 aXRsZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICAgICAgYXdhaXQg VUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKQEAgLTYxLDYg KzYyLDcgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAg ICAgICAgICAgICAgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKICAgICAgICAgICAgICAgICAgICAg cHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikp LAogICAgICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgICAgIGRlYnVnKEpTT04uc3RyaW5n aWZ5KGNvbnRleHRtZW51KSkKICAgICAgICAgICAgICAgICBsZXQgc3VidGl0bGVzTWVudSA9IGNv bnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUgPT09 ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudS5jaGlsZHJl bj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1l bnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMmI0MTVkY2I2NjE0Li42MmFhYTFiZWJjMDEg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAg LTE5LDcgKzE5LDYgQEAgZmFzdC9zY3JvbGxpbmcvbWFjIFsgUGFzcyBdCiBmYXN0L3Zpc3VhbC12 aWV3cG9ydC90aWxlZC1kcmF3aW5nIFsgUGFzcyBdCiBmYXN0L3dlYi1zaGFyZSBbIFBhc3MgXQog aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWItc2hhcmUgWyBQYXNzIF0KLW1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydCBbIFBhc3MgXQogc2Nyb2xsaW5n Y29vcmRpbmF0b3IgWyBQYXNzIF0KIHNjcm9sbGluZ2Nvb3JkaW5hdG9yL2lvcyBbIFNraXAgXQog c3dpcGUgWyBQYXNzIF0K 424715 2021-03-30 16:44:13 -0700 2021-03-30 21:20:13 -0700 Patch 223673.diff text/plain 6884 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNmNlYzJmMGVlNmYuLjY2YTJhNjg3ZDU4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIxLTAzLTMwICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAg ICBbQ2F0YWxpbmEgV0syXSA1IG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3Vw cG9ydCB0ZXN0cyBjb25zaXN0ZW50bHkgdGltaW5nIG91dAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIzNjczCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS83NTc2OTU3Nz4KKworICAgICAgICBVbnJldmlld2VkLCBjaGVjayB0aGF0IHRoZSBgc3VidGl0 bGVzTWVudWAgZXhpc3RzIGJlZm9yZSBhdHRlbXB0aW5nIHRvIGxvb2sgYXQgaXRzIGBjaGlsZHJl bmAuCisKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBv cnQvYXV0by10ZXh0LXRyYWNrLmh0bWw6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWw6Cisg ICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRl bi10cmFja3MuaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJh Y2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVk aWEtYXBpLmh0bWw6CisKIDIwMjEtMDMtMzAgIFJvYmVydCBKZW5uZXIgIDxqZW5uZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIFsgbWFjT1MgaU9TIF0gY3J5cHRvL2NyeXB0by1yYW5kb20tdmFsdWVz LW9vbS5odG1sIGlzIGEgZmxha2V5IHRpbWVvdXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21l ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2su aHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3Vw cG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbAppbmRleCBkM2NmMjQ4NmNiM2QuLmIyNmY4ODM5MjQ5 OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L2F1dG8tdGV4dC10cmFjay5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRt bApAQCAtMjksNyArMjksNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4g ewogICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3Rv cigiYnV0dG9uLnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOwogICAgICAgICAgICAgbGV0IHN1 YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBz dWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7Ci0gICAgICAgICAgICBpZiAoc3VidGl0bGVz TWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CisgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudT8u Y2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29z ZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CiAgICAgICAgICAgICAgICAgYXdhaXQg VUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsgLy8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51IHRvIGFu aW1hdGUKICAgICAgICAgICAgICAgICBjb250ZXh0bWVudSA9IFtzdWJ0aXRsZXNNZW51XTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mt c3VwcG9ydC9jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNv bnRleHRtZW51Lmh0bWwKaW5kZXggOTk3MTA0MzNhZDkyLi43OWEwNWYyNWM3NWYgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9y dC9jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1pbi1jb250 ZXh0bWVudS5odG1sCkBAIC00Miw3ICs0Miw3IEBAIGFzeW5jIGZ1bmN0aW9uIGNsaWNrT25GcmVu Y2hBdWRpb1RyYWNrKCkKICAgICBkZWJ1ZygiU2VsZWN0aW5nICdGcmVuY2gnIHRyYWNrLi4uIik7 CiAgICAgbGV0IGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKICAg ICBsZXQgbGFuZ3VhZ2VzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1l bnUpID0+IHN1Ym1lbnUudGl0bGUgPT09ICJMYW5ndWFnZXMiKTsKLSAgICBpZiAobGFuZ3VhZ2Vz TWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CisgICAgaWYgKGxhbmd1YWdlc01lbnU/LmNoaWxkcmVu Py5sZW5ndGgpIHsKICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihsYW5n dWFnZXNNZW51LnRpdGxlKTsKICAgICAgICAgYXdhaXQgVUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsg Ly8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51IHRvIGFuaW1hdGUKICAgICB9CkBAIC01NCw3ICs1 NCw3IEBAIGFzeW5jIGZ1bmN0aW9uIGNsaWNrT25TcGFuaXNoQXVkaW9UcmFjaygpCiAgICAgZGVi dWcoIlNlbGVjdGluZyAnU3BhbmlzaCcgdHJhY2suLi4iKTsKICAgICBsZXQgY29udGV4dG1lbnUg PSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOwogICAgIGxldCBsYW5ndWFnZXNNZW51ID0g Y29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9 PT0gIkxhbmd1YWdlcyIpOwotICAgIGlmIChsYW5ndWFnZXNNZW51LmNoaWxkcmVuPy5sZW5ndGgp IHsKKyAgICBpZiAobGFuZ3VhZ2VzTWVudT8uY2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICBh d2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKGxhbmd1YWdlc01lbnUudGl0bGUpOwogICAg ICAgICBhd2FpdCBVSUhlbHBlci5kZWxheUZvcig1MDApOyAvLyBnaXZlIHRpbWUgZm9yIHRoZSBV SU1lbnUgdG8gYW5pbWF0ZQogICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tzLmh0bWwgYi9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaGlk ZGVuLXRyYWNrcy5odG1sCmluZGV4IGY2MTNmYzhlNmUzMC4uMGM5MTcxYWZkNDQ2IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBv cnQvaGlkZGVuLXRyYWNrcy5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tzLmh0bWwKQEAgLTMwLDcgKzMw LDcgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAgICAg ICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFj a3MiKSksCiAgICAgICAgICAgICBdKTsKICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51ID0g Y29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9 PT0gIlN1YnRpdGxlcyIpOwotICAgICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnUuY2hpbGRyZW4/ Lmxlbmd0aCkgeworICAgICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnU/LmNoaWxkcmVuPy5sZW5n dGgpIHsKICAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0aW9uKHN1 YnRpdGxlc01lbnUudGl0bGUpOwogICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5 Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmltYXRlCiAgICAgICAg ICAgICAgICAgY29udGV4dG1lbnUgPSBbc3VidGl0bGVzTWVudV07CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRl eHQtdHJhY2suaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sCmluZGV4IDhiNzAzYTAwNmE4MC4uNzVh NTRhYTc5Njg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJh Y2suaHRtbApAQCAtMjYsNyArMjYsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5Iiwg KCkgPT4gewogICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlT ZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKSwKICAgICAgICAgICAgIF0pOwogICAgICAgICAgICAg bGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51 KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7Ci0gICAgICAgICAgICBpZiAoc3Vi dGl0bGVzTWVudS5jaGlsZHJlbj8ubGVuZ3RoKSB7CisgICAgICAgICAgICBpZiAoc3VidGl0bGVz TWVudT8uY2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVy LmNob29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CiAgICAgICAgICAgICAgICAg YXdhaXQgVUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsgLy8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51 IHRvIGFuaW1hdGUKICAgICAgICAgICAgICAgICBjb250ZXh0bWVudSA9IFtzdWJ0aXRsZXNNZW51 XTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbCBiL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0 LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbAppbmRleCAwYWZjMTMzZDRlM2QuLmI0 YTI5Njc2MTA3YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5o dG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mt c3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbApAQCAtMzksNyAr MzksNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAg ICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRv bi50cmFja3MiKSksCiAgICAgICAgICAgICAgICAgXSk7CiAgICAgICAgICAgICAgICAgbGV0IHN1 YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBz dWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7Ci0gICAgICAgICAgICAgICAgaWYgKHN1YnRp dGxlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgeworICAgICAgICAgICAgICAgIGlmIChzdWJ0aXRs ZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJ SGVscGVyLmNob29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CiAgICAgICAgICAg ICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3Ig dGhlIFVJTWVudSB0byBhbmltYXRlCiAgICAgICAgICAgICAgICAgICAgIGNvbnRleHRtZW51ID0g W3N1YnRpdGxlc01lbnVdOwpAQCAtNjIsNyArNjIsNyBAQCBtZWRpYS5hZGRFdmVudExpc3RlbmVy KCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFk b3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCiAgICAgICAgICAgICAgICAg XSk7CiAgICAgICAgICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5j aGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7 Ci0gICAgICAgICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnUuY2hpbGRyZW4/Lmxlbmd0aCkgewor ICAgICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAg ICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24oc3VidGl0 bGVzTWVudS50aXRsZSk7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5 Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmltYXRlCiAgICAgICAg ICAgICAgICAgICAgIGNvbnRleHRtZW51ID0gW3N1YnRpdGxlc01lbnVdOwo=