125439 2013-12-09 00:33:02 -0800 Move expectation parsing out of the constructor of TestExpectations 2013-12-18 03:37:55 -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 957780 0 dbatyai.u-szeged 2013-12-09 00:33:02 -0800 In layout_tests/models/test_expectations.py there's a FIXME suggesting that the parsing of the expectations should be moved into separate routines from the constructor. 957781 1 218728 dbatyai.u-szeged 2013-12-09 00:34:23 -0800 Created attachment 218728 Proposed patch 960879 2 218728 ossy 2013-12-18 03:09:58 -0800 Comment on attachment 218728 Proposed patch LGTM, r=me 960887 3 218728 commit-queue 2013-12-18 03:37:53 -0800 Comment on attachment 218728 Proposed patch Clearing flags on attachment: 218728 Committed r160756: <http://trac.webkit.org/changeset/160756> 960888 4 commit-queue 2013-12-18 03:37:55 -0800 All reviewed patches have been landed. Closing bug. 218728 2013-12-09 00:34:23 -0800 2013-12-18 03:37:53 -0800 Proposed patch proposedpatch.patch text/plain 16968 dbatyai.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiOWQw NzJhLi4wZjA4OWUyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTMtMTItMDkgIETDoW5pZWwgQsOhdHlhaSAgPEJh dHlhaS5EYW5pZWxAc3R1ZC51LXN6ZWdlZC5odT4KKworICAgICAgICBNb3ZlIGV4cGVjdGF0aW9u IHBhcnNpbmcgb3V0IG9mIHRoZSBjb25zdHJ1Y3RvciBvZiBUZXN0RXhwZWN0YXRpb25zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU0MzkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X3J1bm5lcl91bml0dGVz dC5weToKKyAgICAgICAgKExheW91dFRlc3RSdW5uZXJUZXN0cy5fcnVuX3Rlc3RzKToKKyAgICAg ICAgKExheW91dFRlc3RSdW5uZXJUZXN0cy50ZXN0X2ludGVycnVwdF9pZl9hdF9mYWlsdXJlX2xp bWl0cyk6CisgICAgICAgIChMYXlvdXRUZXN0UnVubmVyVGVzdHMudGVzdF91cGRhdGVfc3VtbWFy eV93aXRoX3Jlc3VsdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIucnVuKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QudGVzdF9sb29rX2Zvcl9uZXdfY3Jhc2hfbG9n cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGludF90ZXN0X2V4 cGVjdGF0aW9ucy5weToKKyAgICAgICAgKGxpbnQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRl c3RFeHBlY3RhdGlvbnMuc3VmZml4ZXNfZm9yX2V4cGVjdGF0aW9ucyk6CisgICAgICAgIChUZXN0 RXhwZWN0YXRpb25zLl9faW5pdF9fKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMpOgorICAg ICAgICAoVGVzdEV4cGVjdGF0aW9ucy5wYXJzZV9nZW5lcmljX2V4cGVjdGF0aW9ucyk6CisgICAg ICAgIChUZXN0RXhwZWN0YXRpb25zLnBhcnNlX2RlZmF1bHRfcG9ydF9leHBlY3RhdGlvbnMpOgor ICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5wYXJzZV9vdmVycmlkZV9leHBlY3RhdGlvbnMpOgor ICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5wYXJzZV9hbGxfZXhwZWN0YXRpb25zKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlv bnNfdW5pdHRlc3QucHk6CisgICAgICAgIChwYXJzZV9leHApOgorICAgICAgICAoU2tpcHBlZFRl c3RzLmNoZWNrKToKKyAgICAgICAgKFNraXBwZWRUZXN0cy50ZXN0X3NraXBwZWRfZW50cnlfZG9u dF9leGlzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfcnVuX3Jlc3VsdHNfdW5pdHRlc3QucHk6CisgICAgICAgIChydW5fcmVzdWx0cyk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHk6CisgICAg ICAgIChQcmludEV4cGVjdGF0aW9ucy5fbW9kZWwpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5OgorICAgICAgICAoUmViYXNlbGluZVRlc3Qu X3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZSk6CisgICAgICAgIChSZWJhc2VsaW5lRXhwZWN0YXRp b25zLl91cGRhdGVfZXhwZWN0YXRpb25zX2ZpbGVzKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBl Y3RhdGlvbnMuX3Rlc3RzX3RvX3JlYmFzZWxpbmUpOgorCiAyMDEzLTEyLTA1ICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGlzYWJsZSBXZWJLaXQyIHdl YmtpdHB5IHVuaXR0ZXN0cyBvbiBXaW5kb3dzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9s YXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRlc3QucHkKaW5kZXggNDA2ODcwYS4uODA5NzdlNTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L2xheW91dF90ZXN0X3J1bm5lcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRlc3Qu cHkKQEAgLTEwNCw2ICsxMDQsNyBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVyVGVzdHModW5pdHRl c3QuVGVzdENhc2UpOgogICAgIGRlZiBfcnVuX3Rlc3RzKHNlbGYsIHJ1bm5lciwgdGVzdHMpOgog ICAgICAgICB0ZXN0X2lucHV0cyA9IFtUZXN0SW5wdXQodGVzdCwgNjAwMCkgZm9yIHRlc3QgaW4g dGVzdHNdCiAgICAgICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnMocnVubmVyLl9w b3J0LCB0ZXN0cykKKyAgICAgICAgZXhwZWN0YXRpb25zLnBhcnNlX2FsbF9leHBlY3RhdGlvbnMo KQogICAgICAgICBydW5uZXIucnVuX3Rlc3RzKGV4cGVjdGF0aW9ucywgdGVzdF9pbnB1dHMsIHNl dCgpLAogICAgICAgICAgICAgbnVtX3dvcmtlcnM9MSwgbmVlZHNfaHR0cD1hbnkoJ2h0dHAnIGlu IHRlc3QgZm9yIHRlc3QgaW4gdGVzdHMpLCBuZWVkc193ZWJzb2NrZXRzPWFueShbJ3dlYnNvY2tl dCcgaW4gdGVzdCBmb3IgdGVzdCBpbiB0ZXN0c10pLCByZXRyeWluZz1GYWxzZSkKIApAQCAtMTIy LDcgKzEyMyw5IEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXJUZXN0cyh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIHRlc3RfbmFtZXMgPSBbJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCAncGFzc2VzL2lt YWdlLmh0bWwnXQogICAgICAgICBydW5uZXIuX3Rlc3RfaW5wdXRzID0gW1Rlc3RJbnB1dCh0ZXN0 X25hbWUsIDYwMDApIGZvciB0ZXN0X25hbWUgaW4gdGVzdF9uYW1lc10KIAotICAgICAgICBydW5f cmVzdWx0cyA9IFRlc3RSdW5SZXN1bHRzKFRlc3RFeHBlY3RhdGlvbnMocnVubmVyLl9wb3J0LCB0 ZXN0X25hbWVzKSwgbGVuKHRlc3RfbmFtZXMpKQorICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0 RXhwZWN0YXRpb25zKHJ1bm5lci5fcG9ydCwgdGVzdF9uYW1lcykKKyAgICAgICAgZXhwZWN0YXRp b25zLnBhcnNlX2FsbF9leHBlY3RhdGlvbnMoKQorICAgICAgICBydW5fcmVzdWx0cyA9IFRlc3RS dW5SZXN1bHRzKGV4cGVjdGF0aW9ucywgbGVuKHRlc3RfbmFtZXMpKQogICAgICAgICBydW5fcmVz dWx0cy51bmV4cGVjdGVkX2ZhaWx1cmVzID0gMTAwCiAgICAgICAgIHJ1bl9yZXN1bHRzLnVuZXhw ZWN0ZWRfY3Jhc2hlcyA9IDUwCiAgICAgICAgIHJ1bl9yZXN1bHRzLnVuZXhwZWN0ZWRfdGltZW91 dHMgPSA1MApAQCAtMTUwLDYgKzE1Myw3IEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXJUZXN0cyh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHJ1bm5lci5fb3B0aW9ucy5waXhlbF90ZXN0cyA9 IEZhbHNlCiAgICAgICAgIHRlc3QgPSAnZmFpbHVyZXMvZXhwZWN0ZWQvcmVmdGVzdC5odG1sJwog ICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zKHJ1bm5lci5fcG9ydCwgdGVz dHM9W3Rlc3RdKQorICAgICAgICBleHBlY3RhdGlvbnMucGFyc2VfYWxsX2V4cGVjdGF0aW9ucygp CiAgICAgICAgIHJ1bm5lci5fZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zCiAKICAgICAgICAg cnVuX3Jlc3VsdHMgPSBUZXN0UnVuUmVzdWx0cyhleHBlY3RhdGlvbnMsIDEpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu YWdlci5weQppbmRleCA3MzcwZDU4Li40YWIzMmU1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAg LTE4Miw2ICsxODIsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAKICAgICAgICAgc2VsZi5f cHJpbnRlci53cml0ZV91cGRhdGUoIlBhcnNpbmcgZXhwZWN0YXRpb25zIC4uLiIpCiAgICAgICAg IHNlbGYuX2V4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMo c2VsZi5fcG9ydCwgdGVzdF9uYW1lcywgZm9yY2VfZXhwZWN0YXRpb25zX3Bhc3M9c2VsZi5fb3B0 aW9ucy5mb3JjZSkKKyAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLnBhcnNlX2FsbF9leHBlY3Rh dGlvbnMoKQogCiAgICAgICAgIHRlc3RzX3RvX3J1biwgdGVzdHNfdG9fc2tpcCA9IHNlbGYuX3By ZXBhcmVfbGlzdHMocGF0aHMsIHRlc3RfbmFtZXMpCiAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJp bnRfZm91bmQobGVuKHRlc3RfbmFtZXMpLCBsZW4odGVzdHNfdG9fcnVuKSwgc2VsZi5fb3B0aW9u cy5yZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXJfdW5pdHRlc3QucHkKaW5kZXggNGE4MTU0OC4uM2FlZmMzZCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CkBAIC04NSw2ICs4NSw3IEBAIGNsYXNzIE1hbmFn ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0 b3J5LmdldCgndGVzdC1tYWMtbGVvcGFyZCcpCiAgICAgICAgIHRlc3RzID0gWydmYWlsdXJlcy9l eHBlY3RlZC9jcmFzaC5odG1sJ10KICAgICAgICAgZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3Rh dGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0ZXN0cykKKyAgICAgICAgZXhwZWN0YXRpb25z LnBhcnNlX2FsbF9leHBlY3RhdGlvbnMoKQogICAgICAgICBydW5fcmVzdWx0cyA9IFRlc3RSdW5S ZXN1bHRzKGV4cGVjdGF0aW9ucywgbGVuKHRlc3RzKSkKICAgICAgICAgbWFuYWdlciA9IGdldF9t YW5hZ2VyKCkKICAgICAgICAgbWFuYWdlci5fbG9va19mb3JfbmV3X2NyYXNoX2xvZ3MocnVuX3Jl c3VsdHMsIHRpbWUudGltZSgpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbGludF90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2xpbnRfdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggOTBlNGNi Yi4uNWZlODAyNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGludF90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9saW50X3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC02Niw4ICs2Niw5IEBA IGRlZiBsaW50KGhvc3QsIG9wdGlvbnMsIGxvZ2dpbmdfc3RyZWFtKToKICAgICAgICAgICAgICAg ICAgICAgY29udGludWUKIAogICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAg ICAgdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0X3RvX2xpbnQsCisgICAg ICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBl Y3RhdGlvbnMocG9ydF90b19saW50LAogICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0YXRp b25zX3RvX2xpbnQ9e2V4cGVjdGF0aW9uc19maWxlOiBleHBlY3RhdGlvbnNfZGljdFtleHBlY3Rh dGlvbnNfZmlsZV19KQorICAgICAgICAgICAgICAgICAgICBleHBlY3RhdGlvbnMucGFyc2VfYWxs X2V4cGVjdGF0aW9ucygpCiAgICAgICAgICAgICAgICAgZXhjZXB0IHRlc3RfZXhwZWN0YXRpb25z LlBhcnNlRXJyb3IgYXMgZToKICAgICAgICAgICAgICAgICAgICAgbGludF9mYWlsZWQgPSBUcnVl CiAgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJycpCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3Rh dGlvbnMucHkKaW5kZXggYzg0MjQ3ZC4uNDQ3NmNhYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0 aW9ucy5weQpAQCAtODMwLDkgKzgzMCw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0 KToKICAgICAgICAgICAgIHN1ZmZpeGVzLmFkZCgnd2F2JykKICAgICAgICAgcmV0dXJuIHNldChz dWZmaXhlcykKIAotICAgICMgRklYTUU6IFRoaXMgY29uc3RydWN0b3IgZG9lcyB0b28gbXVjaCB3 b3JrLiBXZSBzaG91bGQgbW92ZSB0aGUgYWN0dWFsIHBhcnNpbmcgb2YKLSAgICAjIHRoZSBleHBl Y3RhdGlvbnMgaW50byBzZXBhcmF0ZSByb3V0aW5lcyBzbyB0aGF0IGxpbnRpbmcgYW5kIGhhbmRs aW5nIG92ZXJyaWRlcwotICAgICMgY2FuIGJlIGNvbnRyb2xsZWQgc2VwYXJhdGVseSwgYW5kIHRo ZSBjb25zdHJ1Y3RvciBjYW4gYmUgbW9yZSBvZiBhIG5vLW9wLgogICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBwb3J0LCB0ZXN0cz1Ob25lLCBpbmNsdWRlX2dlbmVyaWM9VHJ1ZSwgaW5jbHVkZV9vdmVy cmlkZXM9VHJ1ZSwgZXhwZWN0YXRpb25zX3RvX2xpbnQ9Tm9uZSwgZm9yY2VfZXhwZWN0YXRpb25z X3Bhc3M9RmFsc2UpOgogICAgICAgICBzZWxmLl9mdWxsX3Rlc3RfbGlzdCA9IHRlc3RzCiAgICAg ICAgIHNlbGYuX3Rlc3RfY29uZmlnID0gcG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24oKQpAQCAtODQz LDM2ICs4NDAsNDUgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICBz ZWxmLl9za2lwcGVkX3Rlc3RzX3dhcm5pbmdzID0gW10KICAgICAgICAgc2VsZi5fZXhwZWN0YXRp b25zID0gW10KICAgICAgICAgc2VsZi5fZm9yY2VfZXhwZWN0YXRpb25zX3Bhc3MgPSBmb3JjZV9l eHBlY3RhdGlvbnNfcGFzcwotCi0gICAgICAgIGV4cGVjdGF0aW9uc19kaWN0ID0gZXhwZWN0YXRp b25zX3RvX2xpbnQgb3IgcG9ydC5leHBlY3RhdGlvbnNfZGljdCgpCi0KLSAgICAgICAgZXhwZWN0 YXRpb25zX2RpY3RfaW5kZXggPSAwCi0gICAgICAgICMgUG9wdWxhdGUgZ2VuZXJpYyBleHBlY3Rh dGlvbnMgKGlmIGVuYWJsZWQgYnkgaW5jbHVkZV9nZW5lcmljKS4KLSAgICAgICAgaWYgcG9ydC5w YXRoX3RvX2dlbmVyaWNfdGVzdF9leHBlY3RhdGlvbnNfZmlsZSgpIGluIGV4cGVjdGF0aW9uc19k aWN0OgotICAgICAgICAgICAgaWYgaW5jbHVkZV9nZW5lcmljOgotICAgICAgICAgICAgICAgIGV4 cGVjdGF0aW9ucyA9IHNlbGYuX3BhcnNlci5wYXJzZShleHBlY3RhdGlvbnNfZGljdC5rZXlzKClb ZXhwZWN0YXRpb25zX2RpY3RfaW5kZXhdLCBleHBlY3RhdGlvbnNfZGljdC52YWx1ZXMoKVtleHBl Y3RhdGlvbnNfZGljdF9pbmRleF0pCisgICAgICAgIHNlbGYuX2luY2x1ZGVfZ2VuZXJpYyA9IGlu Y2x1ZGVfZ2VuZXJpYworICAgICAgICBzZWxmLl9pbmNsdWRlX292ZXJyaWRlcyA9IGluY2x1ZGVf b3ZlcnJpZGVzCisgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9uc190b19saW50ID0gZXhwZWN0YXRp b25zX3RvX2xpbnQKKworICAgIGRlZiBwYXJzZV9nZW5lcmljX2V4cGVjdGF0aW9ucyhzZWxmKToK KyAgICAgICAgaWYgc2VsZi5fcG9ydC5wYXRoX3RvX2dlbmVyaWNfdGVzdF9leHBlY3RhdGlvbnNf ZmlsZSgpIGluIHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0OgorICAgICAgICAgICAgaWYgc2VsZi5f aW5jbHVkZV9nZW5lcmljOgorICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9ucyA9IHNlbGYuX3Bh cnNlci5wYXJzZShzZWxmLl9leHBlY3RhdGlvbnNfZGljdC5rZXlzKClbc2VsZi5fZXhwZWN0YXRp b25zX2RpY3RfaW5kZXhdLCBzZWxmLl9leHBlY3RhdGlvbnNfZGljdC52YWx1ZXMoKVtzZWxmLl9l eHBlY3RhdGlvbnNfZGljdF9pbmRleF0pCiAgICAgICAgICAgICAgICAgc2VsZi5fYWRkX2V4cGVj dGF0aW9ucyhleHBlY3RhdGlvbnMpCiAgICAgICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25z ICs9IGV4cGVjdGF0aW9ucwotICAgICAgICAgICAgZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggKz0g MQorICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggKz0gMQogCi0gICAg ICAgICMgUG9wdWxhdGUgZGVmYXVsdCBwb3J0IGV4cGVjdGF0aW9ucyAoYWx3YXlzIGVuYWJsZWQp LgotICAgICAgICBpZiBsZW4oZXhwZWN0YXRpb25zX2RpY3QpID4gZXhwZWN0YXRpb25zX2RpY3Rf aW5kZXg6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2UoZXhw ZWN0YXRpb25zX2RpY3Qua2V5cygpW2V4cGVjdGF0aW9uc19kaWN0X2luZGV4XSwgZXhwZWN0YXRp b25zX2RpY3QudmFsdWVzKClbZXhwZWN0YXRpb25zX2RpY3RfaW5kZXhdKQorICAgIGRlZiBwYXJz ZV9kZWZhdWx0X3BvcnRfZXhwZWN0YXRpb25zKHNlbGYpOgorICAgICAgICBpZiBsZW4oc2VsZi5f ZXhwZWN0YXRpb25zX2RpY3QpID4gc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RfaW5kZXg6CisgICAg ICAgICAgICBleHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2Uoc2VsZi5fZXhwZWN0YXRp b25zX2RpY3Qua2V5cygpW3NlbGYuX2V4cGVjdGF0aW9uc19kaWN0X2luZGV4XSwgc2VsZi5fZXhw ZWN0YXRpb25zX2RpY3QudmFsdWVzKClbc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RfaW5kZXhdKQog ICAgICAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhleHBlY3RhdGlvbnMpCiAgICAgICAg ICAgICBzZWxmLl9leHBlY3RhdGlvbnMgKz0gZXhwZWN0YXRpb25zCi0gICAgICAgICAgICBleHBl Y3RhdGlvbnNfZGljdF9pbmRleCArPSAxCisgICAgICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnNf ZGljdF9pbmRleCArPSAxCiAKLSAgICAgICAgIyBQb3B1bGF0ZSBvdmVycmlkZSBleHBlY3RhdGlv bnMgKGlmIGVuYWJsZWQgYnkgaW5jbHVkZV9vdmVycmlkZXMpLgotICAgICAgICB3aGlsZSBsZW4o ZXhwZWN0YXRpb25zX2RpY3QpID4gZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggYW5kIGluY2x1ZGVf b3ZlcnJpZGVzOgotICAgICAgICAgICAgZXhwZWN0YXRpb25zID0gc2VsZi5fcGFyc2VyLnBhcnNl KGV4cGVjdGF0aW9uc19kaWN0LmtleXMoKVtleHBlY3RhdGlvbnNfZGljdF9pbmRleF0sIGV4cGVj dGF0aW9uc19kaWN0LnZhbHVlcygpW2V4cGVjdGF0aW9uc19kaWN0X2luZGV4XSkKKyAgICBkZWYg cGFyc2Vfb3ZlcnJpZGVfZXhwZWN0YXRpb25zKHNlbGYpOgorICAgICAgICB3aGlsZSBsZW4oc2Vs Zi5fZXhwZWN0YXRpb25zX2RpY3QpID4gc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggYW5k IHNlbGYuX2luY2x1ZGVfb3ZlcnJpZGVzOgorICAgICAgICAgICAgZXhwZWN0YXRpb25zID0gc2Vs Zi5fcGFyc2VyLnBhcnNlKHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0LmtleXMoKVtzZWxmLl9leHBl Y3RhdGlvbnNfZGljdF9pbmRleF0sIHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0LnZhbHVlcygpW3Nl bGYuX2V4cGVjdGF0aW9uc19kaWN0X2luZGV4XSkKICAgICAgICAgICAgIHNlbGYuX2FkZF9leHBl Y3RhdGlvbnMoZXhwZWN0YXRpb25zKQogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zICs9 IGV4cGVjdGF0aW9ucwotICAgICAgICAgICAgZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggKz0gMQor ICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RfaW5kZXggKz0gMQogCi0gICAgICAg ICMgRklYTUU6IG1vdmUgaWdub3JlX3Rlc3RzIGludG8gcG9ydC5za2lwcGVkX2xheW91dF90ZXN0 cygpCi0gICAgICAgIHNlbGYuYWRkX3NraXBwZWRfdGVzdHMocG9ydC5za2lwcGVkX2xheW91dF90 ZXN0cyh0ZXN0cykudW5pb24oc2V0KHBvcnQuZ2V0X29wdGlvbignaWdub3JlX3Rlc3RzJywgW10p KSkpCisgICAgZGVmIHBhcnNlX2FsbF9leHBlY3RhdGlvbnMoc2VsZik6CisgICAgICAgIHNlbGYu X2V4cGVjdGF0aW9uc19kaWN0ID0gc2VsZi5fZXhwZWN0YXRpb25zX3RvX2xpbnQgb3Igc2VsZi5f cG9ydC5leHBlY3RhdGlvbnNfZGljdCgpCisgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0 X2luZGV4ID0gMAogCiAgICAgICAgIHNlbGYuX2hhc193YXJuaW5ncyA9IEZhbHNlCisKKyAgICAg ICAgc2VsZi5wYXJzZV9nZW5lcmljX2V4cGVjdGF0aW9ucygpCisgICAgICAgIHNlbGYucGFyc2Vf ZGVmYXVsdF9wb3J0X2V4cGVjdGF0aW9ucygpCisgICAgICAgIHNlbGYucGFyc2Vfb3ZlcnJpZGVf ZXhwZWN0YXRpb25zKCkKKworICAgICAgICAjIEZJWE1FOiBtb3ZlIGlnbm9yZV90ZXN0cyBpbnRv IHBvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKQorICAgICAgICBzZWxmLmFkZF9za2lwcGVkX3Rl c3RzKHNlbGYuX3BvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMoc2VsZi5fZnVsbF90ZXN0X2xpc3Qp LnVuaW9uKHNldChzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2lnbm9yZV90ZXN0cycsIFtdKSkpKQor CiAgICAgICAgIHNlbGYuX3JlcG9ydF93YXJuaW5ncygpCiAgICAgICAgIHNlbGYuX3Byb2Nlc3Nf dGVzdHNfd2l0aG91dF9leHBlY3RhdGlvbnMoKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBl Y3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXggMGIxZjYxNS4uZjY1NDliNiAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRp b25zX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQpAQCAtNzgsNiArNzgsNyBAQCBC dWcodGVzdCkgZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2UuaHRtbCBbIFdvbnRGaXggTWFjIF0KICAg ICAgICAgc2VsZi5fcG9ydC5leHBlY3RhdGlvbnNfZGljdCA9IGxhbWJkYTogZXhwZWN0YXRpb25z X2RpY3QKICAgICAgICAgZXhwZWN0YXRpb25zX3RvX2xpbnQgPSBleHBlY3RhdGlvbnNfZGljdCBp ZiBpc19saW50X21vZGUgZWxzZSBOb25lCiAgICAgICAgIHNlbGYuX2V4cCA9IFRlc3RFeHBlY3Rh dGlvbnMoc2VsZi5fcG9ydCwgc2VsZi5nZXRfYmFzaWNfdGVzdHMoKSwgZXhwZWN0YXRpb25zX3Rv X2xpbnQ9ZXhwZWN0YXRpb25zX3RvX2xpbnQpCisgICAgICAgIHNlbGYuX2V4cC5wYXJzZV9hbGxf ZXhwZWN0YXRpb25zKCkKIAogICAgIGRlZiBhc3NlcnRfZXhwKHNlbGYsIHRlc3QsIHJlc3VsdCk6 CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5fZXhwLm1vZGVsKCkuZ2V0X2V4cGVjdGF0 aW9ucyh0ZXN0KSwKQEAgLTI1MSw2ICsyNTIsNyBAQCBjbGFzcyBTa2lwcGVkVGVzdHMoQmFzZSk6 CiAgICAgICAgIHBvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMgPSBsYW1iZGEgdGVzdHM6IHNldChz a2lwcykKICAgICAgICAgZXhwZWN0YXRpb25zX3RvX2xpbnQgPSBleHBlY3RhdGlvbnNfZGljdCBp ZiBsaW50IGVsc2UgTm9uZQogICAgICAgICBleHAgPSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIFsn ZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJ10sIGV4cGVjdGF0aW9uc190b19saW50PWV4cGVj dGF0aW9uc190b19saW50KQorICAgICAgICBleHAucGFyc2VfYWxsX2V4cGVjdGF0aW9ucygpCiAK ICAgICAgICAgIyBDaGVjayB0aGF0IHRoZSBleHBlY3RhdGlvbiBpcyBmb3IgQlVHX0RVTU1ZIFNL SVAgOiAuLi4gWyBQYXNzIF0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHAubW9kZWwoKS5n ZXRfbW9kaWZpZXJzKCdmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnKSwKQEAgLTI4OCw2ICsy OTAsNyBAQCBjbGFzcyBTa2lwcGVkVGVzdHMoQmFzZSk6CiAgICAgICAgIGNhcHR1cmUgPSBPdXRw dXRDYXB0dXJlKCkKICAgICAgICAgY2FwdHVyZS5jYXB0dXJlX291dHB1dCgpCiAgICAgICAgIGV4 cCA9IFRlc3RFeHBlY3RhdGlvbnMocG9ydCkKKyAgICAgICAgZXhwLnBhcnNlX2FsbF9leHBlY3Rh dGlvbnMoKQogICAgICAgICBfLCBfLCBsb2dzID0gY2FwdHVyZS5yZXN0b3JlX291dHB1dCgpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ1RoZSBmb2xsb3dpbmcgdGVzdCBmb28vYmFyL2Jhei5o dG1sIGZyb20gdGhlIFNraXBwZWQgbGlzdCBkb2VzblwndCBleGlzdFxuJywgbG9ncykKIApAQCAt NDcxLDYgKzQ3NCw3IEBAIGNsYXNzIFJlbW92ZUNvbmZpZ3VyYXRpb25zVGVzdChCYXNlKToKIEJ1 Zyh5KSBbIFdpbiBNYWMgRGVidWcgXSBmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCBbIENyYXNo IF0KICIiIn0KICAgICAgICAgZXhwZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0aW9ucyh0ZXN0X3Bv cnQsIHNlbGYuZ2V0X2Jhc2ljX3Rlc3RzKCkpCisgICAgICAgIGV4cGVjdGF0aW9ucy5wYXJzZV9h bGxfZXhwZWN0YXRpb25zKCkKIAogICAgICAgICBhY3R1YWxfZXhwZWN0YXRpb25zID0gZXhwZWN0 YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdCgnZmFpbHVyZXMvZXhwZWN0ZWQv Zm9vLmh0bWwnLCB0ZXN0X2NvbmZpZykKIApAQCAtNDg5LDYgKzQ5Myw3IEBAIEJ1Zyh5KSBbIFdp biBNYWMgRGVidWcgXSBmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCBbIENyYXNoIF0KIEJ1Zyh5 KSBbIFdpbiBEZWJ1ZyBdIGZhaWx1cmVzL2V4cGVjdGVkL2Zvby5odG1sIFsgQ3Jhc2ggXQogIiIi fQogICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zKHRlc3RfcG9ydCkKKyAg ICAgICAgZXhwZWN0YXRpb25zLnBhcnNlX2FsbF9leHBlY3RhdGlvbnMoKQogCiAgICAgICAgIGFj dHVhbF9leHBlY3RhdGlvbnMgPSBleHBlY3RhdGlvbnMucmVtb3ZlX2NvbmZpZ3VyYXRpb25fZnJv bV90ZXN0KCdmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCcsIHRlc3RfY29uZmlnKQogICAgICAg ICBhY3R1YWxfZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9u X2Zyb21fdGVzdCgnZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwnLCBob3N0LnBvcnRfZmFjdG9y eS5nZXQoJ3Rlc3Qtd2luLXZpc3RhJywgTm9uZSkudGVzdF9jb25maWd1cmF0aW9uKCkpCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9y dW5fcmVzdWx0c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CmluZGV4IGE5ODViZGYuLjBh N2NhMmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X3J1bl9yZXN1bHRzX3VuaXR0ZXN0LnB5CkBA IC01MCw2ICs1MCw3IEBAIGRlZiBydW5fcmVzdWx0cyhwb3J0KToKICAgICB0ZXN0cyA9IFsncGFz c2VzL3RleHQuaHRtbCcsICdmYWlsdXJlcy9leHBlY3RlZC90aW1lb3V0Lmh0bWwnLCAnZmFpbHVy ZXMvZXhwZWN0ZWQvY3Jhc2guaHRtbCcsICdmYWlsdXJlcy9leHBlY3RlZC9oYW5nLmh0bWwnLAog ICAgICAgICAgICAgICdmYWlsdXJlcy9leHBlY3RlZC9hdWRpby5odG1sJ10KICAgICBleHBlY3Rh dGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zKHBvcnQsIHRlc3RzKQor ICAgIGV4cGVjdGF0aW9ucy5wYXJzZV9hbGxfZXhwZWN0YXRpb25zKCkKICAgICByZXR1cm4gdGVz dF9ydW5fcmVzdWx0cy5UZXN0UnVuUmVzdWx0cyhleHBlY3RhdGlvbnMsIGxlbih0ZXN0cykpCiAK IApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJp ZXMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpp bmRleCAyMDJmNjA3Li4yNDM1M2QxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtNTI0LDcgKzUyNCw5IEBAIGNsYXNzIFByaW50RXhw ZWN0YXRpb25zKENvbW1hbmQpOgogCiAgICAgZGVmIF9tb2RlbChzZWxmLCBvcHRpb25zLCBwb3J0 X25hbWUsIHRlc3RzKToKICAgICAgICAgcG9ydCA9IHNlbGYuX3Rvb2wucG9ydF9mYWN0b3J5Lmdl dChwb3J0X25hbWUsIG9wdGlvbnMpCi0gICAgICAgIHJldHVybiBUZXN0RXhwZWN0YXRpb25zKHBv cnQsIHRlc3RzKS5tb2RlbCgpCisgICAgICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlv bnMocG9ydCwgdGVzdHMpCisgICAgICAgIGV4cGVjdGF0aW9ucy5wYXJzZV9hbGxfZXhwZWN0YXRp b25zKCkKKyAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucy5tb2RlbCgpCiAKIAogY2xhc3MgUHJp bnRCYXNlbGluZXMoQ29tbWFuZCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CmluZGV4IGViOTFkYzQuLmQxM2FlZWYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBA IC0xNTIsNiArMTUyLDcgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QoQWJzdHJhY3RSZWJhc2VsaW5p bmdDb21tYW5kKToKICAgICAgICAgICAgIGxvY2sgPSBzZWxmLl90b29sLm1ha2VfZmlsZV9sb2Nr KHBhdGggKyAnLmxvY2snKQogICAgICAgICAgICAgbG9jay5hY3F1aXJlX2xvY2soKQogICAgICAg ICAgICAgZXhwZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCBpbmNsdWRlX2dlbmVy aWM9RmFsc2UsIGluY2x1ZGVfb3ZlcnJpZGVzPUZhbHNlKQorICAgICAgICAgICAgZXhwZWN0YXRp b25zLnBhcnNlX2FsbF9leHBlY3RhdGlvbnMoKQogICAgICAgICAgICAgZm9yIHRlc3RfY29uZmln dXJhdGlvbiBpbiBwb3J0LmFsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKCk6CiAgICAgICAgICAgICAg ICAgaWYgdGVzdF9jb25maWd1cmF0aW9uLnZlcnNpb24gPT0gcG9ydC50ZXN0X2NvbmZpZ3VyYXRp b24oKS52ZXJzaW9uOgogICAgICAgICAgICAgICAgICAgICBleHBlY3RhdGlvbnNTdHJpbmcgPSBl eHBlY3RhdGlvbnMucmVtb3ZlX2NvbmZpZ3VyYXRpb25fZnJvbV90ZXN0KHRlc3RfbmFtZSwgdGVz dF9jb25maWd1cmF0aW9uKQpAQCAtMzE2LDYgKzMxNyw3IEBAIGNsYXNzIFJlYmFzZWxpbmVFeHBl Y3RhdGlvbnMoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKICAgICAgICAgcG9y dCA9IHNlbGYuX3Rvb2wucG9ydF9mYWN0b3J5LmdldChwb3J0X25hbWUpCiAKICAgICAgICAgZXhw ZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0aW9ucyhwb3J0KQorICAgICAgICBleHBlY3RhdGlvbnMu cGFyc2VfYWxsX2V4cGVjdGF0aW9ucygpCiAgICAgICAgIGZvciBwYXRoIGluIHBvcnQuZXhwZWN0 YXRpb25zX2RpY3QoKToKICAgICAgICAgICAgIGlmIHNlbGYuX3Rvb2wuZmlsZXN5c3RlbS5leGlz dHMocGF0aCk6CiAgICAgICAgICAgICAgICAgc2VsZi5fdG9vbC5maWxlc3lzdGVtLndyaXRlX3Rl eHRfZmlsZShwYXRoLCBleHBlY3RhdGlvbnMucmVtb3ZlX3JlYmFzZWxpbmVkX3Rlc3RzKGV4cGVj dGF0aW9ucy5nZXRfcmViYXNlbGluaW5nX2ZhaWx1cmVzKCksIHBhdGgpKQpAQCAtMzIzLDYgKzMy NSw3IEBAIGNsYXNzIFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMoQWJzdHJhY3RQYXJhbGxlbFJlYmFz ZWxpbmVDb21tYW5kKToKICAgICBkZWYgX3Rlc3RzX3RvX3JlYmFzZWxpbmUoc2VsZiwgcG9ydCk6 CiAgICAgICAgIHRlc3RzX3RvX3JlYmFzZWxpbmUgPSB7fQogICAgICAgICBleHBlY3RhdGlvbnMg PSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIGluY2x1ZGVfb3ZlcnJpZGVzPVRydWUpCisgICAgICAg IGV4cGVjdGF0aW9ucy5wYXJzZV9hbGxfZXhwZWN0YXRpb25zKCkKICAgICAgICAgZm9yIHRlc3Qg aW4gZXhwZWN0YXRpb25zLmdldF9yZWJhc2VsaW5pbmdfZmFpbHVyZXMoKToKICAgICAgICAgICAg IHRlc3RzX3RvX3JlYmFzZWxpbmVbdGVzdF0gPSBUZXN0RXhwZWN0YXRpb25zLnN1ZmZpeGVzX2Zv cl9leHBlY3RhdGlvbnMoZXhwZWN0YXRpb25zLm1vZGVsKCkuZ2V0X2V4cGVjdGF0aW9ucyh0ZXN0 KSkKICAgICAgICAgcmV0dXJuIHRlc3RzX3RvX3JlYmFzZWxpbmUK