202170 2019-09-24 14:02:21 -0700 [EWS] JSC queues should dynamically add required build steps for re-testing the patch 2019-09-25 11:36:19 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=201999 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue jbedard webkit-bug-importer oldest_to_newest 1573820 0 aakash_jain 2019-09-24 14:02:21 -0700 JSC queues should dynamically add required build steps for re-testing the patch, just like rest other queues (like API, webkitpy, layout tests) does. 1573835 1 379493 aakash_jain 2019-09-24 14:32:59 -0700 Created attachment 379493 Patch 1573848 2 aakash_jain 2019-09-24 14:42:53 -0700 Sample runs: Success: https://ews-build.webkit-uat.org/#/builders/17/builds/4056 Failures in JSC-tests: https://ews-build.webkit-uat.org/#/builders/17/builds/4105 Failures in both JSC-tests and Rerun: https://ews-build.webkit-uat.org/#/builders/17/builds/4099 1574088 3 379493 jbedard 2019-09-25 09:55:01 -0700 Comment on attachment 379493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379493&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:839 > + rc = shell.Test.evaluateCommand(self, cmd) Any reason we aren't using super(...) here? > Tools/BuildSlaveSupport/ews-build/steps.py:854 > + rc = shell.Test.evaluateCommand(self, cmd) Again, why move away from super(...)? 1574105 4 379493 aakash_jain 2019-09-25 10:38:39 -0700 Comment on attachment 379493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379493&action=review >> Tools/BuildSlaveSupport/ews-build/steps.py:839 >> + rc = shell.Test.evaluateCommand(self, cmd) > > Any reason we aren't using super(...) here? To avoid the style warning: "ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:838: [RunJavaScriptCoreTests.evaluateCommand] Use of super on an old style class [pylint/E1002] [5]" >> Tools/BuildSlaveSupport/ews-build/steps.py:854 >> + rc = shell.Test.evaluateCommand(self, cmd) > > Again, why move away from super(...)? In this case we can't use super(ReRunJavaScriptCoreTests) since this method in super-class (which is RunJavaScriptCoreTests) dynamically adds different build step. We explicitly want to use evaluateCommand() from shell.Test. This is similar to what we do in other similar step like: ReRunAPITests(). We can explicitly use super(RunJavaScriptCoreTests), but that would be confusing. 1574108 5 379493 jbedard 2019-09-25 10:42:34 -0700 Comment on attachment 379493 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379493&action=review >>> Tools/BuildSlaveSupport/ews-build/steps.py:839 >>> + rc = shell.Test.evaluateCommand(self, cmd) >> >> Any reason we aren't using super(...) here? > > To avoid the style warning: "ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:838: [RunJavaScriptCoreTests.evaluateCommand] Use of super on an old style class [pylint/E1002] [5]" Ah, shell.Test is an old style class. 1574132 6 379493 commit-queue 2019-09-25 11:35:19 -0700 Comment on attachment 379493 Patch Clearing flags on attachment: 379493 Committed r250350: <https://trac.webkit.org/changeset/250350> 1574133 7 commit-queue 2019-09-25 11:35:21 -0700 All reviewed patches have been landed. Closing bug. 1574134 8 webkit-bug-importer 2019-09-25 11:36:19 -0700 <rdar://problem/55712225> 379493 2019-09-24 14:32:59 -0700 2019-09-25 11:35:19 -0700 Patch bug-202170-20190924173258.patch text/plain 11454 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDMxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDE5LTA5LTI0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbRVdTXSBKU0MgcXVldWVzIHNob3VsZCBkeW5hbWljYWxseSBhZGQgcmVx dWlyZWQgYnVpbGQgc3RlcHMgZm9yIHJlLXRlc3RpbmcgdGhlIHBhdGNoCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIxNzAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHk6CisgICAgICAgIChKU0NUZXN0c0ZhY3RvcnkuX19pbml0X18p OiBEbyBub3QgYWRkIFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cyBhbmQgcmVsYXRlZCBzdGVwcyBo ZXJlLCBhcworICAgICAgICB0aGVzZSBhcmUgZHluYW1pY2FsbHkgYWRkZWQgKGlmIHJlcXVpcmVk KSBpbiBzdGVwcy5weS4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHk6CisgICAgICAgIChDb21waWxlSlNDVG9UKTogUmVtb3ZlIGRvU3RlcElmKCkgYW5kIGhp ZGVTdGVwSWYoKSBtZXRob2QsIHRoZXNlIGFyZSBubyBsb25nZXIgcmVxdWlyZWQgYXMgd2UgYWRk CisgICAgICAgIHRoaXMgc3RlcCBkeW5hbWljYWxseSBvbmx5IGlmIHJlcXVpcmVkLiBXZSBkb24n dCBuZWVkIGFuIGV4dHJhIHByb3BlcnR5ICgncGF0Y2hGYWlsZWRUb0J1aWxkJykgdG8gYmUgc2V0 LgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cy5ldmFsdWF0ZUNvbW1hbmQpOiBEeW5h bWljYWxseSBhZGQgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzIHN0ZXAgaWYgcmVxdWlyZWQuCisg ICAgICAgIChSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMpOiBSZW1vdmVkIGRvU3RlcElmKCkgYW5k IGhpZGVTdGVwSWYoKSBtZXRob2QuCisgICAgICAgIChSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMu ZXZhbHVhdGVDb21tYW5kKTogRHluYW1pY2FsbHkgYWRkIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQo KSwgQ29tcGlsZUpTQ1RvVCgpIGFuZCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9UIHN0ZXBzLgor ICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVC5ldmFsdWF0ZUNvbW1hbmQpOiBPdmVy cmlkZW4gdG8gYXZvaWQgY2FsaW5nIHRoZSBiYXNlLWNsYXNzIG1ldGhvZCB3aGljaCBkeW5hbWlj YWxseSBhZGRzCisgICAgICAgIG1vcmUgc3RlcHMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBVcGRhdGVkIHVuaXQtdGVzdHMgYWNjb3Jk aW5nbHkuCisKIDIwMTktMDktMjQgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgog CiAgICAgICAgIENvYWxlc2NlIG9yIHJlbW92ZSBQTEFURk9STShNQUMpIHx8IFBMQVRGT1JNKElP U19GQU1JTFkpCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9y aWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9m YWN0b3JpZXMucHkJKHJldmlzaW9uIDI1MDMxNykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDkgKzI3LDkgQEAg ZnJvbSBidWlsZGJvdC5zdGVwcyBpbXBvcnQgdHJpZ2dlcgogZnJvbSBzdGVwcyBpbXBvcnQgKEFw cGx5UGF0Y2gsIEFwcGx5V2F0Y2hMaXN0LCBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZp Y1JldmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLAogICAgICAgICAgICAgICAgICAgIENoZWNr U3R5bGUsIENvbXBpbGVKU0MsIENvbXBpbGVXZWJLaXQsIENvbmZpZ3VyZUJ1aWxkLAogICAgICAg ICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQcm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBJ bnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLCBLaWxsT2xkUHJv Y2Vzc2VzLAotICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwgUmVSdW5KYXZh U2NyaXB0Q29yZVRlc3RzLCBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NUZXN0cywgUnVuRVdTQnVp bGRib3RDaGVja0NvbmZpZywgUnVuRVdTVW5pdFRlc3RzLAotICAgICAgICAgICAgICAgICAgIFJ1 bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QsIFJ1bldlYktp dDFUZXN0cywgUnVuV2ViS2l0UGVybFRlc3RzLAotICAgICAgICAgICAgICAgICAgIFJ1bldlYktp dFB5VGVzdHMsIFJ1bldlYktpdFRlc3RzLCBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkLCBVcGRhdGVX b3JraW5nRGlyZWN0b3J5LCBWYWxpZGF0ZVBhdGNoKQorICAgICAgICAgICAgICAgICAgIFByaW50 Q29uZmlndXJhdGlvbiwgUnVuQVBJVGVzdHMsIFJ1bkJpbmRpbmdzVGVzdHMsIFJ1bkVXU0J1aWxk Ym90Q2hlY2tDb25maWcsIFJ1bkVXU1VuaXRUZXN0cywKKyAgICAgICAgICAgICAgICAgICBSdW5K YXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5XZWJLaXQxVGVzdHMsIFJ1bldlYktpdFBlcmxUZXN0cywK KyAgICAgICAgICAgICAgICAgICBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgVXBk YXRlV29ya2luZ0RpcmVjdG9yeSwgVmFsaWRhdGVQYXRjaCkKIAogCiBjbGFzcyBGYWN0b3J5KGZh Y3RvcnkuQnVpbGRGYWN0b3J5KToKQEAgLTEyMCw5ICsxMjAsNiBAQCBjbGFzcyBKU0NUZXN0c0Zh Y3RvcnkoRmFjdG9yeSk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0s IGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRz LCBjaGVja1JlbGV2YW5jZT1UcnVlKQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZUpTQyhz a2lwVXBsb2FkPVRydWUpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuSmF2YVNjcmlwdENvcmVU ZXN0cygpKQotICAgICAgICBzZWxmLmFkZFN0ZXAoUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkp Ci0gICAgICAgIHNlbGYuYWRkU3RlcChVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKCkpCi0gICAgICAg IHNlbGYuYWRkU3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9UKCkpCiAKIAogY2xhc3MgQVBJ VGVzdHNGYWN0b3J5KFRlc3RGYWN0b3J5KToKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI1MDMxNykKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtODE4LDEyICs4 MTgsNiBAQCBjbGFzcyBDb21waWxlSlNDKENvbXBpbGVXZWJLaXQpOgogY2xhc3MgQ29tcGlsZUpT Q1RvVChDb21waWxlSlNDKToKICAgICBuYW1lID0gJ2NvbXBpbGUtanNjLXRvdCcKIAotICAgIGRl ZiBkb1N0ZXBJZihzZWxmLCBzdGVwKToKLSAgICAgICAgcmV0dXJuIHNlbGYuZ2V0UHJvcGVydHko J3BhdGNoRmFpbGVkVG9CdWlsZCcpCi0KLSAgICBkZWYgaGlkZVN0ZXBJZihzZWxmLCByZXN1bHRz LCBzdGVwKToKLSAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElmKHN0ZXApCi0KICAgICBk ZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6CiAgICAgICAgIHJldHVybiBzaGVsbC5Db21w aWxlLmV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpCiAKQEAgLTg0MiwyNCArODM2LDMxIEBAIGNs YXNzIFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoc2hlbGwuVGVzdCkKICAgICAgICAgcmV0dXJuIHNo ZWxsLlRlc3Quc3RhcnQoc2VsZikKIAogICAgIGRlZiBldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21k KToKLSAgICAgICAgaWYgY21kLmRpZEZhaWwoKToKLSAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ3BhdGNoRmFpbGVkVGVzdHMnLCBUcnVlKQotCi0gICAgICAgIHJldHVybiBzdXBlcihSdW5K YXZhU2NyaXB0Q29yZVRlc3RzLCBzZWxmKS5ldmFsdWF0ZUNvbW1hbmQoY21kKQorICAgICAgICBy YyA9IHNoZWxsLlRlc3QuZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCkKKyAgICAgICAgaWYgcmMg PT0gU1VDQ0VTUyBvciByYyA9PSBXQVJOSU5HUzoKKyAgICAgICAgICAgIG1lc3NhZ2UgPSAnUGFz c2VkIEpTQyB0ZXN0cycKKyAgICAgICAgICAgIHNlbGYuZGVzY3JpcHRpb25Eb25lID0gbWVzc2Fn ZQorICAgICAgICAgICAgc2VsZi5idWlsZC5yZXN1bHRzID0gU1VDQ0VTUworICAgICAgICAgICAg c2VsZi5idWlsZC5idWlsZEZpbmlzaGVkKFttZXNzYWdlXSwgU1VDQ0VTUykKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtSZVJ1 bkphdmFTY3JpcHRDb3JlVGVzdHMoKV0pCisgICAgICAgIHJldHVybiByYwogCiAKIGNsYXNzIFJl UnVuSmF2YVNjcmlwdENvcmVUZXN0cyhSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKToKICAgICBuYW1l ID0gJ2pzY29yZS10ZXN0LXJlcnVuJwogCi0gICAgZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXApOgot ICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycpCi0KLSAg ICBkZWYgaGlkZVN0ZXBJZihzZWxmLCByZXN1bHRzLCBzdGVwKToKLSAgICAgICAgcmV0dXJuIG5v dCBzZWxmLmRvU3RlcElmKHN0ZXApCi0KICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNt ZCk6Ci0gICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkVGVzdHMnLCBjbWQuZGlk RmFpbCgpKQotICAgICAgICByZXR1cm4gc3VwZXIoUnVuSmF2YVNjcmlwdENvcmVUZXN0cywgc2Vs ZikuZXZhbHVhdGVDb21tYW5kKGNtZCkKKyAgICAgICAgcmMgPSBzaGVsbC5UZXN0LmV2YWx1YXRl Q29tbWFuZChzZWxmLCBjbWQpCisgICAgICAgIGlmIHJjID09IFNVQ0NFU1Mgb3IgcmMgPT0gV0FS TklOR1M6CisgICAgICAgICAgICBtZXNzYWdlID0gJ1Bhc3NlZCBKU0MgdGVzdHMnCisgICAgICAg ICAgICBzZWxmLmRlc2NyaXB0aW9uRG9uZSA9IG1lc3NhZ2UKKyAgICAgICAgICAgIHNlbGYuYnVp bGQucmVzdWx0cyA9IFNVQ0NFU1MKKyAgICAgICAgICAgIHNlbGYuYnVpbGQuYnVpbGRGaW5pc2hl ZChbbWVzc2FnZV0sIFNVQ0NFU1MpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgVHJ1ZSkKKyAgICAgICAgICAgIHNlbGYuYnVp bGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKCksIENv bXBpbGVKU0NUb1QoKSwgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCgpXSkKKyAgICAgICAgcmV0 dXJuIHJjCiAKIAogY2xhc3MgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVChSdW5KYXZhU2NyaXB0 Q29yZVRlc3RzKToKQEAgLTg2NywxMSArODY4LDggQEAgY2xhc3MgUnVuSmF2YVNjcmlwdENvcmVU ZXN0c1RvVChSdW5KYXZhUwogICAgIGpzb25GaWxlTmFtZSA9ICdqc2NfcmVzdWx0cy5qc29uJwog ICAgIGNvbW1hbmQgPSBbJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMnLCAnLS1uby1mYWlsLWZhc3QnLCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChqc29u RmlsZU5hbWUpLCBXaXRoUHJvcGVydGllcygnLS0lKGNvbmZpZ3VyYXRpb24pcycpXQogCi0gICAg ZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXApOgotICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0 eSgncGF0Y2hGYWlsZWRUZXN0cycpCi0KLSAgICBkZWYgaGlkZVN0ZXBJZihzZWxmLCByZXN1bHRz LCBzdGVwKToKLSAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElmKHN0ZXApCisgICAgZGVm IGV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpOgorICAgICAgICByZXR1cm4gc2hlbGwuVGVzdC5l dmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKQogCiAKIGNsYXNzIENsZWFuQnVpbGQoc2hlbGwuQ29t cGlsZSk6CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTAzMTcpCisrKyBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTkx MSw3ICs5MTEsNiBAQCBjbGFzcyBUZXN0Q29tcGlsZUpTQ1RvVChCdWlsZFN0ZXBNaXhpbkFkCiAg ICAgICAgIHNlbGYuc2V0dXBTdGVwKENvbXBpbGVKU0NUb1QoKSkKICAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1vbmx5JykKICAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCi0gICAgICAgIHNlbGYuc2V0UHJvcGVydHko J3BhdGNoRmFpbGVkVG9CdWlsZCcsICdUcnVlJykKICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVD b21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAg ICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCkBAIC05MjMsMTQgKzkyMiw2IEBA IGNsYXNzIFRlc3RDb21waWxlSlNDVG9UKEJ1aWxkU3RlcE1peGluQWQKICAgICAgICAgc2VsZi5l eHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J0NvbXBpbGVkIEpTQyAo ZmFpbHVyZSknKQogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAotICAgIGRlZiB0ZXN0 X3NraXAoc2VsZik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKENvbXBpbGVKU0NUb1QoKSkKLSAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1vbmx5JykKLSAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCi0gICAgICAgIHNl bGYuZXhwZWN0SGlkZGVuKFRydWUpCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 U0tJUFBFRCwgc3RhdGVfc3RyaW5nPSdDb21waWxlZCBKU0MgKHNraXBwZWQpJykKLSAgICAgICAg cmV0dXJuIHNlbGYucnVuU3RlcCgpCi0KIAogY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVz dHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYg c2V0VXAoc2VsZik6CkBAIC05NTIsNyArOTQzLDcgQEAgY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRD b3JlVGVzdHMoQnVpbGRTdAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAg KyAwLAogICAgICAgICApCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VT Uywgc3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMnKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNv bWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nUGFzc2VkIEpTQyB0ZXN0cycpCiAgICAg ICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToK QEAgLTk4NCw3ICs5NzUsNiBAQCBjbGFzcyBUZXN0UmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKEJ1 aWxkCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cygpKQog ICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnanNjLW9ubHknKQogICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVhc2UnKQotICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBz ZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rp cj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9v bHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5v LWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1l KSwgJy0tcmVsZWFzZSddLApAQCAtOTkyLDE0ICs5ODIsMTMgQEAgY2xhc3MgVGVzdFJlUnVuSmF2 YVNjcmlwdENvcmVUZXN0cyhCdWlsZAogICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAg ICAgICAgKyAwLAogICAgICAgICApCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMnKQorICAgICAgICBzZWxmLmV4cGVj dE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nUGFzc2VkIEpTQyB0ZXN0cycp CiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShz ZWxmKToKICAgICAgICAgc2VsZi5zZXR1cFN0ZXAoUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkp CiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCiAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBz ZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rp cj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9v bHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5v LWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1l KSwgJy0tZGVidWcnXSwKQEAgLTEwMTEsMTQgKzEwMDAsNiBAQCBjbGFzcyBUZXN0UmVSdW5KYXZh U2NyaXB0Q29yZVRlc3RzKEJ1aWxkCiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMgKGZhaWx1cmUpJykKICAgICAgICAg cmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKLSAgICBkZWYgdGVzdF9za2lwKHNlbGYpOgotICAgICAg ICBzZWxmLnNldHVwU3RlcChSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoKSkKLSAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1vbmx5JykKLSAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCi0gICAgICAgIHNlbGYuZXhwZWN0 SGlkZGVuKFRydWUpCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U0tJUFBFRCwg c3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMgKHNraXBwZWQpJykKLSAgICAgICAgcmV0dXJuIHNl bGYucnVuU3RlcCgpCi0KIAogY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QoQnVp bGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAo c2VsZik6CkBAIC0xMDMzLDcgKzEwMTQsNiBAQCBjbGFzcyBUZXN0UnVuSmF2YVNjcmlwdENvcmVU ZXN0c1RvVChCdWlsCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bkphdmFTY3JpcHRDb3JlVGVz dHNUb1QoKSkKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1v bmx5JykKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNl JykKLSAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycsICdUcnVlJykK ICAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNo ZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9Wydw ZXJsJywgJ1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzJywgJy0tbm8tZmFp bC1mYXN0JywgJy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpLCAn LS1yZWxlYXNlJ10sCkBAIC0xMDQ4LDcgKzEwMjgsNiBAQCBjbGFzcyBUZXN0UnVuSmF2YVNjcmlw dENvcmVUZXN0c1RvVChCdWlsCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bkphdmFTY3JpcHRD b3JlVGVzdHNUb1QoKSkKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywg J2pzYy1vbmx5JykKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdk ZWJ1ZycpCi0gICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkVGVzdHMnLCAnVHJ1 ZScpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBl Y3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5k PVsncGVybCcsICdUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cycsICctLW5v LWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1l KSwgJy0tZGVidWcnXSwKQEAgLTEwNjAsMTQgKzEwMzksNiBAQCBjbGFzcyBUZXN0UnVuSmF2YVNj cmlwdENvcmVUZXN0c1RvVChCdWlsCiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9 RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdqc2NvcmUtdGVzdHMgKGZhaWx1cmUpJykKICAgICAgICAg cmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKLSAgICBkZWYgdGVzdF9za2lwKHNlbGYpOgotICAgICAg ICBzZWxmLnNldHVwU3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9UKCkpCi0gICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCi0gICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAgICAgICBzZWxmLmV4cGVj dEhpZGRlbihUcnVlKQotICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNLSVBQRUQs IHN0YXRlX3N0cmluZz0nanNjb3JlLXRlc3RzIChza2lwcGVkKScpCi0gICAgICAgIHJldHVybiBz ZWxmLnJ1blN0ZXAoKQotCiAKIGNsYXNzIFRlc3RSdW5XZWJLaXRUZXN0cyhCdWlsZFN0ZXBNaXhp bkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToK