218440 2020-11-02 05:37:06 -0800 Use FileDownload to fetch built product from master 2020-11-11 07:53:24 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 angelos webkit-unassigned aakash_jain jbedard webkit-bug-importer oldest_to_newest 1703495 0 angelos 2020-11-02 05:37:06 -0800 Use FileDownload to fetch built product from master 1703496 1 412907 angelos 2020-11-02 05:39:06 -0800 Created attachment 412907 Patch 1703512 2 aakash_jain 2020-11-02 06:36:17 -0800 unit-tests in TestDownloadBuiltProductFromMaster would need to be updated, it would become similar to TestUploadBuiltProduct. 1704412 3 413160 angelos 2020-11-04 07:40:43 -0800 Created attachment 413160 Patch 1705692 4 webkit-bug-importer 2020-11-09 05:38:12 -0800 <rdar://problem/71187403> 1705956 5 413160 aakash_jain 2020-11-09 18:21:51 -0800 Comment on attachment 413160 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413160&action=review Patch looks good. various minor comments. Also you can remove EWS_BUILD_URL variable, it's unused after this patch. > Tools/CISupport/ews-build/steps.py:2443 > +class DownloadBuiltProductFromMaster(transfer.FileDownload): Please add step name, e.g.: name = 'download-built-product-from-master' > Tools/CISupport/ews-build/steps.py:2458 > def getResultSummary(self): Nit: missing empty line before method. > Tools/CISupport/ews-build/steps_unittest.py:211 > +def downloadFileRecordingContents(recorder): Maybe it's better to keep this method inside TestDownloadBuiltProductFromMaster class since it's used only there. > Tools/CISupport/ews-build/steps_unittest.py:2601 > + self.setupStep(step) Can write this as one line: self.setupStep(DownloadBuiltProductFromMaster(mastersrc=__file__)) > Tools/CISupport/ews-build/steps_unittest.py:2621 > + buf = b''.join(buf) is 'b' required in b''? > Tools/CISupport/ews-build/steps_unittest.py:2622 > + self.assertEqual(len(buf), 1000) Can store this 1000 in a variable and re-use that variable. > Tools/CISupport/ews-build/steps_unittest.py:2623 > + with open(__file__, 'rb') as mf: can improve the variable name for 'mf' 1706444 6 413818 angelos 2020-11-11 06:51:51 -0800 Created attachment 413818 Patch 1706451 7 ews-feeder 2020-11-11 07:53:23 -0800 Committed r269683: <https://trac.webkit.org/changeset/269683> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413818. 412907 2020-11-02 05:39:06 -0800 2020-11-04 07:40:36 -0800 Patch bug-218440-20201102143902.patch text/plain 2648 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzZmYTk1YmQ0YTM0ZTAwNGU5YWY2OWI2OGNkODVlZWJm ZjQ1MWNmMS4uOWE5NjcxY2Y3N2YwZGE3Y2FiMTFkNDcwNjE1ZGQ3NGQzNTdkZjU4NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIwLTExLTAyICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFVzZSBGaWxlRG93bmxvYWQgdG8gZmV0Y2ggYnVpbHQgcHJvZHVjdCBm cm9tIG1hc3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE4NDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyByZW1vdmVzIHRoZSBuZWVkIGZvciBhIGZyb250LWVuZCB3ZWIgc2VydmVyIHRvIHNl cnZlIHRoZSBzdGF0aWMKKyAgICAgICAgZmlsZXMuCisKKyAgICAgICAgU3VnZ2VzdGVkLWJ5OiBh YWthc2hfamFpbkBhcHBsZS5jb20KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHk6CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIpOgorICAgICAg ICAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyLl9faW5pdF9fKToKKyAgICAgICAgKERv d25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlci5nZXRSZXN1bHRTdW1tYXJ5KToKKwogMjAyMC0x MS0wMSAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJl bWFpbmluZyBhbHRlcm5hdGl2ZSBwcmVmZXJlbmNlIHNldHRpbmcgbWVjaGFuaXNtcyBmcm9tIExh eW91dFRlc3RzCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5 IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCA3NDBlOWNjMGI1OTkz MTEwNTZkNTJiOGQ0YjJmZDZjN2YyNzFiNTA4Li45MDljOGQ1NTgzODNjOTAxNTVhNDMwZWFmMzVl NmZkZWZhZjFjYmQ5IDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBz LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTI0MzcsMjAg KzI0MzcsMjMgQEAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3Qoc2hlbGwuU2hlbGxDb21tYW5k KToKICAgICAgICAgcmV0dXJuIHJjCiAKIAotY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9t TWFzdGVyKERvd25sb2FkQnVpbHRQcm9kdWN0KToKLSAgICBjb21tYW5kID0gWydweXRob24nLCAn VG9vbHMvQ0lTdXBwb3J0L2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3QnLAotICAgICAgICBXaXRoUHJv cGVydGllcygnLS0lKGNvbmZpZ3VyYXRpb24pcycpLAotICAgICAgICBXaXRoUHJvcGVydGllcyhF V1NfQlVJTERfVVJMICsgJ2FyY2hpdmVzLyUoZnVsbFBsYXRmb3JtKXMtJShhcmNoaXRlY3R1cmUp cy0lKGNvbmZpZ3VyYXRpb24pcy8lKHBhdGNoX2lkKXMuemlwJyldCitjbGFzcyBEb3dubG9hZEJ1 aWx0UHJvZHVjdEZyb21NYXN0ZXIodHJhbnNmZXIuRmlsZURvd25sb2FkKToKKyAgICBtYXN0ZXJz cmMgPSBXaXRoUHJvcGVydGllcygncHVibGljX2h0bWwvYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0p cy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKQor ICAgIHdvcmtlcmRlc3QgPSBXaXRoUHJvcGVydGllcygnV2ViS2l0QnVpbGQvJShjb25maWd1cmF0 aW9uKXMuemlwJykKKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ0Rvd25sb2FkZWQgYnVpbHQgcHJv ZHVjdCddCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKICAgICBmbHVua09uRmFpbHVyZSA9IFRy dWUKIAorICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CisgICAgICAgIGt3YXJnc1sn bWFzdGVyc3JjJ10gPSBzZWxmLm1hc3RlcnNyYworICAgICAgICBrd2FyZ3NbJ3dvcmtlcmRlc3Qn XSA9IHNlbGYud29ya2VyZGVzdAorICAgICAgICBrd2FyZ3NbJ21vZGUnXSA9IDBvMDY0NAorICAg ICAgICBrd2FyZ3NbJ2Jsb2Nrc2l6ZSddID0gMTAyNCAqIDI1NgorICAgICAgICB0cmFuc2Zlci5G aWxlRG93bmxvYWQuX19pbml0X18oc2VsZiwgKiprd2FyZ3MpCiAgICAgZGVmIGdldFJlc3VsdFN1 bW1hcnkoc2VsZik6CiAgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUNDRVNTOgogICAgICAg ICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0 IGZyb20gYnVpbGQgbWFzdGVyJ30KLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29tbWFuZC5n ZXRSZXN1bHRTdW1tYXJ5KHNlbGYpCi0KLSAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNt ZCk6Ci0gICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVDb21tYW5kKHNl bGYsIGNtZCkKKyAgICAgICAgcmV0dXJuIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1h c3Rlciwgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCiAKIAogY2xhc3MgRXh0cmFjdEJ1aWx0UHJv ZHVjdChzaGVsbC5TaGVsbENvbW1hbmQpOgo= 413160 2020-11-04 07:40:43 -0800 2020-11-11 06:51:33 -0800 Patch bug-218440-20201104164041.patch text/plain 7422 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5Mjg5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDI2N2JhNTlkMTA1OGNmYTc4MTQyOGZkZDU1NWNkN2E3 Y2UxNmQzNy4uNzY3ZTBiOThlNWU4MmZiMDU5NDM1NmY2N2Y5YTQ0NGFjN2ZlNTJiMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTExLTA0ICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFVzZSBGaWxlRG93bmxvYWQgdG8gZmV0Y2ggYnVpbHQgcHJvZHVjdCBm cm9tIG1hc3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE4NDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyByZW1vdmVzIHRoZSBuZWVkIGZvciBhIGZyb250LWVuZCB3ZWIgc2VydmVyIHRvIHNl cnZlIHRoZSBzdGF0aWMKKyAgICAgICAgZmlsZXMuCisKKyAgICAgICAgU3VnZ2VzdGVkLWJ5OiBh YWthc2hfamFpbkBhcHBsZS5jb20KKworICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHk6CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIpOgorICAgICAg ICAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyLl9faW5pdF9fKToKKyAgICAgICAgKERv d25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlci5nZXRSZXN1bHRTdW1tYXJ5KToKKyAgICAgICAg KiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoZG93bmxv YWRGaWxlUmVjb3JkaW5nQ29udGVudHMpOgorICAgICAgICAoZG93bmxvYWRGaWxlUmVjb3JkaW5n Q29udGVudHMuYmVoYXZpb3IpOgorCiAyMDIwLTExLTAzICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJv ICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBDYW5ub3QgcmVtb3Zl IGluZGl2aWR1YWwgc2NyaXB0cy9zdHlsZXNoZWV0cyB1c2luZyBXZWJLaXRVc2VyQ29udGVudE1h bmFnZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9U b29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IDFhNmFmOWI0ODZkNTU4ODFl MDI3YTRhZTk2NzNhYjQwZjNmNmNjYjcuLjgxZDE1Njg5Mjg1OTFiN2ZhMGRlYTQ2YTFiYzUzMDRm OWM3NjQyZTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK KysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMjQ0MCwyMCArMjQ0 MCwyNSBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvbW1hbmQpOgog ICAgICAgICByZXR1cm4gcmMKIAogCi1jbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0 ZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QpOgotICAgIGNvbW1hbmQgPSBbJ3B5dGhvbicsICdUb29s cy9DSVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsCi0gICAgICAgIFdpdGhQcm9wZXJ0 aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyksCi0gICAgICAgIFdpdGhQcm9wZXJ0aWVzKEVXU19C VUlMRF9VUkwgKyAnYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUo Y29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKV0KK2NsYXNzIERvd25sb2FkQnVpbHRQ cm9kdWN0RnJvbU1hc3Rlcih0cmFuc2Zlci5GaWxlRG93bmxvYWQpOgorICAgIG1hc3RlcnNyYyA9 IFdpdGhQcm9wZXJ0aWVzKCdwdWJsaWNfaHRtbC9hcmNoaXZlcy8lKGZ1bGxQbGF0Zm9ybSlzLSUo YXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShwYXRjaF9pZClzLnppcCcpCisgICAg d29ya2VyZGVzdCA9IFdpdGhQcm9wZXJ0aWVzKCdXZWJLaXRCdWlsZC8lKGNvbmZpZ3VyYXRpb24p cy56aXAnKQorICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsnRG93bmxvYWRlZCBidWlsdCBwcm9kdWN0 J10KICAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQogICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQog CisgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgIyBBbGxvdyB0aGUg dW5pdCB0ZXN0IHRvIG92ZXJyaWRlIG1hc3RlcnNyYworICAgICAgICBpZiAnbWFzdGVyc3JjJyBu b3QgaW4ga3dhcmdzOgorICAgICAgICAgICAga3dhcmdzWydtYXN0ZXJzcmMnXSA9IHNlbGYubWFz dGVyc3JjCisgICAgICAgIGt3YXJnc1snd29ya2VyZGVzdCddID0gc2VsZi53b3JrZXJkZXN0Cisg ICAgICAgIGt3YXJnc1snbW9kZSddID0gMG8wNjQ0CisgICAgICAgIGt3YXJnc1snYmxvY2tzaXpl J10gPSAxMDI0ICogMjU2CisgICAgICAgIHRyYW5zZmVyLkZpbGVEb3dubG9hZC5fX2luaXRfXyhz ZWxmLCAqKmt3YXJncykKICAgICBkZWYgZ2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAg aWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6CiAgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6 IHUnRmFpbGVkIHRvIGRvd25sb2FkIGJ1aWx0IHByb2R1Y3QgZnJvbSBidWlsZCBtYXN0ZXInfQot ICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21tYW5kLmdldFJlc3VsdFN1bW1hcnkoc2VsZikK LQotICAgIGRlZiBldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKToKLSAgICAgICAgcmV0dXJuIHNo ZWxsLlNoZWxsQ29tbWFuZC5ldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKQorICAgICAgICByZXR1 cm4gc3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyLCBzZWxmKS5nZXRSZXN1bHRT dW1tYXJ5KCkKIAogCiBjbGFzcyBFeHRyYWN0QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFu ZCk6CmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQppbmRleCBj YTI1YzI1NGY2ZTMwYzBjZTZjY2Y3ZDJiOWQ1NTI3NGNhYzI4YTQ5Li45Mjc5OGNmMTM0MDkyZjhi NTBjODgxYmMwZDBiZjc3ZGRiYmY0MTQ0IDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHNfdW5pdHRlc3QucHkKQEAgLTM0LDcgKzM0LDcgQEAgZnJvbSBidWlsZGJvdC50ZXN0LmZh a2UucmVtb3RlY29tbWFuZCBpbXBvcnQgRXhwZWN0LCBFeHBlY3RSZW1vdGVSZWYsIEV4cGVjdFNo ZWwKIGZyb20gYnVpbGRib3QudGVzdC51dGlsLnN0ZXBzIGltcG9ydCBCdWlsZFN0ZXBNaXhpbgog ZnJvbSBidWlsZGJvdC51dGlsIGltcG9ydCBpZGVudGlmaWVycyBhcyBidWlsZGJvdF9pZGVudGlm aWVycwogZnJvbSBtb2NrIGltcG9ydCBjYWxsCi1mcm9tIHR3aXN0ZWQuaW50ZXJuZXQgaW1wb3J0 IGVycm9yLCByZWFjdG9yCitmcm9tIHR3aXN0ZWQuaW50ZXJuZXQgaW1wb3J0IGRlZmVyLCBlcnJv ciwgcmVhY3RvcgogZnJvbSB0d2lzdGVkLnB5dGhvbiBpbXBvcnQgZmFpbHVyZSwgbG9nCiBmcm9t IHR3aXN0ZWQudHJpYWwgaW1wb3J0IHVuaXR0ZXN0CiAKQEAgLTIwOCw2ICsyMDgsMTQgQEAgZGVm IHVwbG9hZEZpbGVXaXRoQ29udGVudHNPZlN0cmluZyhzdHJpbmcsIHRpbWVzdGFtcD1Ob25lKToK ICAgICByZXR1cm4gYmVoYXZpb3IKIAogCitkZWYgZG93bmxvYWRGaWxlUmVjb3JkaW5nQ29udGVu dHMocmVjb3JkZXIpOgorICAgIGRlZiBiZWhhdmlvcihjb21tYW5kKToKKyAgICAgICAgcmVhZGVy ID0gY29tbWFuZC5hcmdzWydyZWFkZXInXQorICAgICAgICBkYXRhID0gcmVhZGVyLnJlbW90ZV9y ZWFkKDEwMDApCisgICAgICAgIHJlY29yZGVyKGRhdGEpCisgICAgICAgIHJlYWRlci5yZW1vdGVf Y2xvc2UoKQorICAgIHJldHVybiBiZWhhdmlvcgorCiBjbGFzcyBUZXN0U3RlcE5hbWVTaG91bGRC ZVZhbGlkSWRlbnRpZmllcihCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENh c2UpOgogICAgIGRlZiB0ZXN0X3N0ZXBfbmFtZXNfYXJlX3ZhbGlkKHNlbGYpOgogICAgICAgICBp bXBvcnQgc3RlcHMKQEAgLTI1ODcsMzggKzI1OTUsNTUgQEAgY2xhc3MgVGVzdERvd25sb2FkQnVp bHRQcm9kdWN0RnJvbU1hc3RlcihCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVz dEMKICAgICBkZWYgdGVhckRvd24oc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3du QnVpbGRTdGVwKCkKIAorICAgIEBkZWZlci5pbmxpbmVDYWxsYmFja3MKICAgICBkZWYgdGVzdF9z dWNjZXNzKHNlbGYpOgotICAgICAgICBzZWxmLnNldHVwU3RlcChEb3dubG9hZEJ1aWx0UHJvZHVj dEZyb21NYXN0ZXIoKSkKKyAgICAgICAgc3RlcCA9IERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1h c3RlcihtYXN0ZXJzcmM9X19maWxlX18pCisgICAgICAgIHNlbGYuc2V0dXBTdGVwKHN0ZXApCiAg ICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdpb3Mtc2ltdWxhdG9yLTEy JykKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNlJykK ICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCiAgICAg ICAgIHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQotICAgICAgICBzZWxmLmV4 cGVjdFJlbW90ZUNvbW1hbmRzKAotICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tk aXInLAotICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQ0lTdXBwb3J0L2Rvd25s b2FkLWJ1aWx0LXByb2R1Y3QnLCAnLS1yZWxlYXNlJywgJ2h0dHBzOi8vZXdzLWJ1aWxkLndlYmtp dC5vcmcvYXJjaGl2ZXMvaW9zLXNpbXVsYXRvci0xMi14ODZfNjQtcmVsZWFzZS8xMjM0LnppcCdd LAotICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdEhpZGRlbihG YWxzZSkKKyAgICAgICAgYnVmID0gW10KKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5k cygKKyAgICAgICAgICAgIEV4cGVjdCgnZG93bmxvYWRGaWxlJywgZGljdCgKKyAgICAgICAgICAg ICAgICB3b3JrZXJkZXN0PSdXZWJLaXRCdWlsZC9yZWxlYXNlLnppcCcsIHdvcmtkaXI9J3drZGly JywKKyAgICAgICAgICAgICAgICBibG9ja3NpemU9MTAyNCAqIDI1NiwgbWF4c2l6ZT1Ob25lLCBt b2RlPTBvMDY0NCwKKyAgICAgICAgICAgICAgICByZWFkZXI9RXhwZWN0UmVtb3RlUmVmKHJlbW90 ZXRyYW5zZmVyLkZpbGVSZWFkZXIpLAorICAgICAgICAgICAgKSkKKyAgICAgICAgICAgICsgRXhw ZWN0LmJlaGF2aW9yKGRvd25sb2FkRmlsZVJlY29yZGluZ0NvbnRlbnRzKGJ1Zi5hcHBlbmQpKQog ICAgICAgICAgICAgKyAwLAogICAgICAgICApCi0gICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShy ZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdEb3dubG9hZGVkIGJ1aWx0IHByb2R1Y3QnKQot ICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21l KHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J2Rvd25sb2FkaW5nIHRvIHJlbGVhc2Uuemlw JykKKworICAgICAgICB5aWVsZCBzZWxmLnJ1blN0ZXAoKQorCisgICAgICAgIGJ1ZiA9IGInJy5q b2luKGJ1ZikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oYnVmKSwgMTAwMCkKKyAgICAg ICAgd2l0aCBvcGVuKF9fZmlsZV9fLCAncmInKSBhcyBtZjoKKyAgICAgICAgICAgIGRhdGEgPSBt Zi5yZWFkKDEwMDApCisgICAgICAgICAgICBpZiBkYXRhICE9IGJ1ZjoKKyAgICAgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGJ1ZiwgZGF0YSkKIAorICAgIEBkZWZlci5pbmxpbmVDYWxsYmFj a3MKICAgICBkZWYgdGVzdF9mYWlsdXJlKHNlbGYpOgotICAgICAgICBzZWxmLnNldHVwU3RlcChE b3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoKSkKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAo RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKG1hc3RlcnNyYz1fX2ZpbGVfXykpCiAgICAg ICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdtYWMtc2llcnJhJykKICAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCiAgICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ2FyY2hpdGVjdHVyZScsICd4ODZfNjQnKQogICAgICAgICBzZWxmLnNl dFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0NTYnKQotICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAotICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAotICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKLSAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQ0lTdXBwb3J0L2Rvd25sb2FkLWJ1aWx0 LXByb2R1Y3QnLCAnLS1kZWJ1ZycsICdodHRwczovL2V3cy1idWlsZC53ZWJraXQub3JnL2FyY2hp dmVzL21hYy1zaWVycmEteDg2XzY0LWRlYnVnLzEyMzQ1Ni56aXAnXSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICkKLSAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91 dD0nVW5leHBlY3RlZCBmYWlsdXJlLicpCisgICAgICAgIGJ1ZiA9IFtdCisgICAgICAgIHNlbGYu ZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3QoJ2Rvd25sb2FkRmlsZScs IGRpY3QoCisgICAgICAgICAgICAgICAgd29ya2VyZGVzdD0nV2ViS2l0QnVpbGQvZGVidWcuemlw Jywgd29ya2Rpcj0nd2tkaXInLAorICAgICAgICAgICAgICAgIGJsb2Nrc2l6ZT0xMDI0ICogMjU2 LCBtYXhzaXplPU5vbmUsIG1vZGU9MG8wNjQ0LAorICAgICAgICAgICAgICAgIHJlYWRlcj1FeHBl Y3RSZW1vdGVSZWYocmVtb3RldHJhbnNmZXIuRmlsZVJlYWRlciksCisgICAgICAgICAgICApKQor ICAgICAgICAgICAgKyBFeHBlY3QuYmVoYXZpb3IoZG93bmxvYWRGaWxlUmVjb3JkaW5nQ29udGVu dHMoYnVmLmFwcGVuZCkpCiAgICAgICAgICAgICArIDIsCiAgICAgICAgICkKICAgICAgICAgc2Vs Zi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9J0ZhaWxlZCB0byBk b3dubG9hZCBidWlsdCBwcm9kdWN0IGZyb20gYnVpbGQgbWFzdGVyJykKLSAgICAgICAgcmV0dXJu IHNlbGYucnVuU3RlcCgpCisgICAgICAgIHlpZWxkIHNlbGYucnVuU3RlcCgpCiAKIAogY2xhc3Mg VGVzdEV4dHJhY3RCdWlsdFByb2R1Y3QoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0 LlRlc3RDYXNlKToK 413818 2020-11-11 06:51:51 -0800 2020-11-11 07:53:24 -0800 Patch bug-218440-20201111155147.patch text/plain 7956 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjgwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWJkNTQzN2UxODk2NDA0MWZjMzIxOTQ1OTY3NGZkOTEx YmY1ZDc3NC4uMzg1ZGNmOTEyODY2M2FhMWY1MzMzMWNlODkyNWM4MmQwYTk4N2ZmMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIwLTExLTExICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFVzZSBGaWxlRG93bmxvYWQgdG8gZmV0Y2ggYnVpbHQgcHJvZHVjdCBm cm9tIG1hc3RlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjE4NDQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyByZW1vdmVzIHRoZSBuZWVkIGZvciBhIGZyb250LWVuZCB3ZWIgc2VydmVyIHRvIHNl cnZlIHRoZSBzdGF0aWMKKyAgICAgICAgZmlsZXMuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVy KToKKyAgICAgICAgKERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlci5fX2luaXRfXyk6Cisg ICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIuZ2V0UmVzdWx0U3VtbWFyeSk6 CisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weToKKwogMjAy MC0xMS0xMCAgTm9hbSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCwgY2xlYW51cCBteSB3YXRjaGxpc3QgZW50cmllcy4KZGlmZiAtLWdpdCBhL1Rvb2xz L0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5CmluZGV4IDhlMGViMTc0MWZiNWRlMjFjMzZlYjcxOTc5N2I4MGExMmUzZTg3ZTcu Ljk4NWY0ODkyODM0ZjllNzk4ZGNiNjkxNjM3MTkxYzAyYzZhMzA1NjggMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3 cy1idWlsZC9zdGVwcy5weQpAQCAtNDMsNyArNDMsNiBAQCBTM1VSTCA9ICdodHRwczovL3MzLXVz LXdlc3QtMi5hbWF6b25hd3MuY29tLycKIFMzX1JFU1VMVFNfVVJMID0gJ2h0dHBzOi8vZXdzLWJ1 aWxkLnMzLXVzLXdlc3QtMi5hbWF6b25hd3MuY29tLycKIENVUlJFTlRfSE9TVE5BTUUgPSBzb2Nr ZXQuZ2V0aG9zdG5hbWUoKS5zdHJpcCgpCiBFV1NfQlVJTERfSE9TVE5BTUUgPSAnZXdzLWJ1aWxk LndlYmtpdC5vcmcnCi1FV1NfQlVJTERfVVJMID0gb3MuZW52aXJvbi5nZXQoJ0VXU19CVUlMRF9V UkwnLCAnaHR0cHM6Ly97fS8nLmZvcm1hdChFV1NfQlVJTERfSE9TVE5BTUUpKQogRVdTX1VSTCA9 ICdodHRwczovL2V3cy53ZWJraXQub3JnLycKIFJFU1VMVFNfREJfVVJMID0gJ2h0dHBzOi8vcmVz dWx0cy53ZWJraXQub3JnLycKIFdpdGhQcm9wZXJ0aWVzID0gcHJvcGVydGllcy5XaXRoUHJvcGVy dGllcwpAQCAtMjQ0NSwyMCArMjQ0NCwyOCBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChz aGVsbC5TaGVsbENvbW1hbmQpOgogICAgICAgICByZXR1cm4gcmMKIAogCi1jbGFzcyBEb3dubG9h ZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QpOgotICAgIGNvbW1h bmQgPSBbJ3B5dGhvbicsICdUb29scy9DSVN1cHBvcnQvZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcs Ci0gICAgICAgIFdpdGhQcm9wZXJ0aWVzKCctLSUoY29uZmlndXJhdGlvbilzJyksCi0gICAgICAg IFdpdGhQcm9wZXJ0aWVzKEVXU19CVUlMRF9VUkwgKyAnYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0p cy0lKGFyY2hpdGVjdHVyZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKV0K K2NsYXNzIERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3Rlcih0cmFuc2Zlci5GaWxlRG93bmxv YWQpOgorICAgIG1hc3RlcnNyYyA9IFdpdGhQcm9wZXJ0aWVzKCdwdWJsaWNfaHRtbC9hcmNoaXZl cy8lKGZ1bGxQbGF0Zm9ybSlzLSUoYXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShw YXRjaF9pZClzLnppcCcpCisgICAgd29ya2VyZGVzdCA9IFdpdGhQcm9wZXJ0aWVzKCdXZWJLaXRC dWlsZC8lKGNvbmZpZ3VyYXRpb24pcy56aXAnKQorICAgIG5hbWUgPSAnZG93bmxvYWQtYnVpbHQt cHJvZHVjdC1mcm9tLW1hc3RlcicKKyAgICBkZXNjcmlwdGlvbiA9IFsnZG93bmxvYWRpbmcgYnVp bHQgcHJvZHVjdCBmcm9tIGJ1aWxkYm90IG1hc3RlciddCisgICAgZGVzY3JpcHRpb25Eb25lID0g WydEb3dubG9hZGVkIGJ1aWx0IHByb2R1Y3QnXQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAg ICAgZmx1bmtPbkZhaWx1cmUgPSBUcnVlCiAKKyAgICBkZWYgX19pbml0X18oc2VsZiwgKiprd2Fy Z3MpOgorICAgICAgICAjIEFsbG93IHRoZSB1bml0IHRlc3QgdG8gb3ZlcnJpZGUgbWFzdGVyc3Jj CisgICAgICAgIGlmICdtYXN0ZXJzcmMnIG5vdCBpbiBrd2FyZ3M6CisgICAgICAgICAgICBrd2Fy Z3NbJ21hc3RlcnNyYyddID0gc2VsZi5tYXN0ZXJzcmMKKyAgICAgICAga3dhcmdzWyd3b3JrZXJk ZXN0J10gPSBzZWxmLndvcmtlcmRlc3QKKyAgICAgICAga3dhcmdzWydtb2RlJ10gPSAwbzA2NDQK KyAgICAgICAga3dhcmdzWydibG9ja3NpemUnXSA9IDEwMjQgKiAyNTYKKyAgICAgICAgdHJhbnNm ZXIuRmlsZURvd25sb2FkLl9faW5pdF9fKHNlbGYsICoqa3dhcmdzKQorCiAgICAgZGVmIGdldFJl c3VsdFN1bW1hcnkoc2VsZik6CiAgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUNDRVNTOgog ICAgICAgICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBw cm9kdWN0IGZyb20gYnVpbGQgbWFzdGVyJ30KLSAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxsQ29t bWFuZC5nZXRSZXN1bHRTdW1tYXJ5KHNlbGYpCi0KLSAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNl bGYsIGNtZCk6Ci0gICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVDb21t YW5kKHNlbGYsIGNtZCkKKyAgICAgICAgcmV0dXJuIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0 RnJvbU1hc3Rlciwgc2VsZikuZ2V0UmVzdWx0U3VtbWFyeSgpCiAKIAogY2xhc3MgRXh0cmFjdEJ1 aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvbW1hbmQpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBw b3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVp bGQvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXggODRjYWUxZTYxMzNhOTVhMWY0ZDMyZjY5ZmRiYWFl NTNhYTM0MTg4ZS4uMzM1YTI4ZWNhOTgzYmFlMzgzYmVhNDJiOGM1YTIyNzMzMWEyNDhiOSAxMDA2 NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQorKysg Yi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC0zNCw3ICsz NCw3IEBAIGZyb20gYnVpbGRib3QudGVzdC5mYWtlLnJlbW90ZWNvbW1hbmQgaW1wb3J0IEV4cGVj dCwgRXhwZWN0UmVtb3RlUmVmLCBFeHBlY3RTaGVsCiBmcm9tIGJ1aWxkYm90LnRlc3QudXRpbC5z dGVwcyBpbXBvcnQgQnVpbGRTdGVwTWl4aW4KIGZyb20gYnVpbGRib3QudXRpbCBpbXBvcnQgaWRl bnRpZmllcnMgYXMgYnVpbGRib3RfaWRlbnRpZmllcnMKIGZyb20gbW9jayBpbXBvcnQgY2FsbAot ZnJvbSB0d2lzdGVkLmludGVybmV0IGltcG9ydCBlcnJvciwgcmVhY3RvcgorZnJvbSB0d2lzdGVk LmludGVybmV0IGltcG9ydCBkZWZlciwgZXJyb3IsIHJlYWN0b3IKIGZyb20gdHdpc3RlZC5weXRo b24gaW1wb3J0IGZhaWx1cmUsIGxvZwogZnJvbSB0d2lzdGVkLnRyaWFsIGltcG9ydCB1bml0dGVz dAogCkBAIC0yNTkwLDYgKzI1OTAsOCBAQCBjbGFzcyBUZXN0RG93bmxvYWRCdWlsdFByb2R1Y3Qo QnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogCiBjbGFzcyBU ZXN0RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKEJ1aWxkU3RlcE1peGluQWRkaXRpb25z LCB1bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgUkVBRF9MSU1JVCA9IDEwMDAKKwogICAgIGRlZiBz ZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUKICAgICAgICAgcmV0 dXJuIHNlbGYuc2V0VXBCdWlsZFN0ZXAoKQpAQCAtMjU5NywzOCArMjU5OSw2MyBAQCBjbGFzcyBU ZXN0RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKEJ1aWxkU3RlcE1peGluQWRkaXRpb25z LCB1bml0dGVzdC5UZXN0QwogICAgIGRlZiB0ZWFyRG93bihzZWxmKToKICAgICAgICAgcmV0dXJu IHNlbGYudGVhckRvd25CdWlsZFN0ZXAoKQogCisgICAgQHN0YXRpY21ldGhvZAorICAgIGRlZiBk b3dubG9hZEZpbGVSZWNvcmRpbmdDb250ZW50cyhsaW1pdCwgcmVjb3JkZXIpOgorICAgICAgICBk ZWYgYmVoYXZpb3IoY29tbWFuZCk6CisgICAgICAgICAgICByZWFkZXIgPSBjb21tYW5kLmFyZ3Nb J3JlYWRlciddCisgICAgICAgICAgICBkYXRhID0gcmVhZGVyLnJlbW90ZV9yZWFkKGxpbWl0KQor ICAgICAgICAgICAgcmVjb3JkZXIoZGF0YSkKKyAgICAgICAgICAgIHJlYWRlci5yZW1vdGVfY2xv c2UoKQorICAgICAgICByZXR1cm4gYmVoYXZpb3IKKworICAgIEBkZWZlci5pbmxpbmVDYWxsYmFj a3MKICAgICBkZWYgdGVzdF9zdWNjZXNzKHNlbGYpOgotICAgICAgICBzZWxmLnNldHVwU3RlcChE b3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoKSkKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAo RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKG1hc3RlcnNyYz1fX2ZpbGVfXykpCiAgICAg ICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdpb3Mtc2ltdWxhdG9yLTEyJykK ICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdyZWxlYXNlJykKICAg ICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCiAgICAgICAg IHNlbGYuc2V0UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQotICAgICAgICBzZWxmLmV4cGVj dFJlbW90ZUNvbW1hbmRzKAotICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXIn LAotICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvQ0lTdXBwb3J0L2Rvd25sb2Fk LWJ1aWx0LXByb2R1Y3QnLCAnLS1yZWxlYXNlJywgJ2h0dHBzOi8vZXdzLWJ1aWxkLndlYmtpdC5v cmcvYXJjaGl2ZXMvaW9zLXNpbXVsYXRvci0xMi14ODZfNjQtcmVsZWFzZS8xMjM0LnppcCddLAot ICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdEhpZGRlbihGYWxz ZSkKKyAgICAgICAgYnVmID0gW10KKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21tYW5kcygK KyAgICAgICAgICAgIEV4cGVjdCgnZG93bmxvYWRGaWxlJywgZGljdCgKKyAgICAgICAgICAgICAg ICB3b3JrZXJkZXN0PSdXZWJLaXRCdWlsZC9yZWxlYXNlLnppcCcsIHdvcmtkaXI9J3drZGlyJywK KyAgICAgICAgICAgICAgICBibG9ja3NpemU9MTAyNCAqIDI1NiwgbWF4c2l6ZT1Ob25lLCBtb2Rl PTBvMDY0NCwKKyAgICAgICAgICAgICAgICByZWFkZXI9RXhwZWN0UmVtb3RlUmVmKHJlbW90ZXRy YW5zZmVyLkZpbGVSZWFkZXIpLAorICAgICAgICAgICAgKSkKKyAgICAgICAgICAgICsgRXhwZWN0 LmJlaGF2aW9yKHNlbGYuZG93bmxvYWRGaWxlUmVjb3JkaW5nQ29udGVudHMoc2VsZi5SRUFEX0xJ TUlULCBidWYuYXBwZW5kKSkKICAgICAgICAgICAgICsgMCwKICAgICAgICAgKQotICAgICAgICBz ZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRlX3N0cmluZz0nRG93bmxvYWRl ZCBidWlsdCBwcm9kdWN0JykKLSAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisgICAgICAg IHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdkb3dubG9h ZGluZyB0byByZWxlYXNlLnppcCcpCiAKKyAgICAgICAgeWllbGQgc2VsZi5ydW5TdGVwKCkKKwor ICAgICAgICBidWYgPSAnJy5qb2luKGJ1ZikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4o YnVmKSwgc2VsZi5SRUFEX0xJTUlUKQorICAgICAgICB3aXRoIG9wZW4oX19maWxlX18sICdyYicp IGFzIG1hc3RlckZpbGU6CisgICAgICAgICAgICBkYXRhID0gbWFzdGVyRmlsZS5yZWFkKHNlbGYu UkVBRF9MSU1JVCkKKyAgICAgICAgICAgIGlmIGRhdGEgIT0gYnVmOgorICAgICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoYnVmLCBkYXRhKQorCisgICAgQGRlZmVyLmlubGluZUNhbGxiYWNr cwogICAgIGRlZiB0ZXN0X2ZhaWx1cmUoc2VsZik6Ci0gICAgICAgIHNlbGYuc2V0dXBTdGVwKERv d25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlcigpKQorICAgICAgICBzZWxmLnNldHVwU3RlcChE b3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIobWFzdGVyc3JjPV9fZmlsZV9fKSkKICAgICAg ICAgc2VsZi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ21hYy1zaWVycmEnKQogICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ2RlYnVnJykKICAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCiAgICAgICAgIHNlbGYuc2V0 UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQ1NicpCi0gICAgICAgIHNlbGYuZXhwZWN0UmVtb3Rl Q29tbWFuZHMoCi0gICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCi0gICAg ICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAotICAgICAgICAgICAgICAgICAg ICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9DSVN1cHBvcnQvZG93bmxvYWQtYnVpbHQt cHJvZHVjdCcsICctLWRlYnVnJywgJ2h0dHBzOi8vZXdzLWJ1aWxkLndlYmtpdC5vcmcvYXJjaGl2 ZXMvbWFjLXNpZXJyYS14ODZfNjQtZGVidWcvMTIzNDU2LnppcCddLAotICAgICAgICAgICAgICAg ICAgICAgICAgKQotICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0 PSdVbmV4cGVjdGVkIGZhaWx1cmUuJykKKyAgICAgICAgYnVmID0gW10KKyAgICAgICAgc2VsZi5l eHBlY3RSZW1vdGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdCgnZG93bmxvYWRGaWxlJywg ZGljdCgKKyAgICAgICAgICAgICAgICB3b3JrZXJkZXN0PSdXZWJLaXRCdWlsZC9kZWJ1Zy56aXAn LCB3b3JrZGlyPSd3a2RpcicsCisgICAgICAgICAgICAgICAgYmxvY2tzaXplPTEwMjQgKiAyNTYs IG1heHNpemU9Tm9uZSwgbW9kZT0wbzA2NDQsCisgICAgICAgICAgICAgICAgcmVhZGVyPUV4cGVj dFJlbW90ZVJlZihyZW1vdGV0cmFuc2Zlci5GaWxlUmVhZGVyKSwKKyAgICAgICAgICAgICkpCisg ICAgICAgICAgICArIEV4cGVjdC5iZWhhdmlvcihzZWxmLmRvd25sb2FkRmlsZVJlY29yZGluZ0Nv bnRlbnRzKHNlbGYuUkVBRF9MSU1JVCwgYnVmLmFwcGVuZCkpCiAgICAgICAgICAgICArIDIsCiAg ICAgICAgICkKICAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0 ZV9zdHJpbmc9J0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0IGZyb20gYnVpbGQgbWFz dGVyJykKLSAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisgICAgICAgIHlpZWxkIHNlbGYu cnVuU3RlcCgpCiAKIAogY2xhc3MgVGVzdEV4dHJhY3RCdWlsdFByb2R1Y3QoQnVpbGRTdGVwTWl4 aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToK