206113 2020-01-10 17:04:55 -0800 EWS: Run webkitpy tests with Python 2 and 3 2020-01-15 03:57:41 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184986 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap commit-queue jlewis3 slewis webkit-bug-importer oldest_to_newest 1605409 0 jbedard 2020-01-10 17:04:55 -0800 We should run webkitpy tests with both Python 2 and Python 3, once https://bugs.webkit.org/show_bug.cgi?id=206078 lands. 1605417 1 387402 jbedard 2020-01-10 17:09:56 -0800 Created attachment 387402 Patch 1605423 2 aakash_jain 2020-01-10 17:18:22 -0800 Can you please deploy this change on https://ews-build.webkit-uat.org and provide a sample run. 1605597 3 ap 2020-01-11 18:06:36 -0800 Why is the services bubble here red, while saying "Passed build.webkit.org unit tests"? 1605839 4 jbedard 2020-01-13 07:48:02 -0800 (In reply to Alexey Proskuryakov from comment #3) > Why is the services bubble here red, while saying "Passed build.webkit.org > unit tests"? Pretty sure the machine running the services tests doesn't have some of the required buildbot packages. 1605857 5 387532 jbedard 2020-01-13 08:38:52 -0800 Created attachment 387532 Patch 1605859 6 387533 jbedard 2020-01-13 08:43:14 -0800 Created attachment 387533 Patch 1605869 7 ap 2020-01-13 08:54:27 -0800 > Pretty sure the machine running the services tests doesn't have some of the required buildbot packages. Shouldn't that be causing an error message? 1605901 8 jbedard 2020-01-13 09:28:07 -0800 (In reply to Alexey Proskuryakov from comment #7) > > Pretty sure the machine running the services tests doesn't have some of the required buildbot packages. > > Shouldn't that be causing an error message? It was, sort of. That's what many of the unit test failures for services were. Not all of them, though, some where unit tests I had failed to change. 1605920 9 aakash_jain 2020-01-13 10:07:18 -0800 (In reply to Alexey Proskuryakov from comment #3) > Why is the services bubble here red, while saying "Passed build.webkit.org unit tests"? Tracked in https://bugs.webkit.org/show_bug.cgi?id=206180 1606069 10 387571 jbedard 2020-01-13 14:52:42 -0800 Created attachment 387571 Patch 1606569 11 387571 aakash_jain 2020-01-14 13:53:15 -0800 Comment on attachment 387571 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387571&action=review Seems like python3 webkitpy tests are failing, e.g.: https://ews-build.webkit-uat.org/#/builders/8/builds/35/steps/6/logs/stdio > Tools/BuildSlaveSupport/ews-build/steps.py:696 > +class WebKitPyTest(shell.ShellCommand): Please update the 'Passed webkitpy tests' message to 'Passed python2 webkitpy tests' and 'Passed python3 webkitpy tests'. e.g.: https://ews-build.webkit-uat.org/#/builders/8/builds/37 You can use a class variable (e.g.: python_version) set in both the classes, and used in the 'message' string appropriately. > Tools/BuildSlaveSupport/ews-build/steps.py:727 > message = 'Found {} WebKitPy test failure{}: {}'.format(len(failures), pluralSuffix, failures_string) Please remove both self.build.buildFinished() lines from this getResultSummary() method. This causes the build to be finished early and prevents the RunWebKitPyPython3Tests step from running. 1606609 12 387707 jbedard 2020-01-14 14:40:03 -0800 Created attachment 387707 Patch 1606612 13 387707 aakash_jain 2020-01-14 14:48:52 -0800 Comment on attachment 387707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387707&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:741 > + descriptionDone = ['webkitpy-tests'] Can move descriptionDone to base class. > Tools/BuildSlaveSupport/ews-build/steps.py:742 > + description = ['webkitpy-tests running ({})'.format(language)] Can you check if you can move description, name, jsonFileName, logfiles to base class (WebKitPyTest). 1606616 14 387707 jbedard 2020-01-14 14:58:32 -0800 Comment on attachment 387707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387707&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:742 >> + description = ['webkitpy-tests running ({})'.format(language)] > > Can you check if you can move description, name, jsonFileName, logfiles to base class (WebKitPyTest). We won't be able to. They need language to be defined. Unless we make them properties, no, we can't move them. 1606661 15 387718 jbedard 2020-01-14 16:13:48 -0800 Created attachment 387718 Patch 1606712 16 aakash_jain 2020-01-14 17:09:41 -0800 Test runs: Success: https://ews-build.webkit-uat.org/#/builders/8/builds/55 Failure: https://ews-build.webkit-uat.org/#/builders/8/builds/56 1606732 17 387718 commit-queue 2020-01-14 17:32:43 -0800 Comment on attachment 387718 Patch Clearing flags on attachment: 387718 Committed r254547: <https://trac.webkit.org/changeset/254547> 1606733 18 commit-queue 2020-01-14 17:32:45 -0800 All reviewed patches have been landed. Closing bug. 1606734 19 webkit-bug-importer 2020-01-14 17:33:15 -0800 <rdar://problem/58589889> 1606877 20 aakash_jain 2020-01-15 03:57:41 -0800 (In reply to Aakash Jain from comment #9) > (In reply to Alexey Proskuryakov from comment #3) > > Why is the services bubble here red, while saying "Passed build.webkit.org unit tests"? > Tracked in https://bugs.webkit.org/show_bug.cgi?id=206180 Fixed, that red bubble's tooltip now says: "Failed EWS unit tests" 387402 2020-01-10 17:09:56 -0800 2020-01-13 08:38:49 -0800 Patch bug-206113-20200110170955.patch text/plain 5245 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDM4MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDIwLTAxLTEwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKFdlYktpdFB5VGVzdCk6IFJlbmFtZWQgZnJvbSBSdW5XZWJLaXRQeVRlc3RzLgorICAg ICAgICAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlQeXRo b24zVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlUZXN0cyk6IFJlbmFtZWQgdG8gV2ViS2l0 UHlUZXN0LgorCiAyMDIwLTAxLTEwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KIAogICAgICAgICB3ZWJraXQtcGF0Y2ggY3Jhc2hlcyB3aGVuIGNyZWF0aW5nIG5ldyBidWcg d2l0aCBQeXRob24gMwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2Zh Y3Rvcmllcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNTQzODEpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3 IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGMKICAgICAgICAgICAg ICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgSW5zdGFs bEd0a0RlcGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3Nl cywKICAgICAgICAgICAgICAgICAgICBQcmludENvbmZpZ3VyYXRpb24sIFJ1bkFQSVRlc3RzLCBS dW5CaW5kaW5nc1Rlc3RzLCBSdW5CdWlsZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRi b3RDaGVja0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLAogICAgICAgICAgICAgICAgICAgIFJ1bkph dmFTY3JpcHRDb3JlVGVzdHMsIFJ1bldlYktpdDFUZXN0cywgUnVuV2ViS2l0UGVybFRlc3RzLAot ICAgICAgICAgICAgICAgICAgIFJ1bldlYktpdFB5VGVzdHMsIFJ1bldlYktpdFRlc3RzLCBVcGRh dGVXb3JraW5nRGlyZWN0b3J5LCBWYWxpZGF0ZVBhdGNoKQorICAgICAgICAgICAgICAgICAgIFJ1 bldlYktpdFB5UHl0aG9uMlRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cywgUnVuV2ViS2l0 VGVzdHMsIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCiAKIAogY2xhc3Mg RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CkBAIC04Nyw3ICs4Nyw4IEBAIGNsYXNzIFdl YktpdFBlcmxGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgV2ViS2l0UHlGYWN0b3J5KEZhY3Rvcnkp OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBh cmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgog ICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1 cmF0aW9uPWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXM9YXJjaGl0ZWN0dXJlcywgYnVpbGRP bmx5PUZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnQ9YWRkaXRpb25hbEFyZ3VtZW50cywgY2hlY2tS ZWxldmFuY2U9VHJ1ZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkK KyAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKCkpCisgICAgICAg IHNlbGYuYWRkU3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygpKQogCiAKIGNsYXNzIEJ1aWxk RmFjdG9yeShGYWN0b3J5KToKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHMucHkJKHJldmlzaW9uIDI1NDM4MSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtNjkzLDE3ICs2OTMsMTIgQEAg Y2xhc3MgUnVuRVdTQnVpbGRib3RDaGVja0NvbmZpZyhzaGVsbC5TaAogICAgICAgICByZXR1cm4g e3Unc3RlcCc6IHUnRmFpbGVkIGJ1aWxkYm90IGNoZWNrY29uZmlnJ30KIAogCi1jbGFzcyBSdW5X ZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxsQ29tbWFuZCk6Ci0gICAgbmFtZSA9ICd3ZWJraXRweS10 ZXN0cycKLSAgICBkZXNjcmlwdGlvbiA9IFsnd2Via2l0cHktdGVzdHMgcnVubmluZyddCitjbGFz cyBXZWJLaXRQeVRlc3Qoc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBkZXNjcmlwdGlvbkRvbmUg PSBbJ3dlYmtpdHB5LXRlc3RzJ10KICAgICBmbHVua09uRmFpbHVyZSA9IFRydWUKLSAgICBqc29u RmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9yZXN1bHRzLmpzb24nCi0gICAgbG9nZmlsZXMgPSB7 J2pzb24nOiBqc29uRmlsZU5hbWV9Ci0gICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL1Nj cmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxl TmFtZSldCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgotICAgICAgICBzdXBl cihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5fX2luaXRfXyh0aW1lb3V0PTIgKiA2MCwgbG9nRW52 aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisgICAgICAgIHN1cGVyKFdlYktpdFB5VGVzdCwgc2VsZiku X19pbml0X18odGltZW91dD0yICogNjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQogCiAg ICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLmxvZ19vYnNlcnZlciA9IGxvZ29ic2Vy dmVyLkJ1ZmZlckxvZ09ic2VydmVyKCkKQEAgLTcyMiwxMSArNzE3LDExIEBAIGNsYXNzIFJ1bldl YktpdFB5VGVzdHMoc2hlbGwuU2hlbGxDb21tYW4KICAgICAgICAgICAgIHdlYmtpdHB5X3Jlc3Vs dHMgPSBqc29uLmxvYWRzKGpzb25fdGV4dCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBl eDoKICAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRlcnInLCAnRVJST1I6IHVuYWJsZSB0 byBwYXJzZSBkYXRhLCBleGNlcHRpb246IHt9Jy5mb3JtYXQoZXgpKQotICAgICAgICAgICAgcmV0 dXJuIHN1cGVyKFJ1bldlYktpdFB5VGVzdHMsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQorICAg ICAgICAgICAgcmV0dXJuIHN1cGVyKFdlYktpdFB5VGVzdCwgc2VsZikuZ2V0UmVzdWx0U3VtbWFy eSgpCiAKICAgICAgICAgZmFpbHVyZXMgPSB3ZWJraXRweV9yZXN1bHRzLmdldCgnZmFpbHVyZXMn KSArIHdlYmtpdHB5X3Jlc3VsdHMuZ2V0KCdlcnJvcnMnKQogICAgICAgICBpZiBub3QgZmFpbHVy ZXM6Ci0gICAgICAgICAgICByZXR1cm4gc3VwZXIoUnVuV2ViS2l0UHlUZXN0cywgc2VsZikuZ2V0 UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4gc3VwZXIoV2ViS2l0UHlUZXN0LCBz ZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKICAgICAgICAgcGx1cmFsU3VmZml4ID0gJ3MnIGlmIGxl bihmYWlsdXJlcykgPiAxIGVsc2UgJycKICAgICAgICAgZmFpbHVyZXNfc3RyaW5nID0gJywgJy5q b2luKFtmYWlsdXJlLmdldCgnbmFtZScpLnJlcGxhY2UoJ3dlYmtpdHB5LicsICcnKSBmb3IgZmFp bHVyZSBpbiBmYWlsdXJlc10pCiAgICAgICAgIG1lc3NhZ2UgPSAnRm91bmQge30gV2ViS2l0UHkg dGVzdCBmYWlsdXJle306IHt9Jy5mb3JtYXQobGVuKGZhaWx1cmVzKSwgcGx1cmFsU3VmZml4LCBm YWlsdXJlc19zdHJpbmcpCkBAIC03NDIsNiArNzM3LDIyIEBAIGNsYXNzIFJ1bldlYktpdFB5VGVz dHMoc2hlbGwuU2hlbGxDb21tYW4KICAgICAgICAgbG9nLmFkZFN0ZG91dChtZXNzYWdlKQogCiAK K2NsYXNzIFJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKFdlYktpdFB5VGVzdCk6CisgICAgbmFtZSA9 ICd3ZWJraXRweS10ZXN0cy1weXRob24yJworICAgIGRlc2NyaXB0aW9uID0gWyd3ZWJraXRweS10 ZXN0cyBydW5uaW5nIChweXRob24yKSddCisgICAganNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rl c3RfcHl0aG9uMl9yZXN1bHRzLmpzb24nCisgICAgbG9nZmlsZXMgPSB7J2pzb24nOiBqc29uRmls ZU5hbWV9CisgICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJr aXRweScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxlTmFtZSldCisKKworY2xh c3MgUnVuV2ViS2l0UHlQeXRob24zVGVzdHMoV2ViS2l0UHlUZXN0KToKKyAgICBuYW1lID0gJ3dl YmtpdHB5LXRlc3RzLXB5dGhvbjMnCisgICAgZGVzY3JpcHRpb24gPSBbJ3dlYmtpdHB5LXRlc3Rz IHJ1bm5pbmcgKHB5dGhvbjMpJ10KKyAgICBqc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9w eXRob24zX3Jlc3VsdHMuanNvbicKKyAgICBsb2dmaWxlcyA9IHsnanNvbic6IGpzb25GaWxlTmFt ZX0KKyAgICBjb21tYW5kID0gWydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRw eScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxlTmFtZSldCisKKwogY2xhc3Mg SW5zdGFsbEd0a0RlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIG5hbWUgPSAn amhidWlsZCcKICAgICBkZXNjcmlwdGlvbiA9IFsndXBkYXRpbmcgZ3RrIGRlcGVuZGVuY2llcydd Cg== 387532 2020-01-13 08:38:52 -0800 2020-01-13 08:43:11 -0800 Patch bug-206113-20200113083851.patch text/plain 9643 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDQzMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKFdlYktpdFB5VGVzdCk6IFJlbmFtZWQgZnJvbSBSdW5XZWJLaXRQeVRlc3RzLgorICAg ICAgICAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlQeXRo b24zVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlUZXN0cyk6IFJlbmFtZWQgdG8gV2ViS2l0 UHlUZXN0LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weToKKyAgICAgICAgKFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cyk6IE1vdmVkIGZyb20g VGVzdFdlYktpdFB5VGVzdHMuCisgICAgICAgIChUZXN0V2ViS2l0UHlUZXN0cyk6IE1vdmVkIHRv IFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cy4KKyAgICAgICAgKFRlc3RXZWJLaXRQeVB5dGhvbjNU ZXN0cyk6IENvcGllZCBmcm9tIFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cy4KKwogMjAyMC0wMS0x MSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEV4cG9zZSBmcmFtZSBpbmZvcm1hdGlvbiBvbiBfV0tSZXNvdXJjZUxvYWRJbmZvCkluZGV4OiBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlz aW9uIDI1NDQzMSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3Jp ZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZnJvbSBzdGVwcyBpbXBvcnQg KEFwcGx5UGF0Y2gsIEFwcGx5V2F0YwogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0 YWxsV3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAg IFByaW50Q29uZmlndXJhdGlvbiwgUnVuQVBJVGVzdHMsIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkJ1 aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NV bml0VGVzdHMsCiAgICAgICAgICAgICAgICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVu V2ViS2l0MVRlc3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVu V2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZh bGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlQeXRob24yVGVzdHMs IFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzLCBSdW5XZWJLaXRUZXN0cywgVXBkYXRlV29ya2luZ0Rp cmVjdG9yeSwgVmFsaWRhdGVQYXRjaCkKIAogCiBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRG YWN0b3J5KToKQEAgLTg3LDcgKzg3LDggQEAgY2xhc3MgV2ViS2l0UGVybEZhY3RvcnkoRmFjdG9y eSk6CiBjbGFzcyBXZWJLaXRQeUZhY3RvcnkoRmFjdG9yeSk6CiAgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRk aXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0 X18oc2VsZiwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcz1hcmNoaXRlY3R1cmVzLCBidWlsZE9ubHk9RmFsc2UsIGFkZGl0aW9uYWxB cmd1bWVudD1hZGRpdGlvbmFsQXJndW1lbnRzLCBjaGVja1JlbGV2YW5jZT1UcnVlKQotICAgICAg ICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLmFkZFN0ZXAo UnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktp dFB5UHl0aG9uM1Rlc3RzKCkpCiAKIAogY2xhc3MgQnVpbGRGYWN0b3J5KEZhY3RvcnkpOgpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24g MjU0NDMxKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC02OTMsMTcgKzY5MywxMiBAQCBjbGFzcyBSdW5FV1NCdWlsZGJvdENo ZWNrQ29uZmlnKHNoZWxsLlNoCiAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgYnVp bGRib3QgY2hlY2tjb25maWcnfQogCiAKLWNsYXNzIFJ1bldlYktpdFB5VGVzdHMoc2hlbGwuU2hl bGxDb21tYW5kKToKLSAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzJwotICAgIGRlc2NyaXB0aW9u ID0gWyd3ZWJraXRweS10ZXN0cyBydW5uaW5nJ10KK2NsYXNzIFdlYktpdFB5VGVzdChzaGVsbC5T aGVsbENvbW1hbmQpOgogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnd2Via2l0cHktdGVzdHMnXQog ICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQotICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90 ZXN0X3Jlc3VsdHMuanNvbicKLSAgICBsb2dmaWxlcyA9IHsnanNvbic6IGpzb25GaWxlTmFtZX0K LSAgICBjb21tYW5kID0gWydweXRob24nLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5Jywg Jy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KIAogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCAqKmt3YXJncyk6Ci0gICAgICAgIHN1cGVyKFJ1bldlYktpdFB5VGVzdHMsIHNl bGYpLl9faW5pdF9fKHRpbWVvdXQ9MiAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykK KyAgICAgICAgc3VwZXIoV2ViS2l0UHlUZXN0LCBzZWxmKS5fX2luaXRfXyh0aW1lb3V0PTIgKiA2 MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CiAg ICAgICAgIHNlbGYubG9nX29ic2VydmVyID0gbG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIo KQpAQCAtNzIyLDExICs3MTcsMTEgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVs bENvbW1hbgogICAgICAgICAgICAgd2Via2l0cHlfcmVzdWx0cyA9IGpzb24ubG9hZHMoanNvbl90 ZXh0KQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGV4OgogICAgICAgICAgICAgc2VsZi5f YWRkVG9Mb2coJ3N0ZGVycicsICdFUlJPUjogdW5hYmxlIHRvIHBhcnNlIGRhdGEsIGV4Y2VwdGlv bjoge30nLmZvcm1hdChleCkpCi0gICAgICAgICAgICByZXR1cm4gc3VwZXIoUnVuV2ViS2l0UHlU ZXN0cywgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4gc3VwZXIo V2ViS2l0UHlUZXN0LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogICAgICAgICBmYWlsdXJl cyA9IHdlYmtpdHB5X3Jlc3VsdHMuZ2V0KCdmYWlsdXJlcycpICsgd2Via2l0cHlfcmVzdWx0cy5n ZXQoJ2Vycm9ycycpCiAgICAgICAgIGlmIG5vdCBmYWlsdXJlczoKLSAgICAgICAgICAgIHJldHVy biBzdXBlcihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKyAgICAg ICAgICAgIHJldHVybiBzdXBlcihXZWJLaXRQeVRlc3QsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnko KQogICAgICAgICBwbHVyYWxTdWZmaXggPSAncycgaWYgbGVuKGZhaWx1cmVzKSA+IDEgZWxzZSAn JwogICAgICAgICBmYWlsdXJlc19zdHJpbmcgPSAnLCAnLmpvaW4oW2ZhaWx1cmUuZ2V0KCduYW1l JykucmVwbGFjZSgnd2Via2l0cHkuJywgJycpIGZvciBmYWlsdXJlIGluIGZhaWx1cmVzXSkKICAg ICAgICAgbWVzc2FnZSA9ICdGb3VuZCB7fSBXZWJLaXRQeSB0ZXN0IGZhaWx1cmV7fToge30nLmZv cm1hdChsZW4oZmFpbHVyZXMpLCBwbHVyYWxTdWZmaXgsIGZhaWx1cmVzX3N0cmluZykKQEAgLTc0 Miw2ICs3MzcsMjIgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVsbENvbW1hbgog ICAgICAgICBsb2cuYWRkU3Rkb3V0KG1lc3NhZ2UpCiAKIAorY2xhc3MgUnVuV2ViS2l0UHlQeXRo b24yVGVzdHMoV2ViS2l0UHlUZXN0KToKKyAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzLXB5dGhv bjInCisgICAgZGVzY3JpcHRpb24gPSBbJ3dlYmtpdHB5LXRlc3RzIHJ1bm5pbmcgKHB5dGhvbjIp J10KKyAgICBqc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9weXRob24yX3Jlc3VsdHMuanNv bicKKyAgICBsb2dmaWxlcyA9IHsnanNvbic6IGpzb25GaWxlTmFtZX0KKyAgICBjb21tYW5kID0g WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9 ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KKworCitjbGFzcyBSdW5XZWJLaXRQeVB5dGhvbjNU ZXN0cyhXZWJLaXRQeVRlc3QpOgorICAgIG5hbWUgPSAnd2Via2l0cHktdGVzdHMtcHl0aG9uMycK KyAgICBkZXNjcmlwdGlvbiA9IFsnd2Via2l0cHktdGVzdHMgcnVubmluZyAocHl0aG9uMyknXQor ICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhvbjNfcmVzdWx0cy5qc29uJwor ICAgIGxvZ2ZpbGVzID0geydqc29uJzoganNvbkZpbGVOYW1lfQorICAgIGNvbW1hbmQgPSBbJ3B5 dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9ezB9 Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KKworCiBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVz KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgbmFtZSA9ICdqaGJ1aWxkJwogICAgIGRlc2NyaXB0 aW9uID0gWyd1cGRhdGluZyBndGsgZGVwZW5kZW5jaWVzJ10KSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI1NDQzMSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBmcm9tIHN0ZXBzIGltcG9y dCAoQW5hbHl6ZUFQSVRlc3RzUmVzdWx0CiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWls dFByb2R1Y3QsIERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlciwgRXh0cmFjdEJ1aWx0UHJv ZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxs V3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFBy aW50Q29uZmlndXJhdGlvbiwgUmVSdW5BUElUZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3Rz LCBSZVJ1bldlYktpdFBlcmxUZXN0cywgUmVSdW5XZWJLaXRUZXN0cywgUnVuQVBJVGVzdHMsIFJ1 bkFQSVRlc3RzV2l0aG91dFBhdGNoLAogICAgICAgICAgICAgICAgICAgIFJ1bkJpbmRpbmdzVGVz dHMsIFJ1bkJ1aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmln LCBSdW5FV1NVbml0VGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkpTQ1Rlc3RzV2l0 aG91dFBhdGNoLCBSdW5XZWJLaXQxVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0 UGVybFRlc3RzLCBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgUnVuV2ViS2l0VGVz dHNXaXRob3V0UGF0Y2gsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBUcmFuc2ZlclRv UzMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0 UGVybFRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cywgUnVuV2ViS2l0UHlQeXRob24zVGVz dHMsIFJ1bldlYktpdFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhvdXRQYXRjaCwgVGVzdFdpdGhG YWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZSZXF1aXJl ZCwKICAgICAgICAgICAgICAgICAgICBVcGRhdGVXb3JraW5nRGlyZWN0b3J5LCBVcGxvYWRCdWls dFByb2R1Y3QsIFVwbG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0ZVBhdGNoKQogCiAjIFdvcmthcm91 bmQgZm9yIGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9pc3N1ZXMvNDY2OQpA QCAtNDE5LDE3ICs0MTksMTcgQEAgY2xhc3MgVGVzdFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhU ZXN0UgogICAgICAgICBzZWxmLnNldHVwU3RlcChSZVJ1bldlYktpdFBlcmxUZXN0cygpKQogCiAK LWNsYXNzIFRlc3RXZWJLaXRQeVRlc3RzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVz dC5UZXN0Q2FzZSk6CitjbGFzcyBUZXN0V2ViS2l0UHlQeXRob24yVGVzdHMoQnVpbGRTdGVwTWl4 aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAg ICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCi0gICAgICAgIHNlbGYuanNvbkZpbGVOYW1l ID0gJ3dlYmtpdHB5X3Rlc3RfcmVzdWx0cy5qc29uJworICAgICAgICBzZWxmLmpzb25GaWxlTmFt ZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhvbjJfcmVzdWx0cy5qc29uJwogICAgICAgICByZXR1cm4g c2VsZi5zZXRVcEJ1aWxkU3RlcCgpCiAKICAgICBkZWYgdGVhckRvd24oc2VsZik6CiAgICAgICAg IHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKIAogICAgIGRlZiB0ZXN0X3N1Y2Nlc3Mo c2VsZik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAg ICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKICAgICAgICAgc2Vs Zi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9 J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCkBAIC00 NDMsNyArNDQzLDQ3IEBAIGNsYXNzIFRlc3RXZWJLaXRQeVRlc3RzKEJ1aWxkU3RlcE1peGluQWQK ICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKICAgICBkZWYgdGVzdF9mYWlsdXJlKHNl bGYpOgotICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJLaXRQeVRlc3RzKCkpCisgICAgICAg IHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKCkpCisgICAgICAgIHNlbGYu ZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3 a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL3Rlc3Qt d2Via2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSld LAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmls ZU5hbWV9LAorICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAsCisgICAgICAgICAg ICAgICAgICAgICAgICApCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBz dGRvdXQ9JycnUmFuIDE3NDQgdGVzdHMgaW4gNS45MTNzCitGQUlMRUQgKGZhaWx1cmVzPTEsIGVy cm9ycz0wKScnJykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4 cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nd2Via2l0cHktdGVzdHMg KGZhaWx1cmUpJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKworY2xhc3MgVGVz dFdlYktpdFB5UHl0aG9uM1Rlc3RzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5U ZXN0Q2FzZSk6CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdl ID0gVHJ1ZQorICAgICAgICBzZWxmLmpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhv bjNfcmVzdWx0cy5qc29uJworICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisK KyAgICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVp bGRTdGVwKCkKKworICAgIGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0 dXBTdGVwKFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzKCkpCisgICAgICAgIHNlbGYuZXhwZWN0UmVt b3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisg ICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAorICAgICAgICAgICAgICAg ICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHkn LCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAorICAgICAg ICAgICAgICAgICAgICAgICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9LAor ICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAsCisgICAgICAgICAgICAgICAgICAg ICAgICApCisgICAgICAgICAgICArIDAsCisgICAgICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RP dXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1Bhc3NlZCB3ZWJraXRweSB0ZXN0 cycpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVy ZShzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMo KSkKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVj dFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmly b249RmFsc2UsCg== 387533 2020-01-13 08:43:14 -0800 2020-01-13 14:52:40 -0800 Patch bug-206113-20200113084313.patch text/plain 9871 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDQzMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAg ICAgICAgKFdlYktpdFB5VGVzdCk6IFJlbmFtZWQgZnJvbSBSdW5XZWJLaXRQeVRlc3RzLgorICAg ICAgICAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlQeXRo b24zVGVzdHMpOgorICAgICAgICAoUnVuV2ViS2l0UHlUZXN0cyk6IFJlbmFtZWQgdG8gV2ViS2l0 UHlUZXN0LgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weToKKyAgICAgICAgKFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cyk6IE1vdmVkIGZyb20g VGVzdFdlYktpdFB5VGVzdHMuCisgICAgICAgIChUZXN0V2ViS2l0UHlUZXN0cyk6IE1vdmVkIHRv IFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cy4KKyAgICAgICAgKFRlc3RXZWJLaXRQeVB5dGhvbjNU ZXN0cyk6IENvcGllZCBmcm9tIFRlc3RXZWJLaXRQeVB5dGhvbjJUZXN0cy4KKwogMjAyMC0wMS0x MSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IEV4cG9zZSBmcmFtZSBpbmZvcm1hdGlvbiBvbiBfV0tSZXNvdXJjZUxvYWRJbmZvCkluZGV4OiBU b29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlz aW9uIDI1NDQzMSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3Jp ZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTI5LDcgKzI5LDcgQEAgZnJvbSBzdGVwcyBpbXBvcnQg KEFwcGx5UGF0Y2gsIEFwcGx5V2F0YwogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0 YWxsV3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAg IFByaW50Q29uZmlndXJhdGlvbiwgUnVuQVBJVGVzdHMsIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkJ1 aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NV bml0VGVzdHMsCiAgICAgICAgICAgICAgICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVu V2ViS2l0MVRlc3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVu V2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZh bGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlQeXRob24yVGVzdHMs IFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzLCBSdW5XZWJLaXRUZXN0cywgVXBkYXRlV29ya2luZ0Rp cmVjdG9yeSwgVmFsaWRhdGVQYXRjaCkKIAogCiBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRG YWN0b3J5KToKQEAgLTg3LDcgKzg3LDggQEAgY2xhc3MgV2ViS2l0UGVybEZhY3RvcnkoRmFjdG9y eSk6CiBjbGFzcyBXZWJLaXRQeUZhY3RvcnkoRmFjdG9yeSk6CiAgICAgZGVmIF9faW5pdF9fKHNl bGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRk aXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0 X18oc2VsZiwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwg YXJjaGl0ZWN0dXJlcz1hcmNoaXRlY3R1cmVzLCBidWlsZE9ubHk9RmFsc2UsIGFkZGl0aW9uYWxB cmd1bWVudD1hZGRpdGlvbmFsQXJndW1lbnRzLCBjaGVja1JlbGV2YW5jZT1UcnVlKQotICAgICAg ICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLmFkZFN0ZXAo UnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktp dFB5UHl0aG9uM1Rlc3RzKCkpCiAKIAogY2xhc3MgQnVpbGRGYWN0b3J5KEZhY3RvcnkpOgpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24g MjU0NDMxKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC02OTMsMTcgKzY5MywxMiBAQCBjbGFzcyBSdW5FV1NCdWlsZGJvdENo ZWNrQ29uZmlnKHNoZWxsLlNoCiAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgYnVp bGRib3QgY2hlY2tjb25maWcnfQogCiAKLWNsYXNzIFJ1bldlYktpdFB5VGVzdHMoc2hlbGwuU2hl bGxDb21tYW5kKToKLSAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzJwotICAgIGRlc2NyaXB0aW9u ID0gWyd3ZWJraXRweS10ZXN0cyBydW5uaW5nJ10KK2NsYXNzIFdlYktpdFB5VGVzdChzaGVsbC5T aGVsbENvbW1hbmQpOgogICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnd2Via2l0cHktdGVzdHMnXQog ICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQotICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90 ZXN0X3Jlc3VsdHMuanNvbicKLSAgICBsb2dmaWxlcyA9IHsnanNvbic6IGpzb25GaWxlTmFtZX0K LSAgICBjb21tYW5kID0gWydweXRob24nLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5Jywg Jy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KIAogICAgIGRlZiBfX2lu aXRfXyhzZWxmLCAqKmt3YXJncyk6Ci0gICAgICAgIHN1cGVyKFJ1bldlYktpdFB5VGVzdHMsIHNl bGYpLl9faW5pdF9fKHRpbWVvdXQ9MiAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykK KyAgICAgICAgc3VwZXIoV2ViS2l0UHlUZXN0LCBzZWxmKS5fX2luaXRfXyh0aW1lb3V0PTIgKiA2 MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6CiAg ICAgICAgIHNlbGYubG9nX29ic2VydmVyID0gbG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIo KQpAQCAtNzIyLDExICs3MTcsMTEgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVs bENvbW1hbgogICAgICAgICAgICAgd2Via2l0cHlfcmVzdWx0cyA9IGpzb24ubG9hZHMoanNvbl90 ZXh0KQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGV4OgogICAgICAgICAgICAgc2VsZi5f YWRkVG9Mb2coJ3N0ZGVycicsICdFUlJPUjogdW5hYmxlIHRvIHBhcnNlIGRhdGEsIGV4Y2VwdGlv bjoge30nLmZvcm1hdChleCkpCi0gICAgICAgICAgICByZXR1cm4gc3VwZXIoUnVuV2ViS2l0UHlU ZXN0cywgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4gc3VwZXIo V2ViS2l0UHlUZXN0LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogICAgICAgICBmYWlsdXJl cyA9IHdlYmtpdHB5X3Jlc3VsdHMuZ2V0KCdmYWlsdXJlcycpICsgd2Via2l0cHlfcmVzdWx0cy5n ZXQoJ2Vycm9ycycpCiAgICAgICAgIGlmIG5vdCBmYWlsdXJlczoKLSAgICAgICAgICAgIHJldHVy biBzdXBlcihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKyAgICAg ICAgICAgIHJldHVybiBzdXBlcihXZWJLaXRQeVRlc3QsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnko KQogICAgICAgICBwbHVyYWxTdWZmaXggPSAncycgaWYgbGVuKGZhaWx1cmVzKSA+IDEgZWxzZSAn JwogICAgICAgICBmYWlsdXJlc19zdHJpbmcgPSAnLCAnLmpvaW4oW2ZhaWx1cmUuZ2V0KCduYW1l JykucmVwbGFjZSgnd2Via2l0cHkuJywgJycpIGZvciBmYWlsdXJlIGluIGZhaWx1cmVzXSkKICAg ICAgICAgbWVzc2FnZSA9ICdGb3VuZCB7fSBXZWJLaXRQeSB0ZXN0IGZhaWx1cmV7fToge30nLmZv cm1hdChsZW4oZmFpbHVyZXMpLCBwbHVyYWxTdWZmaXgsIGZhaWx1cmVzX3N0cmluZykKQEAgLTc0 Miw2ICs3MzcsMjIgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVsbENvbW1hbgog ICAgICAgICBsb2cuYWRkU3Rkb3V0KG1lc3NhZ2UpCiAKIAorY2xhc3MgUnVuV2ViS2l0UHlQeXRo b24yVGVzdHMoV2ViS2l0UHlUZXN0KToKKyAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzLXB5dGhv bjInCisgICAgZGVzY3JpcHRpb24gPSBbJ3dlYmtpdHB5LXRlc3RzIHJ1bm5pbmcgKHB5dGhvbjIp J10KKyAgICBqc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9weXRob24yX3Jlc3VsdHMuanNv bicKKyAgICBsb2dmaWxlcyA9IHsnanNvbic6IGpzb25GaWxlTmFtZX0KKyAgICBjb21tYW5kID0g WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9 ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KKworCitjbGFzcyBSdW5XZWJLaXRQeVB5dGhvbjNU ZXN0cyhXZWJLaXRQeVRlc3QpOgorICAgIG5hbWUgPSAnd2Via2l0cHktdGVzdHMtcHl0aG9uMycK KyAgICBkZXNjcmlwdGlvbiA9IFsnd2Via2l0cHktdGVzdHMgcnVubmluZyAocHl0aG9uMyknXQor ICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhvbjNfcmVzdWx0cy5qc29uJwor ICAgIGxvZ2ZpbGVzID0geydqc29uJzoganNvbkZpbGVOYW1lfQorICAgIGNvbW1hbmQgPSBbJ3B5 dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9ezB9 Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KKworCiBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVz KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgbmFtZSA9ICdqaGJ1aWxkJwogICAgIGRlc2NyaXB0 aW9uID0gWyd1cGRhdGluZyBndGsgZGVwZW5kZW5jaWVzJ10KSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI1NDQzMSkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBmcm9tIHN0ZXBzIGltcG9y dCAoQW5hbHl6ZUFQSVRlc3RzUmVzdWx0CiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWls dFByb2R1Y3QsIERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlciwgRXh0cmFjdEJ1aWx0UHJv ZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxs V3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFBy aW50Q29uZmlndXJhdGlvbiwgUmVSdW5BUElUZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3Rz LCBSZVJ1bldlYktpdFBlcmxUZXN0cywgUmVSdW5XZWJLaXRUZXN0cywgUnVuQVBJVGVzdHMsIFJ1 bkFQSVRlc3RzV2l0aG91dFBhdGNoLAogICAgICAgICAgICAgICAgICAgIFJ1bkJpbmRpbmdzVGVz dHMsIFJ1bkJ1aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmln LCBSdW5FV1NVbml0VGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkpTQ1Rlc3RzV2l0 aG91dFBhdGNoLCBSdW5XZWJLaXQxVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0 UGVybFRlc3RzLCBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgUnVuV2ViS2l0VGVz dHNXaXRob3V0UGF0Y2gsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBUcmFuc2ZlclRv UzMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0 UGVybFRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cywgUnVuV2ViS2l0UHlQeXRob24zVGVz dHMsIFJ1bldlYktpdFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhvdXRQYXRjaCwgVGVzdFdpdGhG YWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZSZXF1aXJl ZCwKICAgICAgICAgICAgICAgICAgICBVcGRhdGVXb3JraW5nRGlyZWN0b3J5LCBVcGxvYWRCdWls dFByb2R1Y3QsIFVwbG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0ZVBhdGNoKQogCiAjIFdvcmthcm91 bmQgZm9yIGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9pc3N1ZXMvNDY2OQpA QCAtNDE5LDE3ICs0MTksMTcgQEAgY2xhc3MgVGVzdFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhU ZXN0UgogICAgICAgICBzZWxmLnNldHVwU3RlcChSZVJ1bldlYktpdFBlcmxUZXN0cygpKQogCiAK LWNsYXNzIFRlc3RXZWJLaXRQeVRlc3RzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVz dC5UZXN0Q2FzZSk6CitjbGFzcyBUZXN0V2ViS2l0UHlQeXRob24yVGVzdHMoQnVpbGRTdGVwTWl4 aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAg ICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCi0gICAgICAgIHNlbGYuanNvbkZpbGVOYW1l ID0gJ3dlYmtpdHB5X3Rlc3RfcmVzdWx0cy5qc29uJworICAgICAgICBzZWxmLmpzb25GaWxlTmFt ZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhvbjJfcmVzdWx0cy5qc29uJwogICAgICAgICByZXR1cm4g c2VsZi5zZXRVcEJ1aWxkU3RlcCgpCiAKICAgICBkZWYgdGVhckRvd24oc2VsZik6CiAgICAgICAg IHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKIAogICAgIGRlZiB0ZXN0X3N1Y2Nlc3Mo c2VsZik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAg ICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKICAgICAgICAgc2Vs Zi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9 J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCkBAIC00 NDMsNyArNDQzLDcgQEAgY2xhc3MgVGVzdFdlYktpdFB5VGVzdHMoQnVpbGRTdGVwTWl4aW5BZAog ICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogICAgIGRlZiB0ZXN0X2ZhaWx1cmUoc2Vs Zik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAgICAg c2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKICAgICAgICAgc2VsZi5l eHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3dr ZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCkBAIC00NTks NiArNDU5LDQ2IEBAIEZBSUxFRCAoZmFpbHVyZXM9MSwgZXJyb3JzPTApJycnKQogICAgICAgICBy ZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogCitjbGFzcyBUZXN0V2ViS2l0UHlQeXRob24zVGVzdHMo QnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0 VXAoc2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCisgICAgICAgIHNlbGYu anNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3RfcHl0aG9uM19yZXN1bHRzLmpzb24nCisgICAg ICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRlZiB0ZWFyRG93bihzZWxm KToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQorCisgICAgZGVmIHRl c3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRo b24zVGVzdHMoKSkKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAg ICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKKyAgICAgICAgICAgICAgICAgICAgICAg IGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0 aG9uMycsICdUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0n LmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9n ZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5hbWV9LAorICAgICAgICAgICAgICAgICAgICAg ICAgdGltZW91dD0xMjAsCisgICAgICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAr IDAsCisgICAgICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNT LCBzdGF0ZV9zdHJpbmc9J1Bhc3NlZCB3ZWJraXRweSB0ZXN0cycpCisgICAgICAgIHJldHVybiBz ZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKKyAgICAgICAgc2Vs Zi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24zVGVzdHMoKSkKKyAgICAgICAgc2VsZi5leHBl Y3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGly JywKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCisgICAgICAgICAg ICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uMycsICdUb29scy9TY3JpcHRzL3Rlc3Qtd2Vi a2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSldLAor ICAgICAgICAgICAgICAgICAgICAgICAgbG9nZmlsZXM9eydqc29uJzogc2VsZi5qc29uRmlsZU5h bWV9LAorICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAsCisgICAgICAgICAgICAg ICAgICAgICAgICApCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRv dXQ9JycnUmFuIDE3NDQgdGVzdHMgaW4gNS45MTNzCitGQUlMRUQgKGZhaWx1cmVzPTEsIGVycm9y cz0wKScnJykKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVj dE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nd2Via2l0cHktdGVzdHMgKGZh aWx1cmUpJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKwogY2xhc3MgVGVzdFJ1 bkVXU0J1aWxkYm90Q2hlY2tDb25maWcoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYubG9uZ01lc3Nh Z2UgPSBUcnVlCg== 387571 2020-01-13 14:52:42 -0800 2020-01-14 14:40:02 -0800 Patch bug-206113-20200113145241.patch text/plain 10704 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDQ1NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0VGVzdHNGYWN0b3J5LnRlc3Rfd2Via2l0cHlfZmFjdG9y eSk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAg ICAgICAoV2ViS2l0UHlUZXN0KTogUmVuYW1lZCBmcm9tIFJ1bldlYktpdFB5VGVzdHMuCisgICAg ICAgIChSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVB5dGhv bjNUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVRlc3RzKTogUmVuYW1lZCB0byBXZWJLaXRQ eVRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzKTogTW92ZWQgZnJvbSBU ZXN0V2ViS2l0UHlUZXN0cy4KKyAgICAgICAgKFRlc3RXZWJLaXRQeVRlc3RzKTogTW92ZWQgdG8g VGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uM1Rl c3RzKTogQ29waWVkIGZyb20gVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorCiAyMDIwLTAxLTEz ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbRVdTXSBB ZGQgdW5pdCB0ZXN0cyBmb3IgZmFjdG9yaWVzCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDI1NDQ1NCkKKysrIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkK QEAgLTI5LDcgKzI5LDcgQEAgZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5UGF0Y2gsIEFwcGx5V2F0 YwogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQcm9kdWN0LCBFeHRyYWN0QnVpbHRQ cm9kdWN0LCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLCBL aWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwg UnVuQVBJVGVzdHMsIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkJ1aWxkV2ViS2l0T3JnVW5pdFRlc3Rz LCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0VGVzdHMsCiAgICAgICAgICAg ICAgICAgICAgUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgUnVuV2ViS2l0MVRlc3RzLCBSdW5XZWJL aXRQZXJsVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlUZXN0cywgUnVuV2Vi S2l0VGVzdHMsIFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCisgICAgICAg ICAgICAgICAgICAgUnVuV2ViS2l0UHlQeXRob24yVGVzdHMsIFJ1bldlYktpdFB5UHl0aG9uM1Rl c3RzLCBSdW5XZWJLaXRUZXN0cywgVXBkYXRlV29ya2luZ0RpcmVjdG9yeSwgVmFsaWRhdGVQYXRj aCkKIAogCiBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKQEAgLTg3LDcgKzg3 LDggQEAgY2xhc3MgV2ViS2l0UGVybEZhY3RvcnkoRmFjdG9yeSk6CiBjbGFzcyBXZWJLaXRQeUZh Y3RvcnkoRmFjdG9yeSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1 cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25l LCAqKmt3YXJncyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm09cGxh dGZvcm0sIGNvbmZpZ3VyYXRpb249Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcz1hcmNoaXRl Y3R1cmVzLCBidWlsZE9ubHk9RmFsc2UsIGFkZGl0aW9uYWxBcmd1bWVudD1hZGRpdGlvbmFsQXJn dW1lbnRzLCBjaGVja1JlbGV2YW5jZT1UcnVlKQotICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuV2Vi S2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVz dHMoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzKCkpCiAK IAogY2xhc3MgQnVpbGRGYWN0b3J5KEZhY3RvcnkpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0LnB5CShyZXZp c2lvbiAyNTQ0NTQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9y aWVzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzQsNyArMTM0LDggQEAgY2xhc3Mg VGVzdFRlc3RzRmFjdG9yeShUZXN0Q2FzZSk6CiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9y eShzdGVwcy5DaGVja091dFNvdXJjZSksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShz dGVwcy5DaGVja091dFNwZWNpZmljUmV2aXNpb24pLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZh Y3Rvcnkoc3RlcHMuQXBwbHlQYXRjaCksCi0gICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShz dGVwcy5SdW5XZWJLaXRQeVRlc3RzKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0 ZXBzLlJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKSwKKyAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0 b3J5KHN0ZXBzLlJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzKSwKICAgICAgICAgXSkKIAogICAgIGRl ZiB0ZXN0X3NlcnZpY2VzX2ZhY3Rvcnkoc2VsZik6CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNTQ0NTQpCisrKyBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcgY29weSkKQEAgLTY5Mywx NyArNjkzLDEyIEBAIGNsYXNzIFJ1bkVXU0J1aWxkYm90Q2hlY2tDb25maWcoc2hlbGwuU2gKICAg ICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCBidWlsZGJvdCBjaGVja2NvbmZpZyd9CiAK IAotY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVsbENvbW1hbmQpOgotICAgIG5hbWUg PSAnd2Via2l0cHktdGVzdHMnCi0gICAgZGVzY3JpcHRpb24gPSBbJ3dlYmtpdHB5LXRlc3RzIHJ1 bm5pbmcnXQorY2xhc3MgV2ViS2l0UHlUZXN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgZGVz Y3JpcHRpb25Eb25lID0gWyd3ZWJraXRweS10ZXN0cyddCiAgICAgZmx1bmtPbkZhaWx1cmUgPSBU cnVlCi0gICAganNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3RfcmVzdWx0cy5qc29uJwotICAg IGxvZ2ZpbGVzID0geydqc29uJzoganNvbkZpbGVOYW1lfQotICAgIGNvbW1hbmQgPSBbJ3B5dGhv bicsICdUb29scy9TY3JpcHRzL3Rlc3Qtd2Via2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0nLmZv cm1hdChqc29uRmlsZU5hbWUpXQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToK LSAgICAgICAgc3VwZXIoUnVuV2ViS2l0UHlUZXN0cywgc2VsZikuX19pbml0X18odGltZW91dD0y ICogNjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQorICAgICAgICBzdXBlcihXZWJLaXRQ eVRlc3QsIHNlbGYpLl9faW5pdF9fKHRpbWVvdXQ9MiAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAq Kmt3YXJncykKIAogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgc2VsZi5sb2dfb2JzZXJ2 ZXIgPSBsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNlcnZlcigpCkBAIC03MjIsMTEgKzcxNywxMSBA QCBjbGFzcyBSdW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxsQ29tbWFuCiAgICAgICAgICAgICB3 ZWJraXRweV9yZXN1bHRzID0ganNvbi5sb2Fkcyhqc29uX3RleHQpCiAgICAgICAgIGV4Y2VwdCBF eGNlcHRpb24gYXMgZXg6CiAgICAgICAgICAgICBzZWxmLl9hZGRUb0xvZygnc3RkZXJyJywgJ0VS Uk9SOiB1bmFibGUgdG8gcGFyc2UgZGF0YSwgZXhjZXB0aW9uOiB7fScuZm9ybWF0KGV4KSkKLSAg ICAgICAgICAgIHJldHVybiBzdXBlcihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5nZXRSZXN1bHRT dW1tYXJ5KCkKKyAgICAgICAgICAgIHJldHVybiBzdXBlcihXZWJLaXRQeVRlc3QsIHNlbGYpLmdl dFJlc3VsdFN1bW1hcnkoKQogCiAgICAgICAgIGZhaWx1cmVzID0gd2Via2l0cHlfcmVzdWx0cy5n ZXQoJ2ZhaWx1cmVzJykgKyB3ZWJraXRweV9yZXN1bHRzLmdldCgnZXJyb3JzJykKICAgICAgICAg aWYgbm90IGZhaWx1cmVzOgotICAgICAgICAgICAgcmV0dXJuIHN1cGVyKFJ1bldlYktpdFB5VGVz dHMsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQorICAgICAgICAgICAgcmV0dXJuIHN1cGVyKFdl YktpdFB5VGVzdCwgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCiAgICAgICAgIHBsdXJhbFN1ZmZp eCA9ICdzJyBpZiBsZW4oZmFpbHVyZXMpID4gMSBlbHNlICcnCiAgICAgICAgIGZhaWx1cmVzX3N0 cmluZyA9ICcsICcuam9pbihbZmFpbHVyZS5nZXQoJ25hbWUnKS5yZXBsYWNlKCd3ZWJraXRweS4n LCAnJykgZm9yIGZhaWx1cmUgaW4gZmFpbHVyZXNdKQogICAgICAgICBtZXNzYWdlID0gJ0ZvdW5k IHt9IFdlYktpdFB5IHRlc3QgZmFpbHVyZXt9OiB7fScuZm9ybWF0KGxlbihmYWlsdXJlcyksIHBs dXJhbFN1ZmZpeCwgZmFpbHVyZXNfc3RyaW5nKQpAQCAtNzQyLDYgKzczNywyMiBAQCBjbGFzcyBS dW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxsQ29tbWFuCiAgICAgICAgIGxvZy5hZGRTdGRvdXQo bWVzc2FnZSkKIAogCitjbGFzcyBSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cyhXZWJLaXRQeVRlc3Qp OgorICAgIG5hbWUgPSAnd2Via2l0cHktdGVzdHMtcHl0aG9uMicKKyAgICBkZXNjcmlwdGlvbiA9 IFsnd2Via2l0cHktdGVzdHMgcnVubmluZyAocHl0aG9uMiknXQorICAgIGpzb25GaWxlTmFtZSA9 ICd3ZWJraXRweV90ZXN0X3B5dGhvbjJfcmVzdWx0cy5qc29uJworICAgIGxvZ2ZpbGVzID0geydq c29uJzoganNvbkZpbGVOYW1lfQorICAgIGNvbW1hbmQgPSBbJ3B5dGhvbicsICdUb29scy9TY3Jp cHRzL3Rlc3Qtd2Via2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChqc29uRmlsZU5h bWUpXQorCisKK2NsYXNzIFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzKFdlYktpdFB5VGVzdCk6Cisg ICAgbmFtZSA9ICd3ZWJraXRweS10ZXN0cy1weXRob24zJworICAgIGRlc2NyaXB0aW9uID0gWyd3 ZWJraXRweS10ZXN0cyBydW5uaW5nIChweXRob24zKSddCisgICAganNvbkZpbGVOYW1lID0gJ3dl YmtpdHB5X3Rlc3RfcHl0aG9uM19yZXN1bHRzLmpzb24nCisgICAgbG9nZmlsZXMgPSB7J2pzb24n OiBqc29uRmlsZU5hbWV9CisgICAgY29tbWFuZCA9IFsncHl0aG9uMycsICdUb29scy9TY3JpcHRz L3Rlc3Qtd2Via2l0cHknLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChqc29uRmlsZU5hbWUp XQorCisKIGNsYXNzIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMoc2hlbGwuU2hlbGxDb21tYW5kKToK ICAgICBuYW1lID0gJ2poYnVpbGQnCiAgICAgZGVzY3JpcHRpb24gPSBbJ3VwZGF0aW5nIGd0ayBk ZXBlbmRlbmNpZXMnXQpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjU0NDU0KQorKysgVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkp CkBAIC00MCw3ICs0MCw3IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1 bHQKICAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93bmxvYWRCdWls dFByb2R1Y3RGcm9tTWFzdGVyLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3Vs dHMsIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxP bGRQcm9jZXNzZXMsCiAgICAgICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1 bkFQSVRlc3RzLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJlUnVuV2ViS2l0UGVybFRlc3Rz LCBSZVJ1bldlYktpdFRlc3RzLCBSdW5BUElUZXN0cywgUnVuQVBJVGVzdHNXaXRob3V0UGF0Y2gs CiAgICAgICAgICAgICAgICAgICAgUnVuQmluZGluZ3NUZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdV bml0VGVzdHMsIFJ1bkVXU0J1aWxkYm90Q2hlY2tDb25maWcsIFJ1bkVXU1VuaXRUZXN0cywgUnVu SmF2YVNjcmlwdENvcmVUZXN0cywgUnVuSlNDVGVzdHNXaXRob3V0UGF0Y2gsIFJ1bldlYktpdDFU ZXN0cywKLSAgICAgICAgICAgICAgICAgICBSdW5XZWJLaXRQZXJsVGVzdHMsIFJ1bldlYktpdFB5 VGVzdHMsIFJ1bldlYktpdFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhvdXRQYXRjaCwgVGVzdFdp dGhGYWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZSZXF1 aXJlZCwKKyAgICAgICAgICAgICAgICAgICBSdW5XZWJLaXRQZXJsVGVzdHMsIFJ1bldlYktpdFB5 UHl0aG9uMlRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFJ1 bldlYktpdFRlc3RzV2l0aG91dFBhdGNoLCBUZXN0V2l0aEZhaWx1cmVDb3VudCwgVHJpZ2dlciwg VHJhbnNmZXJUb1MzLCBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkLAogICAgICAgICAgICAgICAgICAg IFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFVwbG9hZEJ1aWx0UHJvZHVjdCwgVXBsb2FkVGVzdFJl c3VsdHMsIFZhbGlkYXRlUGF0Y2gpCiAKICMgV29ya2Fyb3VuZCBmb3IgaHR0cHM6Ly9naXRodWIu Y29tL2J1aWxkYm90L2J1aWxkYm90L2lzc3Vlcy80NjY5CkBAIC00MTksMTcgKzQxOSwxNyBAQCBj bGFzcyBUZXN0UmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKFRlc3RSCiAgICAgICAgIHNlbGYuc2V0 dXBTdGVwKFJlUnVuV2ViS2l0UGVybFRlc3RzKCkpCiAKIAotY2xhc3MgVGVzdFdlYktpdFB5VGVz dHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKK2NsYXNzIFRl c3RXZWJLaXRQeVB5dGhvbjJUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3Qu VGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVzc2Fn ZSA9IFRydWUKLSAgICAgICAgc2VsZi5qc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9yZXN1 bHRzLmpzb24nCisgICAgICAgIHNlbGYuanNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3RfcHl0 aG9uMl9yZXN1bHRzLmpzb24nCiAgICAgICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkK IAogICAgIGRlZiB0ZWFyRG93bihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25C dWlsZFN0ZXAoKQogCiAgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKLSAgICAgICAgc2VsZi5z ZXR1cFN0ZXAoUnVuV2ViS2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5X ZWJLaXRQeVB5dGhvbjJUZXN0cygpKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRz KAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAg ICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKQEAgLTQ0Myw3ICs0NDMsNyBAQCBjbGFzcyBU ZXN0V2ViS2l0UHlUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkCiAgICAgICAgIHJldHVybiBzZWxmLnJ1 blN0ZXAoKQogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKLSAgICAgICAgc2VsZi5zZXR1 cFN0ZXAoUnVuV2ViS2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJL aXRQeVB5dGhvbjJUZXN0cygpKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAog ICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAg ICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKQEAgLTQ1OSw2ICs0NTksNDYgQEAgRkFJTEVEIChm YWlsdXJlcz0xLCBlcnJvcnM9MCknJycpCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQog CiAKK2NsYXNzIFRlc3RXZWJLaXRQeVB5dGhvbjNUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9u cywgdW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAgICAgc2Vs Zi5sb25nTWVzc2FnZSA9IFRydWUKKyAgICAgICAgc2VsZi5qc29uRmlsZU5hbWUgPSAnd2Via2l0 cHlfdGVzdF9weXRob24zX3Jlc3VsdHMuanNvbicKKyAgICAgICAgcmV0dXJuIHNlbGYuc2V0VXBC dWlsZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICByZXR1cm4gc2Vs Zi50ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgorICAg ICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygpKQorICAgICAgICBz ZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rp cj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMv dGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVO YW1lKV0sCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpz b25GaWxlTmFtZX0sCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTEyMCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAg ICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nUGFzc2Vk IHdlYmtpdHB5IHRlc3RzJykKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKyAgICBk ZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJLaXRQ eVB5dGhvbjNUZXN0cygpKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAg ICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAg ICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9 WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0 PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKV0sCisgICAgICAgICAgICAgICAgICAgICAg ICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCisgICAgICAgICAgICAgICAg ICAgICAgICB0aW1lb3V0PTEyMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJydSYW4gMTc0NCB0ZXN0cyBp biA1LjkxM3MKK0ZBSUxFRCAoZmFpbHVyZXM9MSwgZXJyb3JzPTApJycnKQorICAgICAgICAgICAg KyAyLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVS RSwgc3RhdGVfc3RyaW5nPSd3ZWJraXRweS10ZXN0cyAoZmFpbHVyZSknKQorICAgICAgICByZXR1 cm4gc2VsZi5ydW5TdGVwKCkKKworCiBjbGFzcyBUZXN0UnVuRVdTQnVpbGRib3RDaGVja0NvbmZp ZyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBz ZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUK 387707 2020-01-14 14:40:03 -0800 2020-01-14 16:13:47 -0800 Patch bug-206113-20200114144002.patch text/plain 11750 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDUzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTAxLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0VGVzdHNGYWN0b3J5LnRlc3Rfd2Via2l0cHlfZmFjdG9y eSk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAg ICAgICAoV2ViS2l0UHlUZXN0KTogUmVuYW1lZCBmcm9tIFJ1bldlYktpdFB5VGVzdHMuCisgICAg ICAgIChSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVB5dGhv bjNUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVRlc3RzKTogUmVuYW1lZCB0byBXZWJLaXRQ eVRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzKTogTW92ZWQgZnJvbSBU ZXN0V2ViS2l0UHlUZXN0cy4KKyAgICAgICAgKFRlc3RXZWJLaXRQeVRlc3RzKTogTW92ZWQgdG8g VGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uM1Rl c3RzKTogQ29waWVkIGZyb20gVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorCiAyMDIwLTAxLTEw ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkF1dGhu XSBJbXBsZW1lbnQgU1BJIHRvIHRlbGwgVUkgY2xpZW50cyB0byBzZWxlY3QgYXNzZXJ0aW9uIHJl c3BvbnNlcwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFj dG9yaWVzLnB5CShyZXZpc2lvbiAyNTQ1MzMpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGZy b20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGMKICAgICAgICAgICAgICAgICAg ICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgSW5zdGFsbEd0a0Rl cGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywKICAg ICAgICAgICAgICAgICAgICBQcmludENvbmZpZ3VyYXRpb24sIFJ1bkFQSVRlc3RzLCBSdW5CaW5k aW5nc1Rlc3RzLCBSdW5CdWlsZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRib3RDaGVj a0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLAogICAgICAgICAgICAgICAgICAgIFJ1bkphdmFTY3Jp cHRDb3JlVGVzdHMsIFJ1bldlYktpdDFUZXN0cywgUnVuV2ViS2l0UGVybFRlc3RzLAotICAgICAg ICAgICAgICAgICAgIFJ1bldlYktpdFB5VGVzdHMsIFJ1bldlYktpdFRlc3RzLCBVcGRhdGVXb3Jr aW5nRGlyZWN0b3J5LCBWYWxpZGF0ZVBhdGNoKQorICAgICAgICAgICAgICAgICAgIFJ1bldlYktp dFB5UHl0aG9uMlRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cywgUnVuV2ViS2l0VGVzdHMs IFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CkBAIC04Nyw3ICs4Nyw4IEBAIGNsYXNzIFdlYktpdFBl cmxGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgV2ViS2l0UHlGYWN0b3J5KEZhY3RvcnkpOgogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRl Y3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXM9YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5PUZh bHNlLCBhZGRpdGlvbmFsQXJndW1lbnQ9YWRkaXRpb25hbEFyZ3VtZW50cywgY2hlY2tSZWxldmFu Y2U9VHJ1ZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAg ICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKCkpCisgICAgICAgIHNlbGYu YWRkU3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygpKQogCiAKIGNsYXNzIEJ1aWxkRmFjdG9y eShGYWN0b3J5KToKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0 b3JpZXNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU0NTMzKQorKysgVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtMTM0LDcgKzEzNCw4IEBAIGNsYXNzIFRlc3RUZXN0c0ZhY3RvcnkoVGVz dENhc2UpOgogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTb3Vy Y2UpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTcGVjaWZp Y1JldmlzaW9uKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkFwcGx5UGF0 Y2gpLAotICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUnVuV2ViS2l0UHlUZXN0 cyksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5SdW5XZWJLaXRQeVB5dGhv bjJUZXN0cyksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5SdW5XZWJLaXRQ eVB5dGhvbjNUZXN0cyksCiAgICAgICAgIF0pCiAKICAgICBkZWYgdGVzdF9zZXJ2aWNlc19mYWN0 b3J5KHNlbGYpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weQkocmV2aXNpb24gMjU0NTMzKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02OTMsMTcgKzY5MywxMiBAQCBjbGFzcyBS dW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnKHNoZWxsLlNoCiAgICAgICAgIHJldHVybiB7dSdzdGVw JzogdSdGYWlsZWQgYnVpbGRib3QgY2hlY2tjb25maWcnfQogCiAKLWNsYXNzIFJ1bldlYktpdFB5 VGVzdHMoc2hlbGwuU2hlbGxDb21tYW5kKToKLSAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzJwot ICAgIGRlc2NyaXB0aW9uID0gWyd3ZWJraXRweS10ZXN0cyBydW5uaW5nJ10KLSAgICBkZXNjcmlw dGlvbkRvbmUgPSBbJ3dlYmtpdHB5LXRlc3RzJ10KK2NsYXNzIFdlYktpdFB5VGVzdChzaGVsbC5T aGVsbENvbW1hbmQpOgorICAgIGxhbmd1YWdlID0gJ3B5dGhvbicKICAgICBmbHVua09uRmFpbHVy ZSA9IFRydWUKLSAgICBqc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9yZXN1bHRzLmpzb24n Ci0gICAgbG9nZmlsZXMgPSB7J2pzb24nOiBqc29uRmlsZU5hbWV9Ci0gICAgY29tbWFuZCA9IFsn cHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXsw fScuZm9ybWF0KGpzb25GaWxlTmFtZSldCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2Fy Z3MpOgotICAgICAgICBzdXBlcihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5fX2luaXRfXyh0aW1l b3V0PTIgKiA2MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisgICAgICAgIHN1cGVyKFdl YktpdFB5VGVzdCwgc2VsZikuX19pbml0X18odGltZW91dD0yICogNjAsIGxvZ0Vudmlyb249RmFs c2UsICoqa3dhcmdzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLmxvZ19v YnNlcnZlciA9IGxvZ29ic2VydmVyLkJ1ZmZlckxvZ09ic2VydmVyKCkKQEAgLTcxMiw4ICs3MDcs NyBAQCBjbGFzcyBSdW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxsQ29tbWFuCiAKICAgICBkZWYg Z2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1bHRzID09IFNVQ0NF U1M6Ci0gICAgICAgICAgICBtZXNzYWdlID0gJ1Bhc3NlZCB3ZWJraXRweSB0ZXN0cycKLSAgICAg ICAgICAgIHNlbGYuYnVpbGQuYnVpbGRGaW5pc2hlZChbbWVzc2FnZV0sIFNVQ0NFU1MpCisgICAg ICAgICAgICBtZXNzYWdlID0gJ1Bhc3NlZCB3ZWJraXRweSB7fSB0ZXN0cycuZm9ybWF0KHNlbGYu bGFuZ3VhZ2UpCiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHVuaWNvZGUobWVzc2FnZSl9 CiAKICAgICAgICAgbG9nTGluZXMgPSBzZWxmLmxvZ19vYnNlcnZlci5nZXRTdGRvdXQoKQpAQCAt NzIyLDE1ICs3MTYsMTQgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVsbENvbW1h bgogICAgICAgICAgICAgd2Via2l0cHlfcmVzdWx0cyA9IGpzb24ubG9hZHMoanNvbl90ZXh0KQog ICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGV4OgogICAgICAgICAgICAgc2VsZi5fYWRkVG9M b2coJ3N0ZGVycicsICdFUlJPUjogdW5hYmxlIHRvIHBhcnNlIGRhdGEsIGV4Y2VwdGlvbjoge30n LmZvcm1hdChleCkpCi0gICAgICAgICAgICByZXR1cm4gc3VwZXIoUnVuV2ViS2l0UHlUZXN0cywg c2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4gc3VwZXIoV2ViS2l0 UHlUZXN0LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogICAgICAgICBmYWlsdXJlcyA9IHdl YmtpdHB5X3Jlc3VsdHMuZ2V0KCdmYWlsdXJlcycpICsgd2Via2l0cHlfcmVzdWx0cy5nZXQoJ2Vy cm9ycycpCiAgICAgICAgIGlmIG5vdCBmYWlsdXJlczoKLSAgICAgICAgICAgIHJldHVybiBzdXBl cihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKyAgICAgICAgICAg IHJldHVybiBzdXBlcihXZWJLaXRQeVRlc3QsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQogICAg ICAgICBwbHVyYWxTdWZmaXggPSAncycgaWYgbGVuKGZhaWx1cmVzKSA+IDEgZWxzZSAnJwogICAg ICAgICBmYWlsdXJlc19zdHJpbmcgPSAnLCAnLmpvaW4oW2ZhaWx1cmUuZ2V0KCduYW1lJykucmVw bGFjZSgnd2Via2l0cHkuJywgJycpIGZvciBmYWlsdXJlIGluIGZhaWx1cmVzXSkKICAgICAgICAg bWVzc2FnZSA9ICdGb3VuZCB7fSBXZWJLaXRQeSB0ZXN0IGZhaWx1cmV7fToge30nLmZvcm1hdChs ZW4oZmFpbHVyZXMpLCBwbHVyYWxTdWZmaXgsIGZhaWx1cmVzX3N0cmluZykKLSAgICAgICAgc2Vs Zi5idWlsZC5idWlsZEZpbmlzaGVkKFttZXNzYWdlXSwgRkFJTFVSRSkKICAgICAgICAgcmV0dXJu IHt1J3N0ZXAnOiB1bmljb2RlKG1lc3NhZ2UpfQogCiAgICAgQGRlZmVyLmlubGluZUNhbGxiYWNr cwpAQCAtNzQyLDYgKzczNSwyNiBAQCBjbGFzcyBSdW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxs Q29tbWFuCiAgICAgICAgIGxvZy5hZGRTdGRvdXQobWVzc2FnZSkKIAogCitjbGFzcyBSdW5XZWJL aXRQeVB5dGhvbjJUZXN0cyhXZWJLaXRQeVRlc3QpOgorICAgIGxhbmd1YWdlID0gJ3B5dGhvbjIn CisgICAgbmFtZSA9ICd3ZWJraXRweS10ZXN0cy17fScuZm9ybWF0KGxhbmd1YWdlKQorICAgIGRl c2NyaXB0aW9uRG9uZSA9IFsnd2Via2l0cHktdGVzdHMnXQorICAgIGRlc2NyaXB0aW9uID0gWyd3 ZWJraXRweS10ZXN0cyBydW5uaW5nICh7fSknLmZvcm1hdChsYW5ndWFnZSldCisgICAganNvbkZp bGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3Rfe31fcmVzdWx0cy5qc29uJy5mb3JtYXQobGFuZ3VhZ2Up CisgICAgbG9nZmlsZXMgPSB7J2pzb24nOiBqc29uRmlsZU5hbWV9CisgICAgY29tbWFuZCA9IFsn cHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXsw fScuZm9ybWF0KGpzb25GaWxlTmFtZSldCisKKworY2xhc3MgUnVuV2ViS2l0UHlQeXRob24zVGVz dHMoV2ViS2l0UHlUZXN0KToKKyAgICBsYW5ndWFnZSA9ICdweXRob24zJworICAgIG5hbWUgPSAn d2Via2l0cHktdGVzdHMte30nLmZvcm1hdChsYW5ndWFnZSkKKyAgICBkZXNjcmlwdGlvbkRvbmUg PSBbJ3dlYmtpdHB5LXRlc3RzJ10KKyAgICBkZXNjcmlwdGlvbiA9IFsnd2Via2l0cHktdGVzdHMg cnVubmluZyAoe30pJy5mb3JtYXQobGFuZ3VhZ2UpXQorICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJr aXRweV90ZXN0X3t9X3Jlc3VsdHMuanNvbicuZm9ybWF0KGxhbmd1YWdlKQorICAgIGxvZ2ZpbGVz ID0geydqc29uJzoganNvbkZpbGVOYW1lfQorICAgIGNvbW1hbmQgPSBbJ3B5dGhvbjMnLCAnVG9v bHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNv bkZpbGVOYW1lKV0KKworCiBjbGFzcyBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxs Q29tbWFuZCk6CiAgICAgbmFtZSA9ICdqaGJ1aWxkJwogICAgIGRlc2NyaXB0aW9uID0gWyd1cGRh dGluZyBndGsgZGVwZW5kZW5jaWVzJ10KSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI1NDUzMykKKysr IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBAQCBmcm9tIHN0ZXBzIGltcG9ydCAoQW5hbHl6ZUFQ SVRlc3RzUmVzdWx0CiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIERv d25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlciwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFj dFRlc3RSZXN1bHRzLCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5kZW5j aWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJh dGlvbiwgUmVSdW5BUElUZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSZVJ1bldlYktp dFBlcmxUZXN0cywgUmVSdW5XZWJLaXRUZXN0cywgUnVuQVBJVGVzdHMsIFJ1bkFQSVRlc3RzV2l0 aG91dFBhdGNoLAogICAgICAgICAgICAgICAgICAgIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkJ1aWxk V2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0 VGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkpTQ1Rlc3RzV2l0aG91dFBhdGNoLCBS dW5XZWJLaXQxVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UGVybFRlc3RzLCBS dW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgUnVuV2ViS2l0VGVzdHNXaXRob3V0UGF0 Y2gsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBUcmFuc2ZlclRvUzMsIFVuQXBwbHlQ YXRjaElmUmVxdWlyZWQsCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UGVybFRlc3RzLCBS dW5XZWJLaXRQeVB5dGhvbjJUZXN0cywgUnVuV2ViS2l0UHlQeXRob24zVGVzdHMsIFJ1bldlYktp dFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhvdXRQYXRjaCwgVGVzdFdpdGhGYWlsdXJlQ291bnQs IFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZSZXF1aXJlZCwKICAgICAgICAg ICAgICAgICAgICBVcGRhdGVXb3JraW5nRGlyZWN0b3J5LCBVcGxvYWRCdWlsdFByb2R1Y3QsIFVw bG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0ZVBhdGNoKQogCiAjIFdvcmthcm91bmQgZm9yIGh0dHBz Oi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWlsZGJvdC9pc3N1ZXMvNDY2OQpAQCAtNDE5LDE3ICs0 MTksMTcgQEAgY2xhc3MgVGVzdFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhUZXN0UgogICAgICAg ICBzZWxmLnNldHVwU3RlcChSZVJ1bldlYktpdFBlcmxUZXN0cygpKQogCiAKLWNsYXNzIFRlc3RX ZWJLaXRQeVRlc3RzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6 CitjbGFzcyBUZXN0V2ViS2l0UHlQeXRob24yVGVzdHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMs IHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYu bG9uZ01lc3NhZ2UgPSBUcnVlCi0gICAgICAgIHNlbGYuanNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5 X3Rlc3RfcmVzdWx0cy5qc29uJworICAgICAgICBzZWxmLmpzb25GaWxlTmFtZSA9ICd3ZWJraXRw eV90ZXN0X3B5dGhvbjJfcmVzdWx0cy5qc29uJwogICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1 aWxkU3RlcCgpCiAKICAgICBkZWYgdGVhckRvd24oc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxm LnRlYXJEb3duQnVpbGRTdGVwKCkKIAogICAgIGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6Ci0gICAg ICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAgICAgc2VsZi5zZXR1 cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVzdHMoKSkKICAgICAgICAgc2VsZi5leHBlY3RSZW1v dGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAg ICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCkBAIC00MzksMTEgKzQzOSwx MSBAQCBjbGFzcyBUZXN0V2ViS2l0UHlUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkCiAgICAgICAgICAg ICAgICAgICAgICAgICApCiAgICAgICAgICAgICArIDAsCiAgICAgICAgICkKLSAgICAgICAgc2Vs Zi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J1Bhc3NlZCB3ZWJr aXRweSB0ZXN0cycpCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywg c3RhdGVfc3RyaW5nPSdQYXNzZWQgd2Via2l0cHkgcHl0aG9uMiB0ZXN0cycpCiAgICAgICAgIHJl dHVybiBzZWxmLnJ1blN0ZXAoKQogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKLSAgICAg ICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlUZXN0cygpKQorICAgICAgICBzZWxmLnNldHVw U3RlcChSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cygpKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKQEAgLTQ1OSw2ICs0NTksNDYg QEAgRkFJTEVEIChmYWlsdXJlcz0xLCBlcnJvcnM9MCknJycpCiAgICAgICAgIHJldHVybiBzZWxm LnJ1blN0ZXAoKQogCiAKK2NsYXNzIFRlc3RXZWJLaXRQeVB5dGhvbjNUZXN0cyhCdWlsZFN0ZXBN aXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToK KyAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUKKyAgICAgICAgc2VsZi5qc29uRmlsZU5h bWUgPSAnd2Via2l0cHlfdGVzdF9weXRob24zX3Jlc3VsdHMuanNvbicKKyAgICAgICAgcmV0dXJu IHNlbGYuc2V0VXBCdWlsZFN0ZXAoKQorCisgICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAg ICByZXR1cm4gc2VsZi50ZWFyRG93bkJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNz KHNlbGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygp KQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0 U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJv bj1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rv b2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNl bGYuanNvbkZpbGVOYW1lKV0sCisgICAgICAgICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pz b24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCisgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0 PTEyMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICsgMCwKKyAgICAg ICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0 cmluZz0nUGFzc2VkIHdlYmtpdHB5IHB5dGhvbjMgdGVzdHMnKQorICAgICAgICByZXR1cm4gc2Vs Zi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNlbGYu c2V0dXBTdGVwKFJ1bldlYktpdFB5UHl0aG9uM1Rlc3RzKCkpCisgICAgICAgIHNlbGYuZXhwZWN0 UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2Rpcics CisgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAorICAgICAgICAgICAg ICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtp dHB5JywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpXSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIGxvZ2ZpbGVzPXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1l fSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9MTIwLAorICAgICAgICAgICAgICAg ICAgICAgICAgKQorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0 PScnJ1JhbiAxNzQ0IHRlc3RzIGluIDUuOTEzcworRkFJTEVEIChmYWlsdXJlcz0xLCBlcnJvcnM9 MCknJycpCisgICAgICAgICAgICArIDIsCisgICAgICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RP dXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J3dlYmtpdHB5LXRlc3RzIChmYWls dXJlKScpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisKIGNsYXNzIFRlc3RSdW5F V1NCdWlsZGJvdENoZWNrQ29uZmlnKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLmxvbmdNZXNzYWdl ID0gVHJ1ZQo= 387718 2020-01-14 16:13:48 -0800 2020-01-14 17:32:43 -0800 Patch bug-206113-20200114161347.patch text/plain 11666 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDUzMykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTAxLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBFV1M6IFJ1biB3ZWJraXRweSB0ZXN0cyB3aXRoIFB5dGhvbiAyIGFuZCAz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDYxMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChXZWJLaXRQeUZh Y3RvcnkuX19pbml0X18pOiBSdW4gd2Via2l0cHkgdGVzdHMgaW4gUHl0aG9uIDIgYW5kIFB5dGhv biAzLgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0VGVzdHNGYWN0b3J5LnRlc3Rfd2Via2l0cHlfZmFjdG9y eSk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAg ICAgICAoV2ViS2l0UHlUZXN0KTogUmVuYW1lZCBmcm9tIFJ1bldlYktpdFB5VGVzdHMuCisgICAg ICAgIChSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVB5dGhv bjNUZXN0cyk6CisgICAgICAgIChSdW5XZWJLaXRQeVRlc3RzKTogUmVuYW1lZCB0byBXZWJLaXRQ eVRlc3QuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzKTogTW92ZWQgZnJvbSBU ZXN0V2ViS2l0UHlUZXN0cy4KKyAgICAgICAgKFRlc3RXZWJLaXRQeVRlc3RzKTogTW92ZWQgdG8g VGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorICAgICAgICAoVGVzdFdlYktpdFB5UHl0aG9uM1Rl c3RzKTogQ29waWVkIGZyb20gVGVzdFdlYktpdFB5UHl0aG9uMlRlc3RzLgorCiAyMDIwLTAxLTEw ICBKaWV3ZW4gVGFuICA8amlld2VuX3RhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkF1dGhu XSBJbXBsZW1lbnQgU1BJIHRvIHRlbGwgVUkgY2xpZW50cyB0byBzZWxlY3QgYXNzZXJ0aW9uIHJl c3BvbnNlcwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFj dG9yaWVzLnB5CShyZXZpc2lvbiAyNTQ1MzMpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3ICsyOSw3IEBAIGZy b20gc3RlcHMgaW1wb3J0IChBcHBseVBhdGNoLCBBcHBseVdhdGMKICAgICAgICAgICAgICAgICAg ICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgSW5zdGFsbEd0a0Rl cGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywgS2lsbE9sZFByb2Nlc3NlcywKICAg ICAgICAgICAgICAgICAgICBQcmludENvbmZpZ3VyYXRpb24sIFJ1bkFQSVRlc3RzLCBSdW5CaW5k aW5nc1Rlc3RzLCBSdW5CdWlsZFdlYktpdE9yZ1VuaXRUZXN0cywgUnVuRVdTQnVpbGRib3RDaGVj a0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLAogICAgICAgICAgICAgICAgICAgIFJ1bkphdmFTY3Jp cHRDb3JlVGVzdHMsIFJ1bldlYktpdDFUZXN0cywgUnVuV2ViS2l0UGVybFRlc3RzLAotICAgICAg ICAgICAgICAgICAgIFJ1bldlYktpdFB5VGVzdHMsIFJ1bldlYktpdFRlc3RzLCBVcGRhdGVXb3Jr aW5nRGlyZWN0b3J5LCBWYWxpZGF0ZVBhdGNoKQorICAgICAgICAgICAgICAgICAgIFJ1bldlYktp dFB5UHl0aG9uMlRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cywgUnVuV2ViS2l0VGVzdHMs IFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnksIFZhbGlkYXRlUGF0Y2gpCiAKIAogY2xhc3MgRmFjdG9y eShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CkBAIC04Nyw3ICs4Nyw4IEBAIGNsYXNzIFdlYktpdFBl cmxGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgV2ViS2l0UHlGYWN0b3J5KEZhY3RvcnkpOgogICAg IGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRl Y3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAg ICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtPXBsYXRmb3JtLCBjb25maWd1cmF0aW9u PWNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXM9YXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5PUZh bHNlLCBhZGRpdGlvbmFsQXJndW1lbnQ9YWRkaXRpb25hbEFyZ3VtZW50cywgY2hlY2tSZWxldmFu Y2U9VHJ1ZSkKLSAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5VGVzdHMoKSkKKyAgICAg ICAgc2VsZi5hZGRTdGVwKFJ1bldlYktpdFB5UHl0aG9uMlRlc3RzKCkpCisgICAgICAgIHNlbGYu YWRkU3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygpKQogCiAKIGNsYXNzIEJ1aWxkRmFjdG9y eShGYWN0b3J5KToKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0 b3JpZXNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv ZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkocmV2aXNpb24gMjU0NTMzKQorKysgVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtMTM0LDcgKzEzNCw4IEBAIGNsYXNzIFRlc3RUZXN0c0ZhY3RvcnkoVGVz dENhc2UpOgogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTb3Vy Y2UpLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuQ2hlY2tPdXRTcGVjaWZp Y1JldmlzaW9uKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkFwcGx5UGF0 Y2gpLAotICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUnVuV2ViS2l0UHlUZXN0 cyksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5SdW5XZWJLaXRQeVB5dGhv bjJUZXN0cyksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5SdW5XZWJLaXRQ eVB5dGhvbjNUZXN0cyksCiAgICAgICAgIF0pCiAKICAgICBkZWYgdGVzdF9zZXJ2aWNlc19mYWN0 b3J5KHNlbGYpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVw cy5weQkocmV2aXNpb24gMjU0NTMzKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC02OTMsMTcgKzY5MywxMyBAQCBjbGFzcyBS dW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnKHNoZWxsLlNoCiAgICAgICAgIHJldHVybiB7dSdzdGVw JzogdSdGYWlsZWQgYnVpbGRib3QgY2hlY2tjb25maWcnfQogCiAKLWNsYXNzIFJ1bldlYktpdFB5 VGVzdHMoc2hlbGwuU2hlbGxDb21tYW5kKToKLSAgICBuYW1lID0gJ3dlYmtpdHB5LXRlc3RzJwot ICAgIGRlc2NyaXB0aW9uID0gWyd3ZWJraXRweS10ZXN0cyBydW5uaW5nJ10KK2NsYXNzIFdlYktp dFB5VGVzdChzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIGxhbmd1YWdlID0gJ3B5dGhvbicKICAg ICBkZXNjcmlwdGlvbkRvbmUgPSBbJ3dlYmtpdHB5LXRlc3RzJ10KICAgICBmbHVua09uRmFpbHVy ZSA9IFRydWUKLSAgICBqc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9yZXN1bHRzLmpzb24n Ci0gICAgbG9nZmlsZXMgPSB7J2pzb24nOiBqc29uRmlsZU5hbWV9Ci0gICAgY29tbWFuZCA9IFsn cHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICctLWpzb24tb3V0cHV0PXsw fScuZm9ybWF0KGpzb25GaWxlTmFtZSldCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2Fy Z3MpOgotICAgICAgICBzdXBlcihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5fX2luaXRfXyh0aW1l b3V0PTIgKiA2MCwgbG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCisgICAgICAgIHN1cGVyKFdl YktpdFB5VGVzdCwgc2VsZikuX19pbml0X18odGltZW91dD0yICogNjAsIGxvZ0Vudmlyb249RmFs c2UsICoqa3dhcmdzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLmxvZ19v YnNlcnZlciA9IGxvZ29ic2VydmVyLkJ1ZmZlckxvZ09ic2VydmVyKCkKQEAgLTcxMiw4ICs3MDgs NyBAQCBjbGFzcyBSdW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxsQ29tbWFuCiAKICAgICBkZWYg Z2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1bHRzID09IFNVQ0NF U1M6Ci0gICAgICAgICAgICBtZXNzYWdlID0gJ1Bhc3NlZCB3ZWJraXRweSB0ZXN0cycKLSAgICAg ICAgICAgIHNlbGYuYnVpbGQuYnVpbGRGaW5pc2hlZChbbWVzc2FnZV0sIFNVQ0NFU1MpCisgICAg ICAgICAgICBtZXNzYWdlID0gJ1Bhc3NlZCB3ZWJraXRweSB7fSB0ZXN0cycuZm9ybWF0KHNlbGYu bGFuZ3VhZ2UpCiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHVuaWNvZGUobWVzc2FnZSl9 CiAKICAgICAgICAgbG9nTGluZXMgPSBzZWxmLmxvZ19vYnNlcnZlci5nZXRTdGRvdXQoKQpAQCAt NzIyLDE1ICs3MTcsMTQgQEAgY2xhc3MgUnVuV2ViS2l0UHlUZXN0cyhzaGVsbC5TaGVsbENvbW1h bgogICAgICAgICAgICAgd2Via2l0cHlfcmVzdWx0cyA9IGpzb24ubG9hZHMoanNvbl90ZXh0KQog ICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGV4OgogICAgICAgICAgICAgc2VsZi5fYWRkVG9M b2coJ3N0ZGVycicsICdFUlJPUjogdW5hYmxlIHRvIHBhcnNlIGRhdGEsIGV4Y2VwdGlvbjoge30n LmZvcm1hdChleCkpCi0gICAgICAgICAgICByZXR1cm4gc3VwZXIoUnVuV2ViS2l0UHlUZXN0cywg c2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4gc3VwZXIoV2ViS2l0 UHlUZXN0LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogICAgICAgICBmYWlsdXJlcyA9IHdl YmtpdHB5X3Jlc3VsdHMuZ2V0KCdmYWlsdXJlcycpICsgd2Via2l0cHlfcmVzdWx0cy5nZXQoJ2Vy cm9ycycpCiAgICAgICAgIGlmIG5vdCBmYWlsdXJlczoKLSAgICAgICAgICAgIHJldHVybiBzdXBl cihSdW5XZWJLaXRQeVRlc3RzLCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKyAgICAgICAgICAg IHJldHVybiBzdXBlcihXZWJLaXRQeVRlc3QsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQogICAg ICAgICBwbHVyYWxTdWZmaXggPSAncycgaWYgbGVuKGZhaWx1cmVzKSA+IDEgZWxzZSAnJwogICAg ICAgICBmYWlsdXJlc19zdHJpbmcgPSAnLCAnLmpvaW4oW2ZhaWx1cmUuZ2V0KCduYW1lJykucmVw bGFjZSgnd2Via2l0cHkuJywgJycpIGZvciBmYWlsdXJlIGluIGZhaWx1cmVzXSkKICAgICAgICAg bWVzc2FnZSA9ICdGb3VuZCB7fSBXZWJLaXRQeSB0ZXN0IGZhaWx1cmV7fToge30nLmZvcm1hdChs ZW4oZmFpbHVyZXMpLCBwbHVyYWxTdWZmaXgsIGZhaWx1cmVzX3N0cmluZykKLSAgICAgICAgc2Vs Zi5idWlsZC5idWlsZEZpbmlzaGVkKFttZXNzYWdlXSwgRkFJTFVSRSkKICAgICAgICAgcmV0dXJu IHt1J3N0ZXAnOiB1bmljb2RlKG1lc3NhZ2UpfQogCiAgICAgQGRlZmVyLmlubGluZUNhbGxiYWNr cwpAQCAtNzQyLDYgKzczNiwyNCBAQCBjbGFzcyBSdW5XZWJLaXRQeVRlc3RzKHNoZWxsLlNoZWxs Q29tbWFuCiAgICAgICAgIGxvZy5hZGRTdGRvdXQobWVzc2FnZSkKIAogCitjbGFzcyBSdW5XZWJL aXRQeVB5dGhvbjJUZXN0cyhXZWJLaXRQeVRlc3QpOgorICAgIGxhbmd1YWdlID0gJ3B5dGhvbjIn CisgICAgbmFtZSA9ICd3ZWJraXRweS10ZXN0cy17fScuZm9ybWF0KGxhbmd1YWdlKQorICAgIGRl c2NyaXB0aW9uID0gWyd3ZWJraXRweS10ZXN0cyBydW5uaW5nICh7fSknLmZvcm1hdChsYW5ndWFn ZSldCisgICAganNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3Rfe31fcmVzdWx0cy5qc29uJy5m b3JtYXQobGFuZ3VhZ2UpCisgICAgbG9nZmlsZXMgPSB7J2pzb24nOiBqc29uRmlsZU5hbWV9Cisg ICAgY29tbWFuZCA9IFsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScsICct LWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxlTmFtZSldCisKKworY2xhc3MgUnVuV2Vi S2l0UHlQeXRob24zVGVzdHMoV2ViS2l0UHlUZXN0KToKKyAgICBsYW5ndWFnZSA9ICdweXRob24z JworICAgIG5hbWUgPSAnd2Via2l0cHktdGVzdHMte30nLmZvcm1hdChsYW5ndWFnZSkKKyAgICBk ZXNjcmlwdGlvbiA9IFsnd2Via2l0cHktdGVzdHMgcnVubmluZyAoe30pJy5mb3JtYXQobGFuZ3Vh Z2UpXQorICAgIGpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90ZXN0X3t9X3Jlc3VsdHMuanNvbicu Zm9ybWF0KGxhbmd1YWdlKQorICAgIGxvZ2ZpbGVzID0geydqc29uJzoganNvbkZpbGVOYW1lfQor ICAgIGNvbW1hbmQgPSBbJ3B5dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5Jywg Jy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKV0KKworCiBjbGFzcyBJbnN0 YWxsR3RrRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgbmFtZSA9ICdqaGJ1 aWxkJwogICAgIGRlc2NyaXB0aW9uID0gWyd1cGRhdGluZyBndGsgZGVwZW5kZW5jaWVzJ10KSW5k ZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5p dHRlc3QucHkJKHJldmlzaW9uIDI1NDUzMykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDAsNyArNDAsNyBA QCBmcm9tIHN0ZXBzIGltcG9ydCAoQW5hbHl6ZUFQSVRlc3RzUmVzdWx0CiAgICAgICAgICAgICAg ICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rl ciwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBJbnN0YWxsR3RrRGVw ZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJvY2Vzc2VzLAogICAg ICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwgUmVSdW5BUElUZXN0cywgUmVSdW5K YXZhU2NyaXB0Q29yZVRlc3RzLCBSZVJ1bldlYktpdFBlcmxUZXN0cywgUmVSdW5XZWJLaXRUZXN0 cywgUnVuQVBJVGVzdHMsIFJ1bkFQSVRlc3RzV2l0aG91dFBhdGNoLAogICAgICAgICAgICAgICAg ICAgIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkJ1aWxkV2ViS2l0T3JnVW5pdFRlc3RzLCBSdW5FV1NC dWlsZGJvdENoZWNrQ29uZmlnLCBSdW5FV1NVbml0VGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVz dHMsIFJ1bkpTQ1Rlc3RzV2l0aG91dFBhdGNoLCBSdW5XZWJLaXQxVGVzdHMsCi0gICAgICAgICAg ICAgICAgICAgUnVuV2ViS2l0UGVybFRlc3RzLCBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRU ZXN0cywgUnVuV2ViS2l0VGVzdHNXaXRob3V0UGF0Y2gsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBU cmlnZ2VyLCBUcmFuc2ZlclRvUzMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCisgICAgICAgICAg ICAgICAgICAgUnVuV2ViS2l0UGVybFRlc3RzLCBSdW5XZWJLaXRQeVB5dGhvbjJUZXN0cywgUnVu V2ViS2l0UHlQeXRob24zVGVzdHMsIFJ1bldlYktpdFRlc3RzLCBSdW5XZWJLaXRUZXN0c1dpdGhv dXRQYXRjaCwgVGVzdFdpdGhGYWlsdXJlQ291bnQsIFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5B cHBseVBhdGNoSWZSZXF1aXJlZCwKICAgICAgICAgICAgICAgICAgICBVcGRhdGVXb3JraW5nRGly ZWN0b3J5LCBVcGxvYWRCdWlsdFByb2R1Y3QsIFVwbG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0ZVBh dGNoKQogCiAjIFdvcmthcm91bmQgZm9yIGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9idWls ZGJvdC9pc3N1ZXMvNDY2OQpAQCAtNDE5LDE3ICs0MTksMTcgQEAgY2xhc3MgVGVzdFJlUnVuSmF2 YVNjcmlwdENvcmVUZXN0cyhUZXN0UgogICAgICAgICBzZWxmLnNldHVwU3RlcChSZVJ1bldlYktp dFBlcmxUZXN0cygpKQogCiAKLWNsYXNzIFRlc3RXZWJLaXRQeVRlc3RzKEJ1aWxkU3RlcE1peGlu QWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CitjbGFzcyBUZXN0V2ViS2l0UHlQeXRob24y VGVzdHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBk ZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYubG9uZ01lc3NhZ2UgPSBUcnVlCi0gICAgICAg IHNlbGYuanNvbkZpbGVOYW1lID0gJ3dlYmtpdHB5X3Rlc3RfcmVzdWx0cy5qc29uJworICAgICAg ICBzZWxmLmpzb25GaWxlTmFtZSA9ICd3ZWJraXRweV90ZXN0X3B5dGhvbjJfcmVzdWx0cy5qc29u JwogICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCiAKICAgICBkZWYgdGVhckRv d24oc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKIAogICAg IGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktp dFB5VGVzdHMoKSkKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0UHlQeXRob24yVGVz dHMoKSkKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4 cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vu dmlyb249RmFsc2UsCkBAIC00MzksMTEgKzQzOSwxMSBAQCBjbGFzcyBUZXN0V2ViS2l0UHlUZXN0 cyhCdWlsZFN0ZXBNaXhpbkFkCiAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAg ICArIDAsCiAgICAgICAgICkKLSAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUND RVNTLCBzdGF0ZV9zdHJpbmc9J1Bhc3NlZCB3ZWJraXRweSB0ZXN0cycpCisgICAgICAgIHNlbGYu ZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdQYXNzZWQgd2Via2l0 cHkgcHl0aG9uMiB0ZXN0cycpCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAgICAg ZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKLSAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUnVuV2ViS2l0 UHlUZXN0cygpKQorICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5XZWJLaXRQeVB5dGhvbjJUZXN0 cygpKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhw ZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52 aXJvbj1GYWxzZSwKQEAgLTQ1OSw2ICs0NTksNDYgQEAgRkFJTEVEIChmYWlsdXJlcz0xLCBlcnJv cnM9MCknJycpCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAKK2NsYXNzIFRlc3RX ZWJLaXRQeVB5dGhvbjNUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVz dENhc2UpOgorICAgIGRlZiBzZXRVcChzZWxmKToKKyAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9 IFRydWUKKyAgICAgICAgc2VsZi5qc29uRmlsZU5hbWUgPSAnd2Via2l0cHlfdGVzdF9weXRob24z X3Jlc3VsdHMuanNvbicKKyAgICAgICAgcmV0dXJuIHNlbGYuc2V0VXBCdWlsZFN0ZXAoKQorCisg ICAgZGVmIHRlYXJEb3duKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi50ZWFyRG93bkJ1aWxk U3RlcCgpCisKKyAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgorICAgICAgICBzZWxmLnNldHVw U3RlcChSdW5XZWJLaXRQeVB5dGhvbjNUZXN0cygpKQorICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAorICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvdGVzdC13ZWJraXRweScs ICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKV0sCisgICAgICAg ICAgICAgICAgICAgICAgICBsb2dmaWxlcz17J2pzb24nOiBzZWxmLmpzb25GaWxlTmFtZX0sCisg ICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTEyMCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICkKKyAgICAgICAgICAgICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91 dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nUGFzc2VkIHdlYmtpdHB5IHB5dGhv bjMgdGVzdHMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0 X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bldlYktpdFB5UHl0aG9u M1Rlc3RzKCkpCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAg ICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgICAgICAgICBs b2dFbnZpcm9uPUZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhv bjMnLCAnVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHB5JywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5m b3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpXSwKKyAgICAgICAgICAgICAgICAgICAgICAgIGxvZ2Zp bGVzPXsnanNvbic6IHNlbGYuanNvbkZpbGVOYW1lfSwKKyAgICAgICAgICAgICAgICAgICAgICAg IHRpbWVvdXQ9MTIwLAorICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgKyBF eHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScnJ1JhbiAxNzQ0IHRlc3RzIGluIDUuOTEz cworRkFJTEVEIChmYWlsdXJlcz0xLCBlcnJvcnM9MCknJycpCisgICAgICAgICAgICArIDIsCisg ICAgICAgICkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0 ZV9zdHJpbmc9J3dlYmtpdHB5LXRlc3RzIChmYWlsdXJlKScpCisgICAgICAgIHJldHVybiBzZWxm LnJ1blN0ZXAoKQorCisKIGNsYXNzIFRlc3RSdW5FV1NCdWlsZGJvdENoZWNrQ29uZmlnKEJ1aWxk U3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNl bGYpOgogICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQo=