199193 2019-06-25 10:32:24 -0700 [ews-build] Combine various patchFailed*Tests properties 2019-06-26 16:13:14 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue jbedard webkit-bug-importer oldest_to_newest 1547718 0 aakash_jain 2019-06-25 10:32:24 -0700 Combine various patchFailed*Tests properties. We don't need separate property for each type of test failure. These properties were initially added so that somes build-step can be statically added in build factory and would be executed/skipped based on these flags. This was mostly for build-steps which should be run only after failure, e.g.: UnApplyPatchIfRequired, CompileWebKitToT. For most part, we don't require these flags anymore, since we started using addStepsAfterCurrentStep() method inside steps.py, which add such build-step dynamically as required (only after failure) (e.g.: https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/ews-build/steps.py#L638). But maybe it's still worth to keep them, as a safeguard against someone accidentally adding such steps in a wrong order in the factory. 1547722 1 372841 aakash_jain 2019-06-25 10:44:20 -0700 Created attachment 372841 Patch 1547836 2 jbedard 2019-06-25 15:22:08 -0700 I would have expected tests to change with this sort of property modification. 1547906 3 372883 aakash_jain 2019-06-25 17:17:31 -0700 Created attachment 372883 Patch 1547908 4 aakash_jain 2019-06-25 17:26:20 -0700 (In reply to Jonathan Bedard from comment #2) > I would have expected tests to change with this sort of property modification. Unit tests are modified for 'patchFailedJSCTests' property. I just updated TestCompileWebKitToT.test_failure() and TestUnApplyPatchIfRequired.test_failure() so that these unit-test test 'patchFailedTests' property as well. 1547914 5 372883 commit-queue 2019-06-25 17:56:50 -0700 Comment on attachment 372883 Patch Clearing flags on attachment: 372883 Committed r246822: <https://trac.webkit.org/changeset/246822> 1547915 6 commit-queue 2019-06-25 17:56:51 -0700 All reviewed patches have been landed. Closing bug. 1548173 7 webkit-bug-importer 2019-06-26 16:13:13 -0700 <rdar://problem/52216813> 1548174 8 webkit-bug-importer 2019-06-26 16:13:14 -0700 <rdar://problem/52216815> 372841 2019-06-25 10:44:20 -0700 2019-06-25 17:17:28 -0700 Patch bug-199193-20190625134418.patch text/plain 6316 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0Njc5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE5LTA2LTI1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBDb21iaW5lIHZhcmlvdXMgcGF0Y2hGYWlsZWQqVGVz dHMgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk5MTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6IFJlbmFtZWQgcGF0 Y2hGYWlsZWRKU0NUZXN0cyBhbmQgcGF0Y2hGYWlsZWRBUElUZXN0cyB0byBwYXRjaEZhaWxlZFRl c3RzLiBUaGlzIHByb3BlcnR5IAorICAgICAgICBjYW4gYWxzbyBiZSB1c2VkIGZvciBsYXlvdXQt dGVzdHMgbGF0ZXIgb24uCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5OiBVcGRhdGVkIHVuaXQtdGVzdHMuCisKIDIwMTktMDYtMjUgIEFha2Fz aCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtld3MtYnVpbGRdIFVw bG9hZFRlc3RSZXN1bHRzIGFuZCBFeHRyYWN0VGVzdFJlc3VsdHMgY2xvYmJlciByZXN1bHRzIGlu IGNhc2Ugb2YgbXVsdGlwbGUgbGF5b3V0IHRlc3QgcnVucyBpbiBhIGJ1aWxkCkluZGV4OiBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNDY3OTUp CisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcg Y29weSkKQEAgLTQwMSw3ICs0MDEsNyBAQCBjbGFzcyBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKENs ZWFuV29ya2luCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWydVbmFwcGxpZWQgcGF0Y2gnXQogCiAg ICAgZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXApOgotICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9w ZXJ0eSgncGF0Y2hGYWlsZWRUb0J1aWxkJykgb3Igc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWls ZWRKU0NUZXN0cycpIG9yIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkQVBJVGVzdHMnKQor ICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUb0J1aWxkJykgb3Ig c2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycpCiAKICAgICBkZWYgaGlkZVN0ZXBJ ZihzZWxmLCByZXN1bHRzLCBzdGVwKToKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElm KHN0ZXApCkBAIC02NDcsNyArNjQ3LDcgQEAgY2xhc3MgQ29tcGlsZVdlYktpdFRvVChDb21waWxl V2ViS2l0KToKICAgICBoYWx0T25GYWlsdXJlID0gRmFsc2UKIAogICAgIGRlZiBkb1N0ZXBJZihz ZWxmLCBzdGVwKToKLSAgICAgICAgcmV0dXJuIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVk VG9CdWlsZCcpIG9yIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkQVBJVGVzdHMnKQorICAg ICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUb0J1aWxkJykgb3Igc2Vs Zi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycpCiAKICAgICBkZWYgaGlkZVN0ZXBJZihz ZWxmLCByZXN1bHRzLCBzdGVwKToKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElmKHN0 ZXApCkBAIC03MTYsNyArNzE2LDcgQEAgY2xhc3MgUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhzaGVs bC5UZXN0KQogCiAgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpOgogICAgICAgICBp ZiBjbWQuZGlkRmFpbCgpOgotICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWls ZWRKU0NUZXN0cycsIFRydWUpCisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZh aWxlZFRlc3RzJywgVHJ1ZSkKIAogICAgICAgICByZXR1cm4gc3VwZXIoUnVuSmF2YVNjcmlwdENv cmVUZXN0cywgc2VsZikuZXZhbHVhdGVDb21tYW5kKGNtZCkKIApAQCAtNzI1LDEzICs3MjUsMTMg QEAgY2xhc3MgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKFJ1bkphdmFTYwogICAgIG5hbWUgPSAn anNjb3JlLXRlc3QtcmVydW4nCiAKICAgICBkZWYgZG9TdGVwSWYoc2VsZiwgc3RlcCk6Ci0gICAg ICAgIHJldHVybiBzZWxmLmdldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJykKKyAgICAg ICAgcmV0dXJuIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkVGVzdHMnKQogCiAgICAgZGVm IGhpZGVTdGVwSWYoc2VsZiwgcmVzdWx0cywgc3RlcCk6CiAgICAgICAgIHJldHVybiBub3Qgc2Vs Zi5kb1N0ZXBJZihzdGVwKQogCiAgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxmLCBjbWQpOgot ICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJywgY21kLmRpZEZh aWwoKSkKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycsIGNtZC5k aWRGYWlsKCkpCiAgICAgICAgIHJldHVybiBzdXBlcihSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBz ZWxmKS5ldmFsdWF0ZUNvbW1hbmQoY21kKQogCiAKQEAgLTc0MSw3ICs3NDEsNyBAQCBjbGFzcyBS dW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9UKFJ1bkphdmFTCiAgICAgY29tbWFuZCA9IFsncGVybCcs ICdUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cycsICctLW5vLWZhaWwtZmFz dCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KGpzb25GaWxlTmFtZSksIFdpdGhQcm9wZXJ0 aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyldCiAKICAgICBkZWYgZG9TdGVwSWYoc2VsZiwgc3Rl cCk6Ci0gICAgICAgIHJldHVybiBzZWxmLmdldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3Rz JykKKyAgICAgICAgcmV0dXJuIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkVGVzdHMnKQog CiAgICAgZGVmIGhpZGVTdGVwSWYoc2VsZiwgcmVzdWx0cywgc3RlcCk6CiAgICAgICAgIHJldHVy biBub3Qgc2VsZi5kb1N0ZXBJZihzdGVwKQpAQCAtOTUwLDcgKzk1MCw3IEBAIGNsYXNzIFJlUnVu QVBJVGVzdHMoUnVuQVBJVGVzdHMpOgogICAgICAgICAgICAgc2VsZi5idWlsZC5yZXN1bHRzID0g U1VDQ0VTUwogICAgICAgICAgICAgc2VsZi5idWlsZC5idWlsZEZpbmlzaGVkKFttZXNzYWdlXSwg U1VDQ0VTUykKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3Bh dGNoRmFpbGVkQVBJVGVzdHMnLCBUcnVlKQorICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgn cGF0Y2hGYWlsZWRUZXN0cycsIFRydWUpCiAgICAgICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBz QWZ0ZXJDdXJyZW50U3RlcChbVW5BcHBseVBhdGNoSWZSZXF1aXJlZCgpLCBDb21waWxlV2ViS2l0 VG9UKCksIFJ1bkFQSVRlc3RzV2l0aG91dFBhdGNoKCksIEFuYWx5emVBUElUZXN0c1Jlc3VsdHMo KV0pCiAgICAgICAgIHJldHVybiByYwogCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNDY3OTUpCisr KyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTcxMyw3ICs3MTMsNyBAQCBjbGFzcyBUZXN0UmVSdW5KYXZhU2NyaXB0 Q29yZVRlc3RzKEJ1aWxkCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJlUnVuSmF2YVNjcmlwdENv cmVUZXN0cygpKQogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnanNj LW9ubHknKQogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVh c2UnKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJywgJ1Ry dWUnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUn KQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0 U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1b J3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1i dWlsZCcsICctLW5vLWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYu anNvbkZpbGVOYW1lKSwgJy0tcmVsZWFzZSddLApAQCAtNzI4LDcgKzcyOCw3IEBAIGNsYXNzIFRl c3RSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoQnVpbGQKICAgICAgICAgc2VsZi5zZXR1cFN0ZXAo UmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkpCiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1 bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZp Z3VyYXRpb24nLCAnZGVidWcnKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZEpTQ1Rlc3RzJywgJ1RydWUnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAg ICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAg ICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5vLWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXsw fScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKSwgJy0tZGVidWcnXSwKQEAgLTc2Miw3ICs3NjIs NyBAQCBjbGFzcyBUZXN0UnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVChCdWlsCiAgICAgICAgIHNl bGYuc2V0dXBTdGVwKFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QoKSkKICAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1vbmx5JykKICAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNlJykKLSAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgncGF0Y2hGYWlsZWRKU0NUZXN0cycsICdUcnVlJykKKyAgICAgICAgc2VsZi5zZXRQcm9w ZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycsICdUcnVlJykKICAgICAgICAgc2VsZi5leHBlY3RSZW1v dGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydwZXJsJywgJ1Rvb2xzL1NjcmlwdHMvcnVu LWphdmFzY3JpcHRjb3JlLXRlc3RzJywgJy0tbm8tZmFpbC1mYXN0JywgJy0tanNvbi1vdXRwdXQ9 ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpLCAnLS1yZWxlYXNlJ10sCkBAIC03NzcsNyAr Nzc3LDcgQEAgY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QoQnVpbAogICAgICAg ICBzZWxmLnNldHVwU3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9UKCkpCiAgICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCiAgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAgICAgICBzZWxmLnNldFBy b3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJywgJ1RydWUnKQorICAgICAgICBzZWxmLnNldFBy b3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBzZWxmLmV4cGVjdFJl bW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAog ICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9y dW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1mYWlsLWZhc3QnLCAnLS1qc29uLW91dHB1 dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSksICctLWRlYnVnJ10sCg== 372883 2019-06-25 17:17:31 -0700 2019-06-25 17:56:50 -0700 Patch bug-199193-20190625201730.patch text/plain 7090 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NjgyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE5LTA2LTI1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBDb21iaW5lIHZhcmlvdXMgcGF0Y2hGYWlsZWQqVGVz dHMgcHJvcGVydGllcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk5MTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6IFJlbmFtZWQgcGF0 Y2hGYWlsZWRKU0NUZXN0cyBhbmQgcGF0Y2hGYWlsZWRBUElUZXN0cyB0byBwYXRjaEZhaWxlZFRl c3RzLiBUaGlzIHByb3BlcnR5IAorICAgICAgICBjYW4gYWxzbyBiZSB1c2VkIGZvciBsYXlvdXQt dGVzdHMgbGF0ZXIgb24uCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzX3VuaXR0ZXN0LnB5OiBVcGRhdGVkIHVuaXQtdGVzdHMuCisKIDIwMTktMDYtMjUgIFJvc3Mg S2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5nQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dIE1pbmlC cm93c2VyIHNob3VsZCBkZWZhdWx0IHRvIHdlYmtpdC5vcmcKSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlzaW9uIDI0NjgyMSkKKysrIFRvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAt NDAxLDcgKzQwMSw3IEBAIGNsYXNzIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQoQ2xlYW5Xb3JraW4K ICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ1VuYXBwbGllZCBwYXRjaCddCiAKICAgICBkZWYgZG9T dGVwSWYoc2VsZiwgc3RlcCk6Ci0gICAgICAgIHJldHVybiBzZWxmLmdldFByb3BlcnR5KCdwYXRj aEZhaWxlZFRvQnVpbGQnKSBvciBzZWxmLmdldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3Rz Jykgb3Igc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRBUElUZXN0cycpCisgICAgICAgIHJl dHVybiBzZWxmLmdldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRvQnVpbGQnKSBvciBzZWxmLmdldFBy b3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJykKIAogICAgIGRlZiBoaWRlU3RlcElmKHNlbGYsIHJl c3VsdHMsIHN0ZXApOgogICAgICAgICByZXR1cm4gbm90IHNlbGYuZG9TdGVwSWYoc3RlcCkKQEAg LTY0Nyw3ICs2NDcsNyBAQCBjbGFzcyBDb21waWxlV2ViS2l0VG9UKENvbXBpbGVXZWJLaXQpOgog ICAgIGhhbHRPbkZhaWx1cmUgPSBGYWxzZQogCiAgICAgZGVmIGRvU3RlcElmKHNlbGYsIHN0ZXAp OgotICAgICAgICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUb0J1aWxkJykg b3Igc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRBUElUZXN0cycpCisgICAgICAgIHJldHVy biBzZWxmLmdldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRvQnVpbGQnKSBvciBzZWxmLmdldFByb3Bl cnR5KCdwYXRjaEZhaWxlZFRlc3RzJykKIAogICAgIGRlZiBoaWRlU3RlcElmKHNlbGYsIHJlc3Vs dHMsIHN0ZXApOgogICAgICAgICByZXR1cm4gbm90IHNlbGYuZG9TdGVwSWYoc3RlcCkKQEAgLTcx Niw3ICs3MTYsNyBAQCBjbGFzcyBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKHNoZWxsLlRlc3QpCiAK ICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6CiAgICAgICAgIGlmIGNtZC5kaWRG YWlsKCk6Ci0gICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3Rz JywgVHJ1ZSkKKyAgICAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkVGVzdHMn LCBUcnVlKQogCiAgICAgICAgIHJldHVybiBzdXBlcihSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBz ZWxmKS5ldmFsdWF0ZUNvbW1hbmQoY21kKQogCkBAIC03MjUsMTMgKzcyNSwxMyBAQCBjbGFzcyBS ZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoUnVuSmF2YVNjCiAgICAgbmFtZSA9ICdqc2NvcmUtdGVz dC1yZXJ1bicKIAogICAgIGRlZiBkb1N0ZXBJZihzZWxmLCBzdGVwKToKLSAgICAgICAgcmV0dXJu IHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkSlNDVGVzdHMnKQorICAgICAgICByZXR1cm4g c2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycpCiAKICAgICBkZWYgaGlkZVN0ZXBJ ZihzZWxmLCByZXN1bHRzLCBzdGVwKToKICAgICAgICAgcmV0dXJuIG5vdCBzZWxmLmRvU3RlcElm KHN0ZXApCiAKICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6Ci0gICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkSlNDVGVzdHMnLCBjbWQuZGlkRmFpbCgpKQorICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgY21kLmRpZEZhaWwoKSkK ICAgICAgICAgcmV0dXJuIHN1cGVyKFJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIHNlbGYpLmV2YWx1 YXRlQ29tbWFuZChjbWQpCiAKIApAQCAtNzQxLDcgKzc0MSw3IEBAIGNsYXNzIFJ1bkphdmFTY3Jp cHRDb3JlVGVzdHNUb1QoUnVuSmF2YVMKICAgICBjb21tYW5kID0gWydwZXJsJywgJ1Rvb2xzL1Nj cmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzJywgJy0tbm8tZmFpbC1mYXN0JywgJy0tanNv bi1vdXRwdXQ9ezB9Jy5mb3JtYXQoanNvbkZpbGVOYW1lKSwgV2l0aFByb3BlcnRpZXMoJy0tJShj b25maWd1cmF0aW9uKXMnKV0KIAogICAgIGRlZiBkb1N0ZXBJZihzZWxmLCBzdGVwKToKLSAgICAg ICAgcmV0dXJuIHNlbGYuZ2V0UHJvcGVydHkoJ3BhdGNoRmFpbGVkSlNDVGVzdHMnKQorICAgICAg ICByZXR1cm4gc2VsZi5nZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycpCiAKICAgICBkZWYg aGlkZVN0ZXBJZihzZWxmLCByZXN1bHRzLCBzdGVwKToKICAgICAgICAgcmV0dXJuIG5vdCBzZWxm LmRvU3RlcElmKHN0ZXApCkBAIC05NTAsNyArOTUwLDcgQEAgY2xhc3MgUmVSdW5BUElUZXN0cyhS dW5BUElUZXN0cyk6CiAgICAgICAgICAgICBzZWxmLmJ1aWxkLnJlc3VsdHMgPSBTVUNDRVNTCiAg ICAgICAgICAgICBzZWxmLmJ1aWxkLmJ1aWxkRmluaXNoZWQoW21lc3NhZ2VdLCBTVUNDRVNTKQog ICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRB UElUZXN0cycsIFRydWUpCisgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZFRlc3RzJywgVHJ1ZSkKICAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJl bnRTdGVwKFtVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKCksIENvbXBpbGVXZWJLaXRUb1QoKSwgUnVu QVBJVGVzdHNXaXRob3V0UGF0Y2goKSwgQW5hbHl6ZUFQSVRlc3RzUmVzdWx0cygpXSkKICAgICAg ICAgcmV0dXJuIHJjCiAKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9z dGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI0NjgyMSkKKysrIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtNTMyLDcgKzUzMiw3IEBAIGNsYXNzIFRlc3RDb21waWxlV2ViS2l0VG9UKEJ1aWxkU3Rl cE1peGkKICAgICAgICAgc2VsZi5zZXR1cFN0ZXAoQ29tcGlsZVdlYktpdFRvVCgpKQogICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnbWFjLXNpZXJyYScpCiAgICAgICAg IHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAgICAgICBzZWxm LnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRvQnVpbGQnLCBUcnVlKQorICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgVHJ1ZSkKICAgICAgICAgc2VsZi5leHBlY3RS ZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywK ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydwZXJsJywgJ1Rvb2xzL1NjcmlwdHMv YnVpbGQtd2Via2l0JywgJy0tZGVidWcnXSwKQEAgLTcxMyw3ICs3MTMsNyBAQCBjbGFzcyBUZXN0 UmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKEJ1aWxkCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJl UnVuSmF2YVNjcmlwdENvcmVUZXN0cygpKQogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxs UGxhdGZvcm0nLCAnanNjLW9ubHknKQogICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1 cmF0aW9uJywgJ3JlbGVhc2UnKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZEpTQ1Rlc3RzJywgJ1RydWUnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAg ICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAg ICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5vLWZhaWwtZmFzdCcsICctLWpzb24tb3V0cHV0PXsw fScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKSwgJy0tcmVsZWFzZSddLApAQCAtNzI4LDcgKzcy OCw3IEBAIGNsYXNzIFRlc3RSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMoQnVpbGQKICAgICAgICAg c2VsZi5zZXR1cFN0ZXAoUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzKCkpCiAgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScpCiAgICAgICAgIHNlbGYuc2V0 UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJywgJ1RydWUnKQorICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUnKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAg ICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAnVG9vbHMvU2NyaXB0cy9ydW4t amF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1idWlsZCcsICctLW5vLWZhaWwtZmFzdCcsICct LWpzb24tb3V0cHV0PXswfScuZm9ybWF0KHNlbGYuanNvbkZpbGVOYW1lKSwgJy0tZGVidWcnXSwK QEAgLTc2Miw3ICs3NjIsNyBAQCBjbGFzcyBUZXN0UnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVChC dWlsCiAgICAgICAgIHNlbGYuc2V0dXBTdGVwKFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNUb1QoKSkK ICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2pzYy1vbmx5JykKICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNlJykKLSAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRKU0NUZXN0cycsICdUcnVlJykKKyAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hGYWlsZWRUZXN0cycsICdUcnVlJykKICAgICAgICAg c2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtk aXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydwZXJsJywgJ1Rv b2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzJywgJy0tbm8tZmFpbC1mYXN0Jywg Jy0tanNvbi1vdXRwdXQ9ezB9Jy5mb3JtYXQoc2VsZi5qc29uRmlsZU5hbWUpLCAnLS1yZWxlYXNl J10sCkBAIC03NzcsNyArNzc3LDcgQEAgY2xhc3MgVGVzdFJ1bkphdmFTY3JpcHRDb3JlVGVzdHNU b1QoQnVpbAogICAgICAgICBzZWxmLnNldHVwU3RlcChSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9U KCkpCiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdqc2Mtb25seScp CiAgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRpb24nLCAnZGVidWcnKQotICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZEpTQ1Rlc3RzJywgJ1RydWUnKQorICAg ICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxlZFRlc3RzJywgJ1RydWUnKQogICAgICAg ICBzZWxmLmV4cGVjdFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29y a2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3BlcmwnLCAn VG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMnLCAnLS1uby1mYWlsLWZhc3Qn LCAnLS1qc29uLW91dHB1dD17MH0nLmZvcm1hdChzZWxmLmpzb25GaWxlTmFtZSksICctLWRlYnVn J10sCkBAIC05NjksNyArOTY5LDcgQEAgY2xhc3MgVGVzdFVuQXBwbHlQYXRjaElmUmVxdWlyZWQo QnVpbGRTdAogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKICAgICAgICAgc2VsZi5zZXR1 cFN0ZXAoVW5BcHBseVBhdGNoSWZSZXF1aXJlZCgpKQotICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdwYXRjaEZhaWxlZFRvQnVpbGQnLCBUcnVlKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdw YXRjaEZhaWxlZFRlc3RzJywgVHJ1ZSkKICAgICAgICAgc2VsZi5leHBlY3RIaWRkZW4oRmFsc2Up CiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBFeHBlY3RT aGVsbCh3b3JrZGlyPSd3a2RpcicsCg==