232847 2021-11-08 13:43:12 -0800 Convert more wheel event tests to UIHelper.mouseWheelSequence() 2021-11-09 07:29:21 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser ntim simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1812813 0 simon.fraser 2021-11-08 13:43:12 -0800 Convert more wheel event tests to UIHelper.mouseWheelSequence() 1812814 1 443598 simon.fraser 2021-11-08 13:44:24 -0800 Created attachment 443598 Patch 1812820 2 443598 ntim 2021-11-08 13:49:19 -0800 Comment on attachment 443598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443598&action=review You can simplify the code in ui-helper.js > LayoutTests/resources/ui-helper.js:111 > + static async mouseWheelSequence(eventStream, options) static async mouseWheelSequence(eventStream, { waitForCompletion = true }) > LayoutTests/resources/ui-helper.js:119 > + const waitForScrollCompletion = options?.waitForCompletion ?? true; > + if (waitForScrollCompletion) if (waitForCompletion) > LayoutTests/resources/ui-helper.js:132 > + if (waitForScrollCompletion) ditto 1812821 3 443598 ntim 2021-11-08 13:56:36 -0800 Comment on attachment 443598 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443598&action=review > LayoutTests/fast/scrolling/mac/momentum-axis-locking.html:162 > + await UIHelper.mouseWheelSequence({ events: events }); here and below: { events: events } -> { events } works as well 1812832 4 443598 wenson_hsieh 2021-11-08 14:09:44 -0800 Comment on attachment 443598 Patch r=me (with Tim's suggestions) 1812833 5 443604 simon.fraser 2021-11-08 14:10:31 -0800 Created attachment 443604 Patch 1813138 6 simon.fraser 2021-11-09 07:28:24 -0800 https://trac.webkit.org/changeset/285498/webkit 1813139 7 webkit-bug-importer 2021-11-09 07:29:21 -0800 <rdar://problem/85201668> 443598 2021-11-08 13:44:24 -0800 2021-11-08 14:10:29 -0800 Patch bug-232847-20211108134423.patch text/plain 19618 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDA5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWI0ZGE2YjAxOGU5NzExYWRjMDU4 YTMyNGQ3MTdkNDA5OWQ3ZGExMi4uZjg5NzlhYzBjODljM2FlYjdkMjRiNTBhZmNhNDkyMzNiOGFk NzVkOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTExLTA4ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgbW9yZSB3aGVlbCBldmVu dCB0ZXN0cyB0byBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVuY2UoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIG9wdGlvbnMgcGFyYW1ldGVy IHRvIG1vdXNlV2hlZWxTZXF1ZW5jZSgpIHNvIHdlIGNhbiBoYXZlIGEgdmVyc2lvbiB0aGF0IGRv ZW5zJ3QKKyAgICAgICAgd2FpdC4KKworICAgICAgICBTb21lIHRlc3RzIG5lZWQgdG8gaGF2ZSBt aW5vciBwb3NpdGlvbiBjaGFuZ2VzIHRvIGRlZmF1bHQgdGhlIHdoZWVsIGV2ZW50IGNvYWxlc2Np bmcgY29kZQorICAgICAgICBpbiBXZWJXaGVlbEV2ZW50Q29hbGVzY2VyLgorCisgICAgICAgICog ZmFzdC9zY3JvbGxpbmcvbWFjL21vbWVudHVtLWF4aXMtbG9ja2luZy5odG1sOgorICAgICAgICAq IGZhc3Qvc2Nyb2xsaW5nL21hYy9vdmVyZmxvdy1oaWRkZW4tb24tb25lLWF4aXMtYXN5bmMtb3Zl cmZsb3cuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVu LW9uLW9uZS1heGlzLmh0bWw6CisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvbWFjL3Byb2dyYW1t YXRpYy1zY3JvbGwtb3ZlcnJpZGVzLXJ1YmJlcmJhbmQuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Nj cm9sbGluZy9tYWMvd2hlZWwtZXZlbnQtZGVsdGFzLWFyZS1ub3QtZmlsdGVyZWQuaHRtbDoKKyAg ICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAgICAod2luZG93LlVJSGVscGVy LmFzeW5jIG1vdXNlV2hlZWxTZXF1ZW5jZSk6CisKIDIwMjEtMTEtMDggIEFudHRpIEtvaXZpc3Rv ICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MgQ2FzY2FkZSBMYXllcnNdIFN1cHBv cnQgJ3JldmVydC1sYXllcicgdmFsdWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Ny b2xsaW5nL21hYy9tb21lbnR1bS1heGlzLWxvY2tpbmcuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv c2Nyb2xsaW5nL21hYy9tb21lbnR1bS1heGlzLWxvY2tpbmcuaHRtbAppbmRleCBjZThmMGZkMTU2 M2I0YjQyMTA4Mzg3MDIzMGRmMjgwZWJjNDU5YTJhLi4xMjRmY2YxMGUwMjI0NGZiOGUwNDRjNmUz NzE5YWNmZmVhMWRlZGY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9t YWMvbW9tZW50dW0tYXhpcy1sb2NraW5nLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3Jv bGxpbmcvbWFjL21vbWVudHVtLWF4aXMtbG9ja2luZy5odG1sCkBAIC0zNCwyMCArMzQsNjIgQEAK IAogICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9sbCcsIHNjcm9sbExp c3RlbmVyKTsKIAotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7 Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7CiAgICAgICAg ICAgICAvLyBTY3JvbGwgdXAgd2l0aCBzb21lIHNpZGV3YXlzIGRyaWZ0LgotICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0y LCAiYmVnYW4iLCAibm9uZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC eVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDEsIC0yLCAiY2hhbmdlZCIsICJub25lIik7Ci0g ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1Q aGFzZXMoMSwgLTIsICJjaGFuZ2VkIiwgIm5vbmUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVy Lm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAiZW5kZWQiLCAi bm9uZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFu ZE1vbWVudHVtUGhhc2VzKDEsIC0yLCAibm9uZSIsICJiZWdpbiIpOwotICAgICAgICAgICAgZXZl bnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDEsIC0yLCAi bm9uZSIsICJjb250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC eVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDIsIC0zLCAibm9uZSIsICJjb250aW51ZSIpOwot ICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVt UGhhc2VzKDEsIC0yLCAibm9uZSIsICJjb250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5k ZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDAsICJub25lIiwg ImVuZCIpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvclNjcm9sbENvbXBsZXRp b24oKTsKKyAgICAgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICB2 aWV3WCA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgdmlld1kgOiAxMDAsCisgICAgICAgICAg ICAgICAgICAgIGRlbHRhWSA6IC0yMCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVn YW4iCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAxMCwK KyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTIwLAorICAgICAgICAgICAgICAgICAgICBw aGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAg ZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0yMCwKKyAgICAgICAg ICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAg ICAgICAgICAgICAgIHBoYXNlIDogImVuZGVkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAg ICAgICAgICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0y MCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJiZWdhbiIKKyAgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6 ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IDEwLAorICAgICAgICAgICAg ICAgICAgICBkZWx0YVkgOiAtMjAsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2Ug OiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRh WCA6IDIwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMzAsCisgICAgICAgICAgICAg ICAgICAgIG1vbWVudHVtUGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAg ICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAg ICAgICAgICAgICAgICAgIGRlbHRhWCA6IDEwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkg OiAtMjAsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiY2hhbmdlZCIKKyAg ICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAg dHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiZW5k ZWQiCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgXTsKIAorICAgICAgICAgICAgYXdh aXQgVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNlKHsgZXZlbnRzOiBldmVudHMgfSk7CiAgICAg ICAgICAgICB3aW5kb3cucmVtb3ZlRXZlbnRMaXN0ZW5lcignc2Nyb2xsJywgc2Nyb2xsTGlzdGVu ZXIpOwogICAgICAgICB9CiAKQEAgLTYzLDIwICsxMDUsNjEgQEAKIAogICAgICAgICAgICAgd2lu ZG93LmFkZEV2ZW50TGlzdGVuZXIoJ3Njcm9sbCcsIHNjcm9sbExpc3RlbmVyKTsKIAotICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7Ci0gICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7CiAgICAgICAgICAgICAvLyBTY3JvbGwgcmln aHQgd2l0aCBzb21lIHVwd2FyZHMgZHJpZnQuCi0gICAgICAgICAgICBldmVudFNlbmRlci5tb3Vz ZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTIsIDAsICJiZWdhbiIsICJub25l Iik7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9t ZW50dW1QaGFzZXMoLTIsIC0xLCAiY2hhbmdlZCIsICJub25lIik7Ci0gICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTIsIC0xLCAi Y2hhbmdlZCIsICJub25lIik7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5 V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwgImVuZGVkIiwgIm5vbmUiKTsKLSAgICAg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNl cygtMiwgMCwgIm5vbmUiLCAiYmVnaW4iKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl U2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMiwgMSwgIm5vbmUiLCAiY29udGlu dWUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRN b21lbnR1bVBoYXNlcygtMywgMiwgIm5vbmUiLCAiY29udGludWUiKTsKLSAgICAgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMiwgMSwg Im5vbmUiLCAiY29udGludWUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xs QnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAibm9uZSIsICJlbmQiKTsKLSAgICAg ICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21wbGV0aW9uKCk7CisgICAgICAg ICAgICBjb25zdCBldmVudHMgPSBbCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAg ICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDAsCisg ICAgICAgICAgICAgICAgICAgIHZpZXdZIDogMTAwLAorICAgICAgICAgICAgICAgICAgICBkZWx0 YVggOiAtMjAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImJlZ2FuIgorICAgICAgICAg ICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDog IndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogLTIwLAorICAgICAgICAgICAg ICAgICAgICBkZWx0YVkgOiAtMTAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImNoYW5n ZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAtMjAs CisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0xMCwKKyAgICAgICAgICAgICAgICAgICAg cGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAg IHBoYXNlIDogImVuZGVkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAg ZGVsdGFYIDogLTIwLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImJlZ2Fu IgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAg ICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogLTIwLAor ICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAxMCwKKyAgICAgICAgICAgICAgICAgICAgbW9t ZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAg ICAgICAgZGVsdGFYIDogLTMwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAyMCwKKyAg ICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAg ICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndo ZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogLTIwLAorICAgICAgICAgICAgICAg ICAgICBkZWx0YVkgOiAxMCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJj aGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1Q aGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdOwogCisgICAg ICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVuY2UoeyBldmVudHM6IGV2ZW50 cyB9KTsKICAgICAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCdzY3JvbGwnLCBz Y3JvbGxMaXN0ZW5lcik7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zY3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1vbi1vbmUtYXhpcy1hc3luYy1vdmVyZmxv dy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1v bi1vbmUtYXhpcy1hc3luYy1vdmVyZmxvdy5odG1sCmluZGV4IDE3MDcwNDg5YjZmNTkxZmUyNmQx ZDU1MjkxODUyOWU2ODM2YmM2MDcuLjA0MGU2OWIwNjQ1ZTAxNGM3ZGJjMmU0YzZhNjM2NTM4MmY3 YTFhYmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9vdmVyZmxv dy1oaWRkZW4tb24tb25lLWF4aXMtYXN5bmMtb3ZlcmZsb3cuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVuLW9uLW9uZS1heGlzLWFzeW5jLW92 ZXJmbG93Lmh0bWwKQEAgLTYwLDE4ICs2MCw0MCBAQAogCiAgICAgYXN5bmMgZnVuY3Rpb24gc2Ny b2xsVGVzdCgpCiAgICAgewotICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEw MCk7Ci0KLSAgICAgICAgLy8gU2lkZXdheXMgc2Nyb2xsLgotICAgICAgICBldmVudFNlbmRlci5t b25pdG9yV2hlZWxFdmVudHMoKTsKLSAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdp dGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnYmVnYW4nLCAnbm9uZScpOwotICAgICAg ICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEw LCAwLCAnY2hhbmdlZCcsICdub25lJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xs QnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAnZW5kZWQnLCAnbm9uZScpOwotICAg ICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMo LTEwLCAwLCAnbm9uZScsICdiZWdpbicpOwotICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9s bEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAnbm9uZScsICdjb250aW51ZScp OwotICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1Q aGFzZXMoMCwgMCwgJ25vbmUnLCAnZW5kJyk7Ci0gICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRG b3JTY3JvbGxDb21wbGV0aW9uKCk7CisgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICB2 aWV3WCA6IDEwMCwKKyAgICAgICAgICAgICAgICB2aWV3WSA6IDEwMCwKKyAgICAgICAgICAgICAg ICBkZWx0YVggOiAtMTAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVnYW4iCisgICAgICAg ICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAor ICAgICAgICAgICAgICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAi Y2hhbmdlZCIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg dHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiZW5kZWQiCisgICAgICAg ICAgICB9LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAor ICAgICAgICAgICAgICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgbW9tZW50dW1Q aGFzZSA6ICJiZWdhbiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgZGVsdGFYIDogLTEwMCwKKyAg ICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICB9LAor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAg ICAgICAgIG1vbWVudHVtUGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICB9CisgICAgICAgIF07 CiAKKyAgICAgICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNlKHsgZXZlbnRzOiBl dmVudHMgfSk7CiAgICAgICAgIGNoZWNrRm9yU2Nyb2xsKCk7CiAgICAgfQogCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVuLW9uLW9uZS1h eGlzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVu LW9uLW9uZS1heGlzLmh0bWwKaW5kZXggMmJlYWZlODEwOTkwZGFjNTVjNTdjMDE2ZjQ5OTEyYTQ0 NDllZWJlMS4uNjk2OTQ0YzU3YzU2NjQ3ZjFjOWYyNDdmNGIyMWFiMTBlZGY3ZjY1OSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1vbi1v bmUtYXhpcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9vdmVyZmxv dy1oaWRkZW4tb24tb25lLWF4aXMuaHRtbApAQCAtNjAsMTggKzYwLDQwIEBACiAKICAgICBhc3lu YyBmdW5jdGlvbiBzY3JvbGxUZXN0KCkKICAgICB7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl TW92ZVRvKDEwMCwgMTAwKTsKLQotICAgICAgICAvLyBTaWRld2F5cyBzY3JvbGwuCi0gICAgICAg IGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwotICAgICAgICBldmVudFNlbmRlci5t b3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdiZWdhbicsICdu b25lJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21l bnR1bVBoYXNlcygtMTAsIDAsICdjaGFuZ2VkJywgJ25vbmUnKTsKLSAgICAgICAgZXZlbnRTZW5k ZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDAsICdlbmRlZCcs ICdub25lJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRN b21lbnR1bVBoYXNlcygtMTAsIDAsICdub25lJywgJ2JlZ2luJyk7Ci0gICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMTAsIDAsICdub25l JywgJ2NvbnRpbnVlJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hl ZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAnbm9uZScsICdlbmQnKTsKLSAgICAgICAgYXdhaXQg VUlIZWxwZXIud2FpdEZvclNjcm9sbENvbXBsZXRpb24oKTsKKyAgICAgICAgY29uc3QgZXZlbnRz ID0gWworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAg ICAgICAgICAgICAgIHZpZXdYIDogMTAwLAorICAgICAgICAgICAgICAgIHZpZXdZIDogMTAwLAor ICAgICAgICAgICAgICAgIGRlbHRhWCA6IC0xMCwKKyAgICAgICAgICAgICAgICBwaGFzZSA6ICJi ZWdhbiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlw ZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgZGVsdGFYIDogLTEwMCwKKyAgICAgICAgICAg ICAgICBwaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICBwaGFzZSA6ICJl bmRlZCIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlw ZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgZGVsdGFYIDogLTEwMCwKKyAgICAgICAgICAg ICAgICBtb21lbnR1bVBoYXNlIDogImJlZ2FuIgorICAgICAgICAgICAgfSwKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICBkZWx0 YVggOiAtMTAwLAorICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiY2hhbmdlZCIKKyAg ICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVl bCIsCisgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAg IH0KKyAgICAgICAgXTsKIAorICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVu Y2UoeyBldmVudHM6IGV2ZW50cyB9KTsKICAgICAgICAgY2hlY2tGb3JTY3JvbGwoKTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9wcm9ncmFtbWF0 aWMtc2Nyb2xsLW92ZXJyaWRlcy1ydWJiZXJiYW5kLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Nj cm9sbGluZy9tYWMvcHJvZ3JhbW1hdGljLXNjcm9sbC1vdmVycmlkZXMtcnViYmVyYmFuZC5odG1s CmluZGV4IDdjMzFjYzc1NmU4NWQzNzIwOWY5YjljMzVlOGViOGMxODQ1Mzg0NDguLmI3YmYxOWFi ZDIyYTMyN2QwZmRhOGQ5ZGFhYzIwMDY4ZTIzZmMwYTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2Zhc3Qvc2Nyb2xsaW5nL21hYy9wcm9ncmFtbWF0aWMtc2Nyb2xsLW92ZXJyaWRlcy1ydWJiZXJi YW5kLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL3Byb2dyYW1tYXRp Yy1zY3JvbGwtb3ZlcnJpZGVzLXJ1YmJlcmJhbmQuaHRtbApAQCAtMSw0ICsxLDQgQEAKLTwhRE9D VFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkFzeW5jT3ZlcmZs b3dTY3JvbGxpbmdFbmFibGVkPXRydWUgXSAtLT4KKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtp dC10ZXN0LXJ1bm5lciBbIEFzeW5jT3ZlcmZsb3dTY3JvbGxpbmdFbmFibGVkPXRydWUgXSAtLT4K IDxodG1sPgogPGhlYWQ+CiAgICAgPHN0eWxlPgpAQCAtMjEsMjkgKzIxLDYwIEBACiAgICAgICAg IAogICAgICAgICBhc3luYyBmdW5jdGlvbiBkb01vdXNlV2hlZWxTY3JvbGwoKQogICAgICAgICB7 Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7Ci0KLSAgICAg ICAgICAgIC8vIFRyaWdnZXIgcnViYmVyYmFuZGluZyBhdCB0aGUgdG9wLgotICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0x LCAnYmVnYW4nLCAnbm9uZScsIHRydWUpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VT Y3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIC0xMCwgJ2NoYW5nZWQnLCAnbm9u ZScsIHRydWUpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5nVXBkYXRlKCk7 Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50 dW1QaGFzZXMoMCwgLTUsICdjaGFuZ2VkJywgJ25vbmUnLCB0cnVlKTsKLSAgICAgICAgICAgIGF3 YWl0IFVJSGVscGVyLnJlbmRlcmluZ1VwZGF0ZSgpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDUsICdjaGFuZ2VkJywg J25vbmUnLCB0cnVlKTsKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLnJlbmRlcmluZ1VwZGF0 ZSgpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKDAsIDEwLCAnY2hhbmdlZCcsICdub25lJywgdHJ1ZSk7Ci0gICAgICAgICAg ICBhd2FpdCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKLSAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAxMCwgJ2NoYW5n ZWQnLCAnbm9uZScsIHRydWUpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5n VXBkYXRlKCk7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoMCwgMCwgJ2VuZGVkJywgJ25vbmUnLCB0cnVlKTsKLSAgICAgICAg ICAgIGF3YWl0IFVJSGVscGVyLnJlbmRlcmluZ1VwZGF0ZSgpOwotICAgICAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDEwLCAnbm9u ZScsICdiZWdpbicsIHRydWUpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5n VXBkYXRlKCk7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoMCwgMTAsICdub25lJywgJ2NvbnRpbnVlJywgdHJ1ZSk7Ci0gICAg ICAgICAgICBhd2FpdCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKLSAgICAgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAn bm9uZScsICdlbmQnLCB0cnVlKTsKKyAgICAgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAg ICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAg ICAgICAgICAgICAgICB2aWV3WCA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgdmlld1kgOiAx MDAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0xMCwKKyAgICAgICAgICAgICAgICAg ICAgcGhhc2UgOiAiYmVnYW4iCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAg ICBkZWx0YVkgOiAtMTAwLAorICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJjaGFuZ2VkIgor ICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAg ICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTUwLAorICAg ICAgICAgICAgICAgICAgICBwaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFZIDogNTAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNl IDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0 YVkgOiAxMDAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAg ICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUg OiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAxMDAsCisgICAgICAgICAg ICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAg ICAgICAgICAgICBwaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAg ICAgICAgICAgIGRlbHRhWSA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFz ZSA6ICJiZWdhbiIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRh WSA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgor ICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAg ICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJl bmRlZCIKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdOwogCi0gICAgICAgICAgICBh d2FpdCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVs cGVyLm1vdXNlV2hlZWxTZXF1ZW5jZSh7IGV2ZW50czogZXZlbnRzIH0sIHsgd2FpdEZvckNvbXBs ZXRpb246IGZhbHNlIH0pOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBhc3luYyBmdW5j dGlvbiBzY3JvbGxUZXN0KCkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5n L21hYy93aGVlbC1ldmVudC1kZWx0YXMtYXJlLW5vdC1maWx0ZXJlZC5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9zY3JvbGxpbmcvbWFjL3doZWVsLWV2ZW50LWRlbHRhcy1hcmUtbm90LWZpbHRlcmVk Lmh0bWwKaW5kZXggZmNiOTkyZmJiOGIwZmNhNmM4ZTg0Zjk4MjlmNzM1ZGI1NjBkMzJkYS4uYTI1 NTA1NGRhZmVlMDE4ZGRlOGU3ZTdlMjlhOTc2N2QxMzA3OTcwZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL3doZWVsLWV2ZW50LWRlbHRhcy1hcmUtbm90LWZpbHRl cmVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL3doZWVsLWV2ZW50 LWRlbHRhcy1hcmUtbm90LWZpbHRlcmVkLmh0bWwKQEAgLTgsMTcgKzgsNTIgQEAKIAogICAgICAg ICBhc3luYyBmdW5jdGlvbiBkaXNwYXRjaFdoZWVsRXZlbnRzKCkKICAgICAgICAgewotICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7Ci0gICAgICAgICAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7CisgICAgICAgICAgICBjb25zdCBldmVudHMg PSBbCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVs IiwKKyAgICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDAsCisgICAgICAgICAgICAgICAgICAg IHZpZXdZIDogMTAwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAxMCwKKyAgICAgICAg ICAgICAgICAgICAgZGVsdGFZIDogLTEwLAorICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJi ZWdhbiIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IDEw LAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMjAsCisgICAgICAgICAgICAgICAgICAg IHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAg ICBwaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAg IGRlbHRhWCA6IDEwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMTAsCisgICAgICAg ICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiYmVnYW4iCisgICAgICAgICAgICAgICAgfSwK KyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAor ICAgICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMSwgLy8gRGVmZWF0IGNvYWxlc2NpbmcKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRh WSA6IC0yMCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgor ICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAg ICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgdmlld1ggOiAxMDIsIC8vIERl ZmVhdCBjb2FsZXNjaW5nCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IDIwLAorICAgICAg ICAgICAgICAgICAgICBkZWx0YVkgOiAtMzAsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVt UGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAg IG1vbWVudHVtUGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg XTsKIAotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKDEsIC0xLCAiYmVnYW4iLCAibm9uZSIpOwotICAgICAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDEsIC0yLCAiY2hh bmdlZCIsICJub25lIik7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0 aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwgImVuZGVkIiwgIm5vbmUiKTsKLSAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygx LCAtMSwgIm5vbmUiLCAiYmVnaW4iKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Ny b2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygxLCAtMiwgIm5vbmUiLCAiY29udGludWUi KTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21l bnR1bVBoYXNlcygyLCAtMywgIm5vbmUiLCAiY29udGludWUiKTsKLSAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAibm9u ZSIsICJlbmQiKTsKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21w bGV0aW9uKCk7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVuY2Uo eyBldmVudHM6IGV2ZW50cyB9KTsKICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgICAg ICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMgYi9M YXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCmluZGV4IDg2NDc5ZmViMDY1MWJmZTY3 MjYzN2U1ZDQ5ODkxZmRkMDE3YTY3OGMuLmI3NDAwYjY5NjkxMDNiNDg1NzE0NjQzYmVkZDBlNDMw YjI4MjYwZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMK KysrIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwpAQCAtMTA4LDE0ICsxMDgs MTYgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogICAgICAgICBhd2FpdCBV SUhlbHBlci5hbmltYXRpb25GcmFtZSgpOwogICAgIH0KIAotICAgIHN0YXRpYyBhc3luYyBtb3Vz ZVdoZWVsU2VxdWVuY2UoZXZlbnRTdHJlYW0pCisgICAgc3RhdGljIGFzeW5jIG1vdXNlV2hlZWxT ZXF1ZW5jZShldmVudFN0cmVhbSwgb3B0aW9ucykKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5p c1dlYktpdDIoKSkgewogICAgICAgICAgICAgY29uc29sZS5sb2coJ1VJSGVscGVyLm1vdXNlV2hl ZWxTZXF1ZW5jZSgpIGRvZXMgbm90IHdvcmsgaW4gRHVtcFJlbmRlclRyZWUnKQogICAgICAgICAg ICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZSgpOwogICAgICAgICB9Ci0KLSAgICAgICAgZXZlbnRT ZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CisgICAgICAgIAorICAgICAgICBjb25zdCB3YWl0 Rm9yU2Nyb2xsQ29tcGxldGlvbiA9IG9wdGlvbnM/LndhaXRGb3JDb21wbGV0aW9uID8/IHRydWU7 CisgICAgICAgIGlmICh3YWl0Rm9yU2Nyb2xsQ29tcGxldGlvbikKKyAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICBjb25zdCBldmVudFN0cmVhbUFz U3RyaW5nID0gSlNPTi5zdHJpbmdpZnkoZXZlbnRTdHJlYW0pOwogICAgICAgICBhd2FpdCBuZXcg UHJvbWlzZShyZXNvbHZlID0+IHsKICAgICAgICAgICAgIHRlc3RSdW5uZXIucnVuVUlTY3JpcHQo YApAQCAtMTI3LDcgKzEyOSw4IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsK ICAgICAgICAgICAgIGAsIHJlc29sdmUpOwogICAgICAgICB9KTsKIAotICAgICAgICBhd2FpdCBV SUhlbHBlci53YWl0Rm9yU2Nyb2xsQ29tcGxldGlvbigpOworICAgICAgICBpZiAod2FpdEZvclNj cm9sbENvbXBsZXRpb24pCisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yU2Nyb2xs Q29tcGxldGlvbigpOwogICAgIH0KIAogICAgIHN0YXRpYyBhc3luYyB3YWl0Rm9yU2Nyb2xsQ29t cGxldGlvbigpCg== 443604 2021-11-08 14:10:31 -0800 2021-11-08 14:12:08 -0800 Patch bug-232847-20211108141030.patch text/plain 20250 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDMwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDAzZTdlNzZiOWFkMzJkOWM0NTBl M2I3ZTE5ZTlhNzUzMjA5ZjU4OS4uY2VmMjYyOTdkYzEwODM4MDRlY2I3ZDU4MDIwNjIzMWZmYWRl MmQ2OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTExLTA4ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbnZlcnQgbW9yZSB3aGVlbCBldmVu dCB0ZXN0cyB0byBVSUhlbHBlci5tb3VzZVdoZWVsU2VxdWVuY2UoKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODQ3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIG9wdGlvbnMgcGFyYW1ldGVy IHRvIG1vdXNlV2hlZWxTZXF1ZW5jZSgpIHNvIHdlIGNhbiBoYXZlIGEgdmVyc2lvbiB0aGF0IGRv ZW5zJ3QKKyAgICAgICAgd2FpdC4KKworICAgICAgICBTb21lIHRlc3RzIG5lZWQgdG8gaGF2ZSBt aW5vciBwb3NpdGlvbiBjaGFuZ2VzIHRvIGRlZmF1bHQgdGhlIHdoZWVsIGV2ZW50IGNvYWxlc2Np bmcgY29kZQorICAgICAgICBpbiBXZWJXaGVlbEV2ZW50Q29hbGVzY2VyLgorICAgICAgICAKKyAg ICAgICAgQ2hhbmdlIHNvbWUgSlMgc3R5bGUgdGhpbmdzLgorCisgICAgICAgICogZmFzdC9zY3Jv bGxpbmcvbWFjL21vbWVudHVtLWF4aXMtbG9ja2luZy5odG1sOgorICAgICAgICAqIGZhc3Qvc2Ny b2xsaW5nL21hYy9vdmVyZmxvdy1oaWRkZW4tb24tb25lLWF4aXMtYXN5bmMtb3ZlcmZsb3cuaHRt bDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVuLW9uLW9uZS1h eGlzLmh0bWw6CisgICAgICAgICogZmFzdC9zY3JvbGxpbmcvbWFjL3Byb2dyYW1tYXRpYy1zY3Jv bGwtb3ZlcnJpZGVzLXJ1YmJlcmJhbmQuaHRtbDoKKyAgICAgICAgKiBmYXN0L3Njcm9sbGluZy9t YWMvd2hlZWwtZXZlbnQtZGVsdGFzLWFyZS1ub3QtZmlsdGVyZWQuaHRtbDoKKyAgICAgICAgKiBy ZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmFzeW5jIG1v dXNlV2hlZWxTZXF1ZW5jZSk6CisKIDIwMjEtMTEtMDggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ29udmVydCBzb21lIHRlc3RzIHRoYXQgdXNlIGV2 ZW50U2VuZGVyLmV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBo YXNlcygpIHRvIHNlbmRFdmVudFN0cmVhbSgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYXhpcy1sb2NraW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tYXhpcy1sb2NraW5nLmh0bWwKaW5kZXggY2U4ZjBm ZDE1NjNiNGI0MjEwODM4NzAyMzBkZjI4MGViYzQ1OWEyYS4uZDFmMGM0ZDA1MGUxZDc3NDVjZTlh MjE3MmRkZjNlMTQ5ZWYxNGIxNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxp bmcvbWFjL21vbWVudHVtLWF4aXMtbG9ja2luZy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv c2Nyb2xsaW5nL21hYy9tb21lbnR1bS1heGlzLWxvY2tpbmcuaHRtbApAQCAtMzQsMjAgKzM0LDYy IEBACiAKICAgICAgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdzY3JvbGwnLCBzY3Jv bGxMaXN0ZW5lcik7CiAKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50 cygpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oMTAwLCAxMDApOwogICAg ICAgICAgICAgLy8gU2Nyb2xsIHVwIHdpdGggc29tZSBzaWRld2F5cyBkcmlmdC4KLSAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygw LCAtMiwgImJlZ2FuIiwgIm5vbmUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Ny b2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygxLCAtMiwgImNoYW5nZWQiLCAibm9uZSIp OwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVu dHVtUGhhc2VzKDEsIC0yLCAiY2hhbmdlZCIsICJub25lIik7Ci0gICAgICAgICAgICBldmVudFNl bmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwgImVuZGVk IiwgIm5vbmUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hl ZWxBbmRNb21lbnR1bVBoYXNlcygxLCAtMiwgIm5vbmUiLCAiYmVnaW4iKTsKLSAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygxLCAt MiwgIm5vbmUiLCAiY29udGludWUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Ny b2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygyLCAtMywgIm5vbmUiLCAiY29udGludWUi KTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21l bnR1bVBoYXNlcygxLCAtMiwgIm5vbmUiLCAiY29udGludWUiKTsKLSAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAibm9u ZSIsICJlbmQiKTsKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21w bGV0aW9uKCk7CisgICAgICAgICAgICBjb25zdCBldmVudHMgPSBbCisgICAgICAgICAgICAgICAg eworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAg ICAgdmlld1ggOiAxMDAsCisgICAgICAgICAgICAgICAgICAgIHZpZXdZIDogMTAwLAorICAgICAg ICAgICAgICAgICAgICBkZWx0YVkgOiAtMjAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDog ImJlZ2FuIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDog MTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0yMCwKKyAgICAgICAgICAgICAgICAg ICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAg ICAgIGRlbHRhWCA6IDEwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMjAsCisgICAg ICAgICAgICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAg ICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAg ICAgICAgICAgICAgICAgICBwaGFzZSA6ICJlbmRlZCIKKyAgICAgICAgICAgICAgICB9LAorICAg ICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAg ICAgICAgICAgICAgICAgIGRlbHRhWCA6IDEwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkg OiAtMjAsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiYmVnYW4iCisgICAg ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5 cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAxMCwKKyAgICAgICAg ICAgICAgICAgICAgZGVsdGFZIDogLTIwLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBo YXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBk ZWx0YVggOiAyMCwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTMwLAorICAgICAgICAg ICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwK KyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAor ICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAxMCwKKyAgICAgICAgICAgICAgICAgICAgZGVs dGFZIDogLTIwLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQi CisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg ICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDog ImVuZGVkIgorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIF07CiAKKyAgICAgICAgICAg IGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTZXF1ZW5jZSh7IGV2ZW50cyB9KTsKICAgICAgICAg ICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCdzY3JvbGwnLCBzY3JvbGxMaXN0ZW5lcik7 CiAgICAgICAgIH0KIApAQCAtNjMsMjAgKzEwNSw2MSBAQAogCiAgICAgICAgICAgICB3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcignc2Nyb2xsJywgc2Nyb2xsTGlzdGVuZXIpOwogCi0gICAgICAgICAg ICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKLSAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlTW92ZVRvKDEwMCwgMTAwKTsKICAgICAgICAgICAgIC8vIFNjcm9sbCByaWdodCB3 aXRoIHNvbWUgdXB3YXJkcyBkcmlmdC4KLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Ny b2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMiwgMCwgImJlZ2FuIiwgIm5vbmUiKTsK LSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1 bVBoYXNlcygtMiwgLTEsICJjaGFuZ2VkIiwgIm5vbmUiKTsKLSAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMiwgLTEsICJjaGFu Z2VkIiwgIm5vbmUiKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRo V2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAiZW5kZWQiLCAibm9uZSIpOwotICAgICAgICAg ICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0y LCAwLCAibm9uZSIsICJiZWdpbiIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3Jv bGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0yLCAxLCAibm9uZSIsICJjb250aW51ZSIp OwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVu dHVtUGhhc2VzKC0zLCAyLCAibm9uZSIsICJjb250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0yLCAxLCAibm9u ZSIsICJjb250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdp dGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDAsICJub25lIiwgImVuZCIpOwotICAgICAgICAg ICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvclNjcm9sbENvbXBsZXRpb24oKTsKKyAgICAgICAgICAg IGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAg IHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMCwKKyAgICAg ICAgICAgICAgICAgICAgdmlld1kgOiAxMDAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6 IC0yMCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVnYW4iCisgICAgICAgICAgICAg ICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hl ZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAtMjAsCisgICAgICAgICAgICAgICAg ICAgIGRlbHRhWSA6IC0xMCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIK KyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAg ICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWCA6IC0yMCwKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTEwLAorICAgICAgICAgICAgICAgICAgICBwaGFz ZSA6ICJjaGFuZ2VkIgorICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgcGhh c2UgOiAiZW5kZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0 YVggOiAtMjAsCisgICAgICAgICAgICAgICAgICAgIG1vbWVudHVtUGhhc2UgOiAiYmVnYW4iCisg ICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAg IHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAtMjAsCisgICAg ICAgICAgICAgICAgICAgIGRlbHRhWSA6IDEwLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1 bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7 CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAg ICBkZWx0YVggOiAtMzAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IDIwLAorICAgICAg ICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAg fSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwi LAorICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAtMjAsCisgICAgICAgICAgICAgICAgICAg IGRlbHRhWSA6IDEwLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5n ZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNl IDogImVuZGVkIgorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIF07CiAKKyAgICAgICAg ICAgIGF3YWl0IFVJSGVscGVyLm1vdXNlV2hlZWxTZXF1ZW5jZSh7IGV2ZW50cyB9KTsKICAgICAg ICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCdzY3JvbGwnLCBzY3JvbGxMaXN0ZW5l cik7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv bWFjL21vbWVudHVtLXNjcm9sbC13aXRoLWJvcmRlcnMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv c2Nyb2xsaW5nL21hYy9tb21lbnR1bS1zY3JvbGwtd2l0aC1ib3JkZXJzLmh0bWwKaW5kZXggZTVh NzRjYWRkNzdhMjUwOWQ2NDc5OWE2ZGI4Yjk5NWRhNTMwMzQxZi4uMWQ5N2NjOTUxYmYyYzRjMTU0 ODM1YTU0Njk2NDZkODljNzgxNDk0MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3Jv bGxpbmcvbWFjL21vbWVudHVtLXNjcm9sbC13aXRoLWJvcmRlcnMuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvbW9tZW50dW0tc2Nyb2xsLXdpdGgtYm9yZGVycy5odG1s CkBAIC04MSw3ICs4MSw3IEBACiAgICAgICAgICAgICB9OwogICAgICAgICAgICAgZXZlbnRzLnB1 c2goZW5kRXZlbnQpOwogCi0gICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5tb3VzZVdoZWVsU2Vx dWVuY2UoeyBldmVudHM6IGV2ZW50cyB9KTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLm1v dXNlV2hlZWxTZXF1ZW5jZSh7IGV2ZW50cyB9KTsKICAgICAgICAgICAgIGNoZWNrRm9yU2Nyb2xs KCk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcv bWFjL292ZXJmbG93LWhpZGRlbi1vbi1vbmUtYXhpcy1hc3luYy1vdmVyZmxvdy5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1vbi1vbmUtYXhpcy1h c3luYy1vdmVyZmxvdy5odG1sCmluZGV4IDE3MDcwNDg5YjZmNTkxZmUyNmQxZDU1MjkxODUyOWU2 ODM2YmM2MDcuLmQ4NDA1MjQzOTQ0MjY3ZGU0ZmExZTI4MGE4MzU3MTdmMGE4NmRmYmQgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9vdmVyZmxvdy1oaWRkZW4tb24t b25lLWF4aXMtYXN5bmMtb3ZlcmZsb3cuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9s bGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVuLW9uLW9uZS1heGlzLWFzeW5jLW92ZXJmbG93Lmh0bWwK QEAgLTYwLDE4ICs2MCw0MCBAQAogCiAgICAgYXN5bmMgZnVuY3Rpb24gc2Nyb2xsVGVzdCgpCiAg ICAgewotICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7Ci0KLSAgICAg ICAgLy8gU2lkZXdheXMgc2Nyb2xsLgotICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxF dmVudHMoKTsKLSAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1v bWVudHVtUGhhc2VzKC0xLCAwLCAnYmVnYW4nLCAnbm9uZScpOwotICAgICAgICBldmVudFNlbmRl ci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAnY2hhbmdl ZCcsICdub25lJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxB bmRNb21lbnR1bVBoYXNlcygwLCAwLCAnZW5kZWQnLCAnbm9uZScpOwotICAgICAgICBldmVudFNl bmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAnbm9u ZScsICdiZWdpbicpOwotICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAnbm9uZScsICdjb250aW51ZScpOwotICAgICAgICBl dmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwg J25vbmUnLCAnZW5kJyk7Ci0gICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21w bGV0aW9uKCk7CisgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICB2aWV3WCA6IDEwMCwK KyAgICAgICAgICAgICAgICB2aWV3WSA6IDEwMCwKKyAgICAgICAgICAgICAgICBkZWx0YVggOiAt MTAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVnYW4iCisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAg ICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAg ICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVl bCIsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAg ICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJiZWdh biIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlwZSA6 ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgZGVsdGFYIDogLTEwMCwKKyAgICAgICAgICAgICAg ICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICB9LAorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgIG1vbWVu dHVtUGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICB9CisgICAgICAgIF07CiAKKyAgICAgICAg YXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNlKHsgZXZlbnRzIH0pOwogICAgICAgICBj aGVja0ZvclNjcm9sbCgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9z Y3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1vbi1vbmUtYXhpcy5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9zY3JvbGxpbmcvbWFjL292ZXJmbG93LWhpZGRlbi1vbi1vbmUtYXhpcy5odG1sCmlu ZGV4IDJiZWFmZTgxMDk5MGRhYzU1YzU3YzAxNmY0OTkxMmE0NDQ5ZWViZTEuLmIxMTVhNGQ4MjQ5 ZmFiNTJkY2UzZTkzMTgwYzAwMDU0ODkyYmVhZGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zh c3Qvc2Nyb2xsaW5nL21hYy9vdmVyZmxvdy1oaWRkZW4tb24tb25lLWF4aXMuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvb3ZlcmZsb3ctaGlkZGVuLW9uLW9uZS1heGlz Lmh0bWwKQEAgLTYwLDE4ICs2MCw0MCBAQAogCiAgICAgYXN5bmMgZnVuY3Rpb24gc2Nyb2xsVGVz dCgpCiAgICAgewotICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbygxMDAsIDEwMCk7Ci0K LSAgICAgICAgLy8gU2lkZXdheXMgc2Nyb2xsLgotICAgICAgICBldmVudFNlbmRlci5tb25pdG9y V2hlZWxFdmVudHMoKTsKLSAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVl bEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnYmVnYW4nLCAnbm9uZScpOwotICAgICAgICBldmVu dFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAn Y2hhbmdlZCcsICdub25lJyk7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRo V2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAnZW5kZWQnLCAnbm9uZScpOwotICAgICAgICBl dmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAw LCAnbm9uZScsICdiZWdpbicpOwotICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0 aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEwLCAwLCAnbm9uZScsICdjb250aW51ZScpOwotICAg ICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMo MCwgMCwgJ25vbmUnLCAnZW5kJyk7Ci0gICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3Jv bGxDb21wbGV0aW9uKCk7CisgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICB2aWV3WCA6 IDEwMCwKKyAgICAgICAgICAgICAgICB2aWV3WSA6IDEwMCwKKyAgICAgICAgICAgICAgICBkZWx0 YVggOiAtMTAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVnYW4iCisgICAgICAgICAgICB9 LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAg ICAgICAgICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdl ZCIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdHlwZSA6 ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgcGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICB9 LAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAg ICAgICAgICAgIGRlbHRhWCA6IC0xMDAsCisgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6 ICJiZWdhbiIKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg dHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgZGVsdGFYIDogLTEwMCwKKyAgICAgICAg ICAgICAgICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICB9LAorICAgICAg ICAgICAgeworICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAg IG1vbWVudHVtUGhhc2UgOiAiZW5kZWQiCisgICAgICAgICAgICB9CisgICAgICAgIF07CiAKKyAg ICAgICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNlKHsgZXZlbnRzIH0pOwogICAg ICAgICBjaGVja0ZvclNjcm9sbCgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9zY3JvbGxpbmcvbWFjL3Byb2dyYW1tYXRpYy1zY3JvbGwtb3ZlcnJpZGVzLXJ1YmJlcmJh bmQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2Nyb2xsaW5nL21hYy9wcm9ncmFtbWF0aWMtc2Ny b2xsLW92ZXJyaWRlcy1ydWJiZXJiYW5kLmh0bWwKaW5kZXggN2MzMWNjNzU2ZTg1ZDM3MjA5Zjli OWMzNWU4ZWI4YzE4NDUzODQ0OC4uYjdiZjE5YWJkMjJhMzI3ZDBmZGE4ZDlkYWFjMjAwNjhlMjNm YzBhMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL3Byb2dyYW1t YXRpYy1zY3JvbGwtb3ZlcnJpZGVzLXJ1YmJlcmJhbmQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3Njcm9sbGluZy9tYWMvcHJvZ3JhbW1hdGljLXNjcm9sbC1vdmVycmlkZXMtcnViYmVyYmFu ZC5odG1sCkBAIC0xLDQgKzEsNCBAQAotPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgaW50ZXJuYWw6QXN5bmNPdmVyZmxvd1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0t PgorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgQXN5bmNPdmVyZmxv d1Njcm9sbGluZ0VuYWJsZWQ9dHJ1ZSBdIC0tPgogPGh0bWw+CiA8aGVhZD4KICAgICA8c3R5bGU+ CkBAIC0yMSwyOSArMjEsNjAgQEAKICAgICAgICAgCiAgICAgICAgIGFzeW5jIGZ1bmN0aW9uIGRv TW91c2VXaGVlbFNjcm9sbCgpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlTW92ZVRvKDEwMCwgMTAwKTsKLQotICAgICAgICAgICAgLy8gVHJpZ2dlciBydWJiZXJiYW5k aW5nIGF0IHRoZSB0b3AuCi0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0 aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgLTEsICdiZWdhbicsICdub25lJywgdHJ1ZSk7Ci0g ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1Q aGFzZXMoMCwgLTEwLCAnY2hhbmdlZCcsICdub25lJywgdHJ1ZSk7Ci0gICAgICAgICAgICBhd2Fp dCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAtNSwgJ2NoYW5nZWQnLCAn bm9uZScsIHRydWUpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5nVXBkYXRl KCk7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9t ZW50dW1QaGFzZXMoMCwgNSwgJ2NoYW5nZWQnLCAnbm9uZScsIHRydWUpOwotICAgICAgICAgICAg YXdhaXQgVUlIZWxwZXIucmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAgICAgICBldmVudFNlbmRl ci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMTAsICdjaGFuZ2Vk JywgJ25vbmUnLCB0cnVlKTsKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLnJlbmRlcmluZ1Vw ZGF0ZSgpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFu ZE1vbWVudHVtUGhhc2VzKDAsIDEwLCAnY2hhbmdlZCcsICdub25lJywgdHJ1ZSk7Ci0gICAgICAg ICAgICBhd2FpdCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKLSAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAnZW5k ZWQnLCAnbm9uZScsIHRydWUpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIucmVuZGVyaW5n VXBkYXRlKCk7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoMCwgMTAsICdub25lJywgJ2JlZ2luJywgdHJ1ZSk7Ci0gICAgICAg ICAgICBhd2FpdCBVSUhlbHBlci5yZW5kZXJpbmdVcGRhdGUoKTsKLSAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAxMCwgJ25v bmUnLCAnY29udGludWUnLCB0cnVlKTsKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLnJlbmRl cmluZ1VwZGF0ZSgpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhX aGVlbEFuZE1vbWVudHVtUGhhc2VzKDAsIDAsICdub25lJywgJ2VuZCcsIHRydWUpOworICAgICAg ICAgICAgY29uc3QgZXZlbnRzID0gWworICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHZpZXdYIDogMTAwLAor ICAgICAgICAgICAgICAgICAgICB2aWV3WSA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgZGVs dGFZIDogLTEwLAorICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJiZWdhbiIKKyAgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6 ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0xMDAsCisgICAgICAgICAg ICAgICAgICAgIHBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAg ICAgICAgICAgICBkZWx0YVkgOiAtNTAsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImNo YW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiA1 MCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAg ICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVl bCIsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IDEwMCwKKyAgICAgICAgICAgICAgICAg ICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAg ICAgIGRlbHRhWSA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIK KyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAg ICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImVuZGVkIgor ICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAg ICB0eXBlIDogIndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogMTAwLAorICAg ICAgICAgICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImJlZ2FuIgorICAgICAgICAgICAgICAg IH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVs IiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogMTAwLAorICAgICAgICAgICAgICAgICAg ICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAg ICAgICAgICAgICBtb21lbnR1bVBoYXNlIDogImVuZGVkIgorICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIF07CiAKLSAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLnJlbmRlcmluZ1VwZGF0 ZSgpOworICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNlKHsgZXZl bnRzOiBldmVudHMgfSwgeyB3YWl0Rm9yQ29tcGxldGlvbjogZmFsc2UgfSk7CiAgICAgICAgIH0K ICAgICAgICAgCiAgICAgICAgIGFzeW5jIGZ1bmN0aW9uIHNjcm9sbFRlc3QoKQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9zY3JvbGxpbmcvbWFjL3doZWVsLWV2ZW50LWRlbHRhcy1hcmUt bm90LWZpbHRlcmVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvd2hlZWwt ZXZlbnQtZGVsdGFzLWFyZS1ub3QtZmlsdGVyZWQuaHRtbAppbmRleCBmY2I5OTJmYmI4YjBmY2E2 YzhlODRmOTgyOWY3MzVkYjU2MGQzMmRhLi44NDNmZTgyMmRkMzZmY2JlYzM3OGEwNDRlOTVhNDky YTA2N2U4NzcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Njcm9sbGluZy9tYWMvd2hl ZWwtZXZlbnQtZGVsdGFzLWFyZS1ub3QtZmlsdGVyZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3Njcm9sbGluZy9tYWMvd2hlZWwtZXZlbnQtZGVsdGFzLWFyZS1ub3QtZmlsdGVyZWQuaHRt bApAQCAtOCwxNyArOCw1MiBAQAogCiAgICAgICAgIGFzeW5jIGZ1bmN0aW9uIGRpc3BhdGNoV2hl ZWxFdmVudHMoKQogICAgICAgICB7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hl ZWxFdmVudHMoKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDEwMCwgMTAw KTsKKyAgICAgICAgICAgIGNvbnN0IGV2ZW50cyA9IFsKKyAgICAgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAgICAgICAgICAgICB2aWV3 WCA6IDEwMCwKKyAgICAgICAgICAgICAgICAgICAgdmlld1kgOiAxMDAsCisgICAgICAgICAgICAg ICAgICAgIGRlbHRhWCA6IDEwLAorICAgICAgICAgICAgICAgICAgICBkZWx0YVkgOiAtMTAsCisg ICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImJlZ2FuIgorICAgICAgICAgICAgICAgIH0sCisg ICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIndoZWVsIiwKKyAg ICAgICAgICAgICAgICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRh WSA6IC0yMCwKKyAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiY2hhbmdlZCIKKyAgICAgICAg ICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgdHlwZSA6 ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImVuZGVkIgorICAgICAgICAg ICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDog IndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFYIDogMTAsCisgICAgICAgICAgICAg ICAgICAgIGRlbHRhWSA6IC0xMCwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6 ICJiZWdhbiIKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAg ICAgICAgICAgICAgdHlwZSA6ICJ3aGVlbCIsCisgICAgICAgICAgICAgICAgICAgIHZpZXdYIDog MTAxLCAvLyBEZWZlYXQgY29hbGVzY2luZworICAgICAgICAgICAgICAgICAgICBkZWx0YVggOiAx MCwKKyAgICAgICAgICAgICAgICAgICAgZGVsdGFZIDogLTIwLAorICAgICAgICAgICAgICAgICAg ICBtb21lbnR1bVBoYXNlIDogImNoYW5nZWQiCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIHR5cGUgOiAid2hlZWwiLAorICAgICAgICAg ICAgICAgICAgICB2aWV3WCA6IDEwMiwgLy8gRGVmZWF0IGNvYWxlc2NpbmcKKyAgICAgICAgICAg ICAgICAgICAgZGVsdGFYIDogMjAsCisgICAgICAgICAgICAgICAgICAgIGRlbHRhWSA6IC0zMCwK KyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJjaGFuZ2VkIgorICAgICAgICAg ICAgICAgIH0sCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICB0eXBlIDog IndoZWVsIiwKKyAgICAgICAgICAgICAgICAgICAgbW9tZW50dW1QaGFzZSA6ICJlbmRlZCIKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICBdOwogCi0gICAgICAgICAgICBldmVudFNlbmRl ci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMSwgLTEsICJiZWdhbiIs ICJub25lIik7Ci0gICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoMSwgLTIsICJjaGFuZ2VkIiwgIm5vbmUiKTsKLSAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAw LCAiZW5kZWQiLCAibm9uZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC eVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDEsIC0xLCAibm9uZSIsICJiZWdpbiIpOwotICAg ICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhh c2VzKDEsIC0yLCAibm9uZSIsICJjb250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKDIsIC0zLCAibm9uZSIsICJj b250aW51ZSIpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVl bEFuZE1vbWVudHVtUGhhc2VzKDAsIDAsICJub25lIiwgImVuZCIpOwotICAgICAgICAgICAgYXdh aXQgVUlIZWxwZXIud2FpdEZvclNjcm9sbENvbXBsZXRpb24oKTsKKyAgICAgICAgICAgIGF3YWl0 IFVJSGVscGVyLm1vdXNlV2hlZWxTZXF1ZW5jZSh7IGV2ZW50cyB9KTsKICAgICAgICAgICAgIGZp bmlzaEpTVGVzdCgpOwogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Jlc291 cmNlcy91aS1oZWxwZXIuanMgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCmlu ZGV4IDg2NDc5ZmViMDY1MWJmZTY3MjYzN2U1ZDQ5ODkxZmRkMDE3YTY3OGMuLmNlNjMyYjQzYzMy NDZlZDE0OGU1YjI1MWYwZGJiYzcyNDAwYWU5ZGIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jl c291cmNlcy91aS1oZWxwZXIuanMKKysrIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBl ci5qcwpAQCAtMTA4LDE0ICsxMDgsMTUgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxw ZXIgewogICAgICAgICBhd2FpdCBVSUhlbHBlci5hbmltYXRpb25GcmFtZSgpOwogICAgIH0KIAot ICAgIHN0YXRpYyBhc3luYyBtb3VzZVdoZWVsU2VxdWVuY2UoZXZlbnRTdHJlYW0pCisgICAgc3Rh dGljIGFzeW5jIG1vdXNlV2hlZWxTZXF1ZW5jZShldmVudFN0cmVhbSwgeyB3YWl0Rm9yQ29tcGxl dGlvbiA9IHRydWUgfSA9IHt9KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0Migp KSB7CiAgICAgICAgICAgICBjb25zb2xlLmxvZygnVUlIZWxwZXIubW91c2VXaGVlbFNlcXVlbmNl KCkgZG9lcyBub3Qgd29yayBpbiBEdW1wUmVuZGVyVHJlZScpCiAgICAgICAgICAgICByZXR1cm4g UHJvbWlzZS5yZXNvbHZlKCk7CiAgICAgICAgIH0KIAotICAgICAgICBldmVudFNlbmRlci5tb25p dG9yV2hlZWxFdmVudHMoKTsKKyAgICAgICAgaWYgKHdhaXRGb3JDb21wbGV0aW9uKQorICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgIGNvbnN0IGV2 ZW50U3RyZWFtQXNTdHJpbmcgPSBKU09OLnN0cmluZ2lmeShldmVudFN0cmVhbSk7CiAgICAgICAg IGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gewogICAgICAgICAgICAgdGVzdFJ1bm5lci5y dW5VSVNjcmlwdChgCkBAIC0xMjcsNyArMTI4LDggQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3Mg VUlIZWxwZXIgewogICAgICAgICAgICAgYCwgcmVzb2x2ZSk7CiAgICAgICAgIH0pOwogCi0gICAg ICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JTY3JvbGxDb21wbGV0aW9uKCk7CisgICAgICAgIGlm ICh3YWl0Rm9yQ29tcGxldGlvbikKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JT Y3JvbGxDb21wbGV0aW9uKCk7CiAgICAgfQogCiAgICAgc3RhdGljIGFzeW5jIHdhaXRGb3JTY3Jv bGxDb21wbGV0aW9uKCkK