125218 2013-12-04 03:30:03 -0800 Remove certain methods from TestExpectations and use TestExpectationsModel instead of them 2013-12-05 02:29:23 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbatyai.u-szeged webkit-unassigned commit-queue glenn rniwa oldest_to_newest 956348 0 dbatyai.u-szeged 2013-12-04 03:30:03 -0800 In layout_tests/models/test_expectations.py, multiple instances of # FIXME: Change the callsites to use TestExpectationsModel and remove. 956349 1 218397 dbatyai.u-szeged 2013-12-04 03:30:58 -0800 Created attachment 218397 Proposed patch 956817 2 218397 commit-queue 2013-12-05 02:29:21 -0800 Comment on attachment 218397 Proposed patch Clearing flags on attachment: 218397 Committed r160165: <http://trac.webkit.org/changeset/160165> 956818 3 commit-queue 2013-12-05 02:29:23 -0800 All reviewed patches have been landed. Closing bug. 218397 2013-12-04 03:30:58 -0800 2013-12-05 02:29:21 -0800 Proposed patch proposedpatch.patch text/plain 16592 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxOWY4 ODU3Li4wNTBmMjY3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTMtMTItMDQgIETDoW5pZWwgQsOhdHlhaSAgPEJh dHlhaS5EYW5pZWxAc3R1ZC51LXN6ZWdlZC5odT4KKworICAgICAgICBSZW1vdmUgY2VydGFpbiBt ZXRob2RzIGZyb20gVGVzdEV4cGVjdGF0aW9ucyBhbmQgdXNlIFRlc3RFeHBlY3RhdGlvbnNNb2Rl bCBpbnN0ZWFkIG9mIHRoZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNTIxOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5 b3V0X3Rlc3RfZmluZGVyLnB5OgorICAgICAgICAoTGF5b3V0VGVzdEZpbmRlci5za2lwX3Rlc3Rz KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9s YXlvdXRfdGVzdF9ydW5uZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0UnVubmVyLnJ1bl90ZXN0 cyk6CisgICAgICAgIChMYXlvdXRUZXN0UnVubmVyLl91cGRhdGVfc3VtbWFyeV93aXRoX3Jlc3Vs dCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX3Rlc3RfaXNfc2xvdyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRf cmVzdWx0c19nZW5lcmF0b3IucHk6CisgICAgICAgIChKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRv ci5faW5zZXJ0X2ZhaWx1cmVfc3VtbWFyaWVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0 RXhwZWN0YXRpb25zLmdldF9yZWJhc2VsaW5pbmdfZmFpbHVyZXMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVz dC5weToKKyAgICAgICAgKGFzc2VydF9leHApOgorICAgICAgICAoTWlzY1Rlc3RzLnRlc3RfbXVs dGlwbGVfcmVzdWx0cyk6CisgICAgICAgIChNaXNjVGVzdHMudGVzdF9jYXRlZ29yeV9leHBlY3Rh dGlvbnMpOgorICAgICAgICAoTWlzY1Rlc3RzLnRlc3RfZ2V0X21vZGlmaWVycyk6CisgICAgICAg IChNaXNjVGVzdHMudGVzdF9nZXRfZXhwZWN0YXRpb25zX3N0cmluZyk6CisgICAgICAgIChNaXNj VGVzdHMudGVzdF9leHBlY3RhdGlvbl90b19zdHJpbmcpOgorICAgICAgICAoTWlzY1Rlc3RzLnRl c3RfZ2V0X3Rlc3Rfc2V0KToKKyAgICAgICAgKE1pc2NUZXN0cy50ZXN0X21vcmVfc3BlY2lmaWNf b3ZlcnJpZGVfcmVzZXRzX3NraXApOgorICAgICAgICAoU2tpcHBlZFRlc3RzLmNoZWNrKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVz dWx0cy5weToKKyAgICAgICAgKFRlc3RSdW5SZXN1bHRzLl9faW5pdF9fKToKKyAgICAgICAgKHN1 bW1hcml6ZV9yZXN1bHRzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZS5weToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuX3Rlc3Rz X3RvX3JlYmFzZWxpbmUpOgorCiAyMDEzLTEyLTAzICBEw6FuaWVsIELDoXR5YWkgIDxCYXR5YWku RGFuaWVsQHN0dWQudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmVtb3ZlIGdldF90ZXN0KCkgYW5k IHJlZmVyZW5jZSB0ZXN0IG5hbWVzIGRpcmVjdGx5IGluc3RlYWQuCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9m aW5kZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9sYXlvdXRfdGVzdF9maW5kZXIucHkKaW5kZXggNDI5YWVkZC4uN2ZmZmQ3ZSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0 X3Rlc3RfZmluZGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X2ZpbmRlci5weQpAQCAtOTYsMTAgKzk2LDEwIEBAIGNs YXNzIExheW91dFRlc3RGaW5kZXIob2JqZWN0KToKICAgICBkZWYgc2tpcF90ZXN0cyhzZWxmLCBw YXRocywgYWxsX3Rlc3RzX2xpc3QsIGV4cGVjdGF0aW9ucywgaHR0cF90ZXN0cyk6CiAgICAgICAg IGFsbF90ZXN0cyA9IHNldChhbGxfdGVzdHNfbGlzdCkKIAotICAgICAgICB0ZXN0c190b19za2lw ID0gZXhwZWN0YXRpb25zLmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKHRlc3RfZXhwZWN0YXRp b25zLlNLSVApCisgICAgICAgIHRlc3RzX3RvX3NraXAgPSBleHBlY3RhdGlvbnMubW9kZWwoKS5n ZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQKQogICAgICAg ICBpZiBzZWxmLl9vcHRpb25zLnNraXBfZmFpbGluZ190ZXN0czoKLSAgICAgICAgICAgIHRlc3Rz X3RvX3NraXAudXBkYXRlKGV4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0 ZXN0X2V4cGVjdGF0aW9ucy5GQUlMKSkKLSAgICAgICAgICAgIHRlc3RzX3RvX3NraXAudXBkYXRl KGV4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9u cy5GTEFLWSkpCisgICAgICAgICAgICB0ZXN0c190b19za2lwLnVwZGF0ZShleHBlY3RhdGlvbnMu bW9kZWwoKS5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9ucy5GQUlM KSkKKyAgICAgICAgICAgIHRlc3RzX3RvX3NraXAudXBkYXRlKGV4cGVjdGF0aW9ucy5tb2RlbCgp LmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKHRlc3RfZXhwZWN0YXRpb25zLkZMQUtZKSkKIAog ICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgPT0gJ29ubHknOgogICAgICAgICAgICAg dGVzdHNfdG9fc2tpcCA9IGFsbF90ZXN0cyAtIHRlc3RzX3RvX3NraXAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0 X3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL2xheW91dF90ZXN0X3J1bm5lci5weQppbmRleCAzZmQ0MGUzLi5kYzA5ZWFkIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlv dXRfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyLnB5CkBAIC05Niw3ICs5Niw3IEBAIGNs YXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fcHJpbnRlci5udW1f c3RhcnRlZCA9IDAKIAogICAgICAgICBpZiBub3QgcmV0cnlpbmc6Ci0gICAgICAgICAgICBzZWxm Ll9wcmludGVyLnByaW50X2V4cGVjdGVkKHJ1bl9yZXN1bHRzLCBzZWxmLl9leHBlY3RhdGlvbnMu Z2V0X3Rlc3RzX3dpdGhfcmVzdWx0X3R5cGUpCisgICAgICAgICAgICBzZWxmLl9wcmludGVyLnBy aW50X2V4cGVjdGVkKHJ1bl9yZXN1bHRzLCBzZWxmLl9leHBlY3RhdGlvbnMubW9kZWwoKS5nZXRf dGVzdHNfd2l0aF9yZXN1bHRfdHlwZSkKIAogICAgICAgICBmb3IgdGVzdF9uYW1lIGluIHNldCh0 ZXN0c190b19za2lwKToKICAgICAgICAgICAgIHJlc3VsdCA9IHRlc3RfcmVzdWx0cy5UZXN0UmVz dWx0KHRlc3RfbmFtZSkKQEAgLTE4OCw4ICsxODgsOCBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVy KG9iamVjdCk6CiAgICAgICAgICAgICBleHBlY3RlZCA9IFRydWUKICAgICAgICAgZWxzZToKICAg ICAgICAgICAgIGV4cGVjdGVkID0gc2VsZi5fZXhwZWN0YXRpb25zLm1hdGNoZXNfYW5fZXhwZWN0 ZWRfcmVzdWx0KHJlc3VsdC50ZXN0X25hbWUsIHJlc3VsdC50eXBlLCBzZWxmLl9vcHRpb25zLnBp eGVsX3Rlc3RzIG9yIHJlc3VsdC5yZWZ0ZXN0X3R5cGUpCi0gICAgICAgICAgICBleHBfc3RyID0g c2VsZi5fZXhwZWN0YXRpb25zLmdldF9leHBlY3RhdGlvbnNfc3RyaW5nKHJlc3VsdC50ZXN0X25h bWUpCi0gICAgICAgICAgICBnb3Rfc3RyID0gc2VsZi5fZXhwZWN0YXRpb25zLmV4cGVjdGF0aW9u X3RvX3N0cmluZyhyZXN1bHQudHlwZSkKKyAgICAgICAgICAgIGV4cF9zdHIgPSBzZWxmLl9leHBl Y3RhdGlvbnMubW9kZWwoKS5nZXRfZXhwZWN0YXRpb25zX3N0cmluZyhyZXN1bHQudGVzdF9uYW1l KQorICAgICAgICAgICAgZ290X3N0ciA9IHNlbGYuX2V4cGVjdGF0aW9ucy5tb2RlbCgpLmV4cGVj dGF0aW9uX3RvX3N0cmluZyhyZXN1bHQudHlwZSkKIAogICAgICAgICBydW5fcmVzdWx0cy5hZGQo cmVzdWx0LCBleHBlY3RlZCwgc2VsZi5fdGVzdF9pc19zbG93KHJlc3VsdC50ZXN0X25hbWUpKQog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weQppbmRleCBiNDMwMmMyLi43MzcwZDU4IDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHkKQEAgLTEzNyw3ICsxMzcsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAg ICAgIHJldHVybiBzZWxmLl9pc19odHRwX3Rlc3QodGVzdF9maWxlKSBvciBzZWxmLl9pc19wZXJm X3Rlc3QodGVzdF9maWxlKQogCiAgICAgZGVmIF90ZXN0X2lzX3Nsb3coc2VsZiwgdGVzdF9maWxl KToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2V4cGVjdGF0aW9ucy5oYXNfbW9kaWZpZXIodGVzdF9m aWxlLCB0ZXN0X2V4cGVjdGF0aW9ucy5TTE9XKQorICAgICAgICByZXR1cm4gc2VsZi5fZXhwZWN0 YXRpb25zLm1vZGVsKCkuaGFzX21vZGlmaWVyKHRlc3RfZmlsZSwgdGVzdF9leHBlY3RhdGlvbnMu U0xPVykKIAogICAgIGRlZiBuZWVkc19zZXJ2ZXJzKHNlbGYsIHRlc3RfbmFtZXMpOgogICAgICAg ICByZXR1cm4gYW55KHNlbGYuX3Rlc3RfcmVxdWlyZXNfbG9jayh0ZXN0X25hbWUpIGZvciB0ZXN0 X25hbWUgaW4gdGVzdF9uYW1lcykgYW5kIHNlbGYuX29wdGlvbnMuaHR0cApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9s YXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5weQpp bmRleCA3MTU0OTdkLi41MWUxODUzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRv ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5weQpAQCAtMTMyLDcgKzEzMiw3IEBA IGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmVzdWx0c19nZW5lcmF0b3Iu SlNPTlJlc3VsdHNHZW5lcmF0b3IpOgogICAgICAgICAgICAgc2VsZi5fZ2V0X2ZhaWx1cmVfc3Vt bWFyeV9lbnRyeSh0ZXN0X2V4cGVjdGF0aW9ucy5OT1cpLAogICAgICAgICAgICAgc2VsZi5GSVhB QkxFKQogICAgICAgICBzZWxmLl9pbnNlcnRfaXRlbV9pbnRvX3Jhd19saXN0KHJlc3VsdHNfZm9y X2J1aWxkZXIsCi0gICAgICAgICAgICBsZW4oc2VsZi5fZXhwZWN0YXRpb25zLmdldF90ZXN0c193 aXRoX3RpbWVsaW5lKAorICAgICAgICAgICAgbGVuKHNlbGYuX2V4cGVjdGF0aW9ucy5tb2RlbCgp LmdldF90ZXN0c193aXRoX3RpbWVsaW5lKAogICAgICAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRp b25zLk5PVykpLCBzZWxmLkFMTF9GSVhBQkxFX0NPVU5UKQogICAgICAgICBzZWxmLl9pbnNlcnRf aXRlbV9pbnRvX3Jhd19saXN0KHJlc3VsdHNfZm9yX2J1aWxkZXIsCiAgICAgICAgICAgICBzZWxm Ll9nZXRfZmFpbHVyZV9zdW1tYXJ5X2VudHJ5KHRlc3RfZXhwZWN0YXRpb25zLldPTlRGSVgpLApk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDQ4M2Q3MjAuLmM4NDI0N2QgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4 cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9t b2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTg4NCwzNiArODg0LDYgQEAgY2xhc3MgVGVz dEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgIGRlZiBnZXRfcmViYXNlbGluaW5nX2ZhaWx1cmVz KHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fbW9kZWwuZ2V0X3Rlc3Rfc2V0KFJFQkFTRUxJ TkUpCiAKLSAgICAjIEZJWE1FOiBDaGFuZ2UgdGhlIGNhbGxzaXRlcyB0byB1c2UgVGVzdEV4cGVj dGF0aW9uc01vZGVsIGFuZCByZW1vdmUuCi0gICAgZGVmIGdldF9leHBlY3RhdGlvbnMoc2VsZiwg dGVzdCk6Ci0gICAgICAgIHJldHVybiBzZWxmLl9tb2RlbC5nZXRfZXhwZWN0YXRpb25zKHRlc3Qp Ci0KLSAgICAjIEZJWE1FOiBDaGFuZ2UgdGhlIGNhbGxzaXRlcyB0byB1c2UgVGVzdEV4cGVjdGF0 aW9uc01vZGVsIGFuZCByZW1vdmUuCi0gICAgZGVmIGhhc19tb2RpZmllcihzZWxmLCB0ZXN0LCBt b2RpZmllcik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9tb2RlbC5oYXNfbW9kaWZpZXIodGVzdCwg bW9kaWZpZXIpCi0KLSAgICAjIEZJWE1FOiBDaGFuZ2UgdGhlIGNhbGxzaXRlcyB0byB1c2UgVGVz dEV4cGVjdGF0aW9uc01vZGVsIGFuZCByZW1vdmUuCi0gICAgZGVmIGdldF90ZXN0c193aXRoX3Jl c3VsdF90eXBlKHNlbGYsIHJlc3VsdF90eXBlKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX21vZGVs LmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKHJlc3VsdF90eXBlKQotCi0gICAgIyBGSVhNRTog Q2hhbmdlIHRoZSBjYWxsc2l0ZXMgdG8gdXNlIFRlc3RFeHBlY3RhdGlvbnNNb2RlbCBhbmQgcmVt b3ZlLgotICAgIGRlZiBnZXRfdGVzdF9zZXQoc2VsZiwgbW9kaWZpZXIsIGV4cGVjdGF0aW9uPU5v bmUsIGluY2x1ZGVfc2tpcHM9VHJ1ZSk6Ci0gICAgICAgIHJldHVybiBzZWxmLl9tb2RlbC5nZXRf dGVzdF9zZXQobW9kaWZpZXIsIGV4cGVjdGF0aW9uLCBpbmNsdWRlX3NraXBzKQotCi0gICAgIyBG SVhNRTogQ2hhbmdlIHRoZSBjYWxsc2l0ZXMgdG8gdXNlIFRlc3RFeHBlY3RhdGlvbnNNb2RlbCBh bmQgcmVtb3ZlLgotICAgIGRlZiBnZXRfbW9kaWZpZXJzKHNlbGYsIHRlc3QpOgotICAgICAgICBy ZXR1cm4gc2VsZi5fbW9kZWwuZ2V0X21vZGlmaWVycyh0ZXN0KQotCi0gICAgIyBGSVhNRTogQ2hh bmdlIHRoZSBjYWxsc2l0ZXMgdG8gdXNlIFRlc3RFeHBlY3RhdGlvbnNNb2RlbCBhbmQgcmVtb3Zl LgotICAgIGRlZiBnZXRfdGVzdHNfd2l0aF90aW1lbGluZShzZWxmLCB0aW1lbGluZSk6Ci0gICAg ICAgIHJldHVybiBzZWxmLl9tb2RlbC5nZXRfdGVzdHNfd2l0aF90aW1lbGluZSh0aW1lbGluZSkK LQotICAgIGRlZiBnZXRfZXhwZWN0YXRpb25zX3N0cmluZyhzZWxmLCB0ZXN0KToKLSAgICAgICAg cmV0dXJuIHNlbGYuX21vZGVsLmdldF9leHBlY3RhdGlvbnNfc3RyaW5nKHRlc3QpCi0KLSAgICBk ZWYgZXhwZWN0YXRpb25fdG9fc3RyaW5nKHNlbGYsIGV4cGVjdGF0aW9uKToKLSAgICAgICAgcmV0 dXJuIHNlbGYuX21vZGVsLmV4cGVjdGF0aW9uX3RvX3N0cmluZyhleHBlY3RhdGlvbikKLQogICAg IGRlZiBtYXRjaGVzX2FuX2V4cGVjdGVkX3Jlc3VsdChzZWxmLCB0ZXN0LCByZXN1bHQsIHBpeGVs X3Rlc3RzX2FyZV9lbmFibGVkKToKICAgICAgICAgZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYuX21v ZGVsLmdldF9leHBlY3RhdGlvbnModGVzdCkKICAgICAgICAgaWYgbm90IHBpeGVsX3Rlc3RzX2Fy ZV9lbmFibGVkOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5 CmluZGV4IDgyMWFhMGYuLjBiMWY2MTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3Rh dGlvbnNfdW5pdHRlc3QucHkKQEAgLTgwLDcgKzgwLDcgQEAgQnVnKHRlc3QpIGZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlLmh0bWwgWyBXb250Rml4IE1hYyBdCiAgICAgICAgIHNlbGYuX2V4cCA9IFRl c3RFeHBlY3RhdGlvbnMoc2VsZi5fcG9ydCwgc2VsZi5nZXRfYmFzaWNfdGVzdHMoKSwgZXhwZWN0 YXRpb25zX3RvX2xpbnQ9ZXhwZWN0YXRpb25zX3RvX2xpbnQpCiAKICAgICBkZWYgYXNzZXJ0X2V4 cChzZWxmLCB0ZXN0LCByZXN1bHQpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuX2V4 cC5nZXRfZXhwZWN0YXRpb25zKHRlc3QpLAorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYu X2V4cC5tb2RlbCgpLmdldF9leHBlY3RhdGlvbnModGVzdCksCiAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNldChbcmVzdWx0XSkpCiAKICAgICBkZWYgYXNzZXJ0X2JhZF9leHBlY3RhdGlvbnMo c2VsZiwgZXhwZWN0YXRpb25zLCBvdmVycmlkZXM9Tm9uZSk6CkBAIC05OSw3ICs5OSw3IEBAIGNs YXNzIEJhc2ljVGVzdHMoQmFzZSk6CiBjbGFzcyBNaXNjVGVzdHMoQmFzZSk6CiAgICAgZGVmIHRl c3RfbXVsdGlwbGVfcmVzdWx0cyhzZWxmKToKICAgICAgICAgc2VsZi5wYXJzZV9leHAoJ0J1Zyh4 KSBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgWyBDcmFzaCBGYWlsdXJlIF0nKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuX2V4cC5nZXRfZXhwZWN0YXRpb25zKAorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYuX2V4cC5tb2RlbCgpLmdldF9leHBlY3RhdGlvbnMoCiAgICAg ICAgICAgICAnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyksCiAgICAgICAgICAgICBzZXQo W0ZBSUwsIENSQVNIXSkpCiAKQEAgLTEzNywyOCArMTM3LDI4IEBAIGNsYXNzIE1pc2NUZXN0cyhC YXNlKToKICAgICAgICAgc2VsZi5wYXJzZV9leHAoZXhwX3N0cikKICAgICAgICAgdGVzdF9uYW1l ID0gJ2ZhaWx1cmVzL2V4cGVjdGVkL3Vua25vd24tdGVzdC5odG1sJwogICAgICAgICB1bmtub3du X3Rlc3QgPSB0ZXN0X25hbWUKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoS2V5RXJyb3IsIHNl bGYuX2V4cC5nZXRfZXhwZWN0YXRpb25zLAorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhLZXlF cnJvciwgc2VsZi5fZXhwLm1vZGVsKCkuZ2V0X2V4cGVjdGF0aW9ucywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5rbm93bl90ZXN0KQogICAgICAgICBzZWxmLmFzc2VydF9leHAoJ2ZhaWx1 cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwnLCBQQVNTKQogCiAgICAgZGVmIHRlc3RfZ2V0X21vZGlm aWVycyhzZWxmKToKICAgICAgICAgc2VsZi5wYXJzZV9leHAoc2VsZi5nZXRfYmFzaWNfZXhwZWN0 YXRpb25zKCkpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5fZXhwLmdldF9tb2RpZmll cnMoJ3Bhc3Nlcy90ZXh0Lmh0bWwnKSwgW10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2Vs Zi5fZXhwLm1vZGVsKCkuZ2V0X21vZGlmaWVycygncGFzc2VzL3RleHQuaHRtbCcpLCBbXSkKIAog ICAgIGRlZiB0ZXN0X2dldF9leHBlY3RhdGlvbnNfc3RyaW5nKHNlbGYpOgogICAgICAgICBzZWxm LnBhcnNlX2V4cChzZWxmLmdldF9iYXNpY19leHBlY3RhdGlvbnMoKSkKLSAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzZWxmLl9leHAuZ2V0X2V4cGVjdGF0aW9uc19zdHJpbmcoJ2ZhaWx1cmVzL2V4 cGVjdGVkL3RleHQuaHRtbCcpLCAnRkFJTCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2Vs Zi5fZXhwLm1vZGVsKCkuZ2V0X2V4cGVjdGF0aW9uc19zdHJpbmcoJ2ZhaWx1cmVzL2V4cGVjdGVk L3RleHQuaHRtbCcpLCAnRkFJTCcpCiAKICAgICBkZWYgdGVzdF9leHBlY3RhdGlvbl90b19zdHJp bmcoc2VsZik6CiAgICAgICAgICMgTm9ybWFsIGNhc2VzIGFyZSBoYW5kbGVkIGJ5IG90aGVyIHRl c3RzLgogICAgICAgICBzZWxmLnBhcnNlX2V4cChzZWxmLmdldF9iYXNpY19leHBlY3RhdGlvbnMo KSkKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgc2VsZi5fZXhwLmV4cGVj dGF0aW9uX3RvX3N0cmluZywKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwg c2VsZi5fZXhwLm1vZGVsKCkuZXhwZWN0YXRpb25fdG9fc3RyaW5nLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAtMSkKIAogICAgIGRlZiB0ZXN0X2dldF90ZXN0X3NldChzZWxmKToKICAgICAg ICAgIyBIYW5kbGUgc29tZSBjb3JuZXIgY2FzZXMgZm9yIHRoaXMgcm91dGluZSBub3QgY292ZXJl ZCBieSBvdGhlciB0ZXN0cy4KICAgICAgICAgc2VsZi5wYXJzZV9leHAoc2VsZi5nZXRfYmFzaWNf ZXhwZWN0YXRpb25zKCkpCi0gICAgICAgIHMgPSBzZWxmLl9leHAuZ2V0X3Rlc3Rfc2V0KFdPTlRG SVgpCisgICAgICAgIHMgPSBzZWxmLl9leHAubW9kZWwoKS5nZXRfdGVzdF9zZXQoV09OVEZJWCkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzLAogICAgICAgICAgICAgc2V0KFsnZmFpbHVyZXMv ZXhwZWN0ZWQvY3Jhc2guaHRtbCcsCiAgICAgICAgICAgICAgICAgICdmYWlsdXJlcy9leHBlY3Rl ZC9pbWFnZV9jaGVja3N1bS5odG1sJ10pKQpAQCAtMjM2LDcgKzIzNiw3IEBAIGNsYXNzIE1pc2NU ZXN0cyhCYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmYWlsdXJlcy9leHBlY3RlZC90 ZXh0Lmh0bWwnLCBJTUFHRSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLl9wb3J0Ll9m aWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdmYWlsdXJlcy9leHBl Y3RlZC90ZXh0Lmh0bWwnKSBpbgotICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2V4cC5n ZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZShTS0lQKSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICBzZWxmLl9leHAubW9kZWwoKS5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZShTS0lQKSkKIAog CiBjbGFzcyBTa2lwcGVkVGVzdHMoQmFzZSk6CkBAIC0yNTMsOSArMjUzLDkgQEAgY2xhc3MgU2tp cHBlZFRlc3RzKEJhc2UpOgogICAgICAgICBleHAgPSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIFsn ZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJ10sIGV4cGVjdGF0aW9uc190b19saW50PWV4cGVj dGF0aW9uc190b19saW50KQogCiAgICAgICAgICMgQ2hlY2sgdGhhdCB0aGUgZXhwZWN0YXRpb24g aXMgZm9yIEJVR19EVU1NWSBTS0lQIDogLi4uIFsgUGFzcyBdCi0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZXhwLmdldF9tb2RpZmllcnMoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpLAor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cC5tb2RlbCgpLmdldF9tb2RpZmllcnMoJ2ZhaWx1 cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpLAogICAgICAgICAgICAgICAgICAgICAgICAgICBbVGVz dEV4cGVjdGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19NT0RJRklFUiwgVGVzdEV4cGVjdGF0aW9uUGFy c2VyLlNLSVBfTU9ESUZJRVIsIFRlc3RFeHBlY3RhdGlvblBhcnNlci5XT05URklYX01PRElGSUVS XSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHAuZ2V0X2V4cGVjdGF0aW9ucygnZmFpbHVy ZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyksIHNldChbUEFTU10pKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGV4cC5tb2RlbCgpLmdldF9leHBlY3RhdGlvbnMoJ2ZhaWx1cmVzL2V4cGVjdGVkL3Rl eHQuaHRtbCcpLCBzZXQoW1BBU1NdKSkKIAogICAgIGRlZiB0ZXN0X3NraXBwZWRfdGVzdHNfd29y ayhzZWxmKToKICAgICAgICAgc2VsZi5jaGVjayhleHBlY3RhdGlvbnM9JycsIG92ZXJyaWRlcz1O b25lLCBza2lwcz1bJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCddKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfcnVuX3Jlc3Vs dHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9y dW5fcmVzdWx0cy5weQppbmRleCA3NjMyMzY0Li43NzNjMjZlIDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5fcmVzdWx0cy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9ydW5f cmVzdWx0cy5weQpAQCAtNTcsNyArNTcsNyBAQCBjbGFzcyBUZXN0UnVuUmVzdWx0cyhvYmplY3Qp OgogICAgICAgICBmb3IgZXhwZWN0YXRpb24gaW4gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVj dGF0aW9ucy5FWFBFQ1RBVElPTlMudmFsdWVzKCk6CiAgICAgICAgICAgICBzZWxmLnRlc3RzX2J5 X2V4cGVjdGF0aW9uW2V4cGVjdGF0aW9uXSA9IHNldCgpCiAgICAgICAgIGZvciB0aW1lbGluZSBp biB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zLlRJTUVMSU5FUy52YWx1ZXMoKToK LSAgICAgICAgICAgIHNlbGYudGVzdHNfYnlfdGltZWxpbmVbdGltZWxpbmVdID0gZXhwZWN0YXRp b25zLmdldF90ZXN0c193aXRoX3RpbWVsaW5lKHRpbWVsaW5lKQorICAgICAgICAgICAgc2VsZi50 ZXN0c19ieV90aW1lbGluZVt0aW1lbGluZV0gPSBleHBlY3RhdGlvbnMubW9kZWwoKS5nZXRfdGVz dHNfd2l0aF90aW1lbGluZSh0aW1lbGluZSkKICAgICAgICAgc2VsZi5zbG93X3Rlc3RzID0gc2V0 KCkKICAgICAgICAgc2VsZi5pbnRlcnJ1cHRlZCA9IEZhbHNlCiAKQEAgLTE1NCw3ICsxNTQsNyBA QCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9ucywgaW5pdGlhbF9y ZXN1bHRzLCByZXRyeV9yZXN1bHRzLCBlbgogICAgICAgICAjIE5vdGUgdGhhdCBpZiBhIHRlc3Qg Y3Jhc2hlZCBpbiB0aGUgb3JpZ2luYWwgcnVuLCB3ZSBpZ25vcmUKICAgICAgICAgIyB3aGV0aGVy IG9yIG5vdCBpdCBjcmFzaGVkIHdoZW4gd2UgcmV0cmllZCBpdCAoaWYgd2UgcmV0cmllZCBpdCks CiAgICAgICAgICMgYW5kIGFsd2F5cyBjb25zaWRlciB0aGUgcmVzdWx0IG5vdCBmbGFreS4KLSAg ICAgICAgZXhwZWN0ZWQgPSBleHBlY3RhdGlvbnMuZ2V0X2V4cGVjdGF0aW9uc19zdHJpbmcodGVz dF9uYW1lKQorICAgICAgICBleHBlY3RlZCA9IGV4cGVjdGF0aW9ucy5tb2RlbCgpLmdldF9leHBl Y3RhdGlvbnNfc3RyaW5nKHRlc3RfbmFtZSkKICAgICAgICAgcmVzdWx0X3R5cGUgPSByZXN1bHQu dHlwZQogICAgICAgICBhY3R1YWwgPSBba2V5d29yZHNbcmVzdWx0X3R5cGVdXQogCkBAIC0xNjgs NyArMTY4LDcgQEAgZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlvbnMs IGluaXRpYWxfcmVzdWx0cywgcmV0cnlfcmVzdWx0cywgZW4KICAgICAgICAgaWYgcmVzdWx0LnJl ZnRlc3RfdHlwZToKICAgICAgICAgICAgIHRlc3RfZGljdC51cGRhdGUocmVmdGVzdF90eXBlPWxp c3QocmVzdWx0LnJlZnRlc3RfdHlwZSkpCiAKLSAgICAgICAgaWYgZXhwZWN0YXRpb25zLmhhc19t b2RpZmllcih0ZXN0X25hbWUsIHRlc3RfZXhwZWN0YXRpb25zLldPTlRGSVgpOgorICAgICAgICBp ZiBleHBlY3RhdGlvbnMubW9kZWwoKS5oYXNfbW9kaWZpZXIodGVzdF9uYW1lLCB0ZXN0X2V4cGVj dGF0aW9ucy5XT05URklYKToKICAgICAgICAgICAgIHRlc3RfZGljdFsnd29udGZpeCddID0gVHJ1 ZQogCiAgICAgICAgIGlmIHJlc3VsdF90eXBlID09IHRlc3RfZXhwZWN0YXRpb25zLlBBU1M6CkBA IC0xODQsNyArMTg0LDcgQEAgZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3Rh dGlvbnMsIGluaXRpYWxfcmVzdWx0cywgcmV0cnlfcmVzdWx0cywgZW4KICAgICAgICAgICAgICAg ICBudW1fbWlzc2luZyArPSAxCiAgICAgICAgIGVsaWYgdGVzdF9uYW1lIGluIGluaXRpYWxfcmVz dWx0cy51bmV4cGVjdGVkX3Jlc3VsdHNfYnlfbmFtZToKICAgICAgICAgICAgIGlmIHJldHJ5X3Jl c3VsdHMgYW5kIHRlc3RfbmFtZSBub3QgaW4gcmV0cnlfcmVzdWx0cy51bmV4cGVjdGVkX3Jlc3Vs dHNfYnlfbmFtZToKLSAgICAgICAgICAgICAgICBhY3R1YWwuZXh0ZW5kKGV4cGVjdGF0aW9ucy5n ZXRfZXhwZWN0YXRpb25zX3N0cmluZyh0ZXN0X25hbWUpLnNwbGl0KCIgIikpCisgICAgICAgICAg ICAgICAgYWN0dWFsLmV4dGVuZChleHBlY3RhdGlvbnMubW9kZWwoKS5nZXRfZXhwZWN0YXRpb25z X3N0cmluZyh0ZXN0X25hbWUpLnNwbGl0KCIgIikpCiAgICAgICAgICAgICAgICAgbnVtX2ZsYWt5 ICs9IDEKICAgICAgICAgICAgIGVsaWYgcmV0cnlfcmVzdWx0czoKICAgICAgICAgICAgICAgICBy ZXRyeV9yZXN1bHRfdHlwZSA9IHJldHJ5X3Jlc3VsdHMudW5leHBlY3RlZF9yZXN1bHRzX2J5X25h bWVbdGVzdF9uYW1lXS50eXBlCkBAIC0yMDQsNyArMjA0LDcgQEAgZGVmIHN1bW1hcml6ZV9yZXN1 bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlvbnMsIGluaXRpYWxfcmVzdWx0cywgcmV0cnlfcmVzdWx0 cywgZW4KICAgICAgICAgaWYgaW5jbHVkZV90aW1lX2FuZF9tb2RpZmllcnM6CiAgICAgICAgICAg ICB0ZXN0X2RpY3RbJ3RpbWUnXSA9IHJvdW5kKDEwMDAgKiByZXN1bHQudGVzdF9ydW5fdGltZSkK ICAgICAgICAgICAgICMgRklYTUU6IEZpeCBnZXRfbW9kaWZpZXJzIHRvIHJldHVybiBtb2RpZmll cnMgaW4gbmV3IGZvcm1hdC4KLSAgICAgICAgICAgIHRlc3RfZGljdFsnbW9kaWZpZXJzJ10gPSAn ICcuam9pbihleHBlY3RhdGlvbnMuZ2V0X21vZGlmaWVycyh0ZXN0X25hbWUpKS5yZXBsYWNlKCdC VUdXSycsICd3ZWJraXQub3JnL2IvJykKKyAgICAgICAgICAgIHRlc3RfZGljdFsnbW9kaWZpZXJz J10gPSAnICcuam9pbihleHBlY3RhdGlvbnMubW9kZWwoKS5nZXRfbW9kaWZpZXJzKHRlc3RfbmFt ZSkpLnJlcGxhY2UoJ0JVR1dLJywgJ3dlYmtpdC5vcmcvYi8nKQogCiAgICAgICAgIHRlc3RfZGlj dC51cGRhdGUoX2ludGVycHJldF90ZXN0X2ZhaWx1cmVzKHJlc3VsdC5mYWlsdXJlcykpCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5l LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkK aW5kZXggOTg5ODY3My4uZWI5MWRjNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKQEAgLTMyNCw3ICszMjQsNyBAQCBjbGFzcyBS ZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZCk6 CiAgICAgICAgIHRlc3RzX3RvX3JlYmFzZWxpbmUgPSB7fQogICAgICAgICBleHBlY3RhdGlvbnMg PSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIGluY2x1ZGVfb3ZlcnJpZGVzPVRydWUpCiAgICAgICAg IGZvciB0ZXN0IGluIGV4cGVjdGF0aW9ucy5nZXRfcmViYXNlbGluaW5nX2ZhaWx1cmVzKCk6Ci0g ICAgICAgICAgICB0ZXN0c190b19yZWJhc2VsaW5lW3Rlc3RdID0gVGVzdEV4cGVjdGF0aW9ucy5z dWZmaXhlc19mb3JfZXhwZWN0YXRpb25zKGV4cGVjdGF0aW9ucy5nZXRfZXhwZWN0YXRpb25zKHRl c3QpKQorICAgICAgICAgICAgdGVzdHNfdG9fcmViYXNlbGluZVt0ZXN0XSA9IFRlc3RFeHBlY3Rh dGlvbnMuc3VmZml4ZXNfZm9yX2V4cGVjdGF0aW9ucyhleHBlY3RhdGlvbnMubW9kZWwoKS5nZXRf ZXhwZWN0YXRpb25zKHRlc3QpKQogICAgICAgICByZXR1cm4gdGVzdHNfdG9fcmViYXNlbGluZQog CiAgICAgZGVmIF9hZGRfdGVzdHNfdG9fcmViYXNlbGluZV9mb3JfcG9ydChzZWxmLCBwb3J0X25h bWUpOgo=