104158 2012-12-05 13:06:04 -0800 nrwt: collect all of the information about a run into a new RunDetails class 2012-12-05 15:27:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104072 103824 104165 1 dpranke dpranke abarth eric ojan rniwa oldest_to_newest 784036 0 dpranke 2012-12-05 13:06:04 -0800 nrwt: collect all of the information about a run into a new RunDetails class 784037 1 177815 dpranke 2012-12-05 13:07:42 -0800 Created attachment 177815 Patch 784094 2 177815 rniwa 2012-12-05 14:03:20 -0800 Comment on attachment 177815 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177815&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:59 > +class RunDetails(object): I’m not sure if RunDetails is a descriptive name. "run" is an overloaded word and can mean a lot of things. How about something like ManagerResults or simply LayoutTestResults? 784102 3 177815 ojan 2012-12-05 14:11:08 -0800 Comment on attachment 177815 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177815&action=review >> Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:59 >> +class RunDetails(object): > > I’m not sure if RunDetails is a descriptive name. "run" is an overloaded word and can mean a lot of things. > How about something like ManagerResults or simply LayoutTestResults? Those are overloaded too. It's hard to think of a name that doesn't have this problem. This class not used that widely, so I'm not too worried about this. > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:420 > + if options.lint_test_files: > + return lint(port, options) Really we should just move this into a different script entirely. LintTestExpectations or whatever. 784117 4 dpranke 2012-12-05 14:29:34 -0800 (In reply to comment #3) > (From update of attachment 177815 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177815&action=review > > >> Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:59 > >> +class RunDetails(object): > > > > I’m not sure if RunDetails is a descriptive name. "run" is an overloaded word and can mean a lot of things. > > How about something like ManagerResults or simply LayoutTestResults? > > Those are overloaded too. It's hard to think of a name that doesn't have this problem. This class not used that widely, so I'm not too worried about this. > I'm going to defer the name-picking until a couple patches from now, when I will rename the ResultSummary class as well, if that's okay ... > > Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:420 > > + if options.lint_test_files: > > + return lint(port, options) > > Really we should just move this into a different script entirely. LintTestExpectations or whatever. Yeah, I've been tempted to do that for some time. Probably a good idea. 784183 5 dpranke 2012-12-05 15:27:15 -0800 Committed r136769: <http://trac.webkit.org/changeset/136769> 177815 2012-12-05 13:07:42 -0800 2012-12-05 14:11:08 -0800 Patch bug-104158-20121205130507.patch text/plain 11276 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NzMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDEzMDliNjQzYWFiOWY3YWY0YThlMmY0MjMzMTJlODQz ZmQ1MTA1Ny4uYjlkOTBlYTdlNzI5YmJkYWM0N2NkNGI4MzVmZGNhNzM3NmU3Yjc1MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1 IEBACiAyMDEyLTEyLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNvbGxlY3QgYWxsIG9mIHRoZSBpbmZvcm1hdGlvbiBhYm91dCBhIHJ1biBp bnRvIGEgbmV3IFJ1bkRldGFpbHMgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwNDE1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggY29sbGVjdHMgdGhlIGluZm9ybWF0aW9uIGZy b20gYm90aCB0ZXN0IHBhc3NlcyAodGhlCisgICAgICAgIG1haW4gb25lIGFuZCB0aGUgcmV0cmll cykgYXMgd2VsbCBhcyB0aGUgc3VtbWFyaXplZCByZXN1bHRzIGFuZAorICAgICAgICB0aGUgZXhp dCBjb2RlIGludG8gYSBSdW5EZXRhaWxzIGNsYXNzLCBzbyB0aGF0IHRoZSBpbnRlZ3JhdGlvbgor ICAgICAgICB0ZXN0cyBjYW4gbW9yZSBlYXNpbHkgdGVsbCB3aGF0IGhhcHBlbmVkLgorCisgICAg ICAgIEFsc28sIGNoYW5nZSB0aGUgd2F5IHRoZSAtLWxpbnQtdGVzdC1maWxlcyB3b3JrcyBzbGln aHRseSBzbyB0aGF0CisgICAgICAgIHdlIGRvbid0IG5lZWQgdG8gY3JlYXRlIGEgcHJpbnRlciBv YmplY3QgKGFuZCBoZW5jZSB3ZSBuZWVkIHRvCisgICAgICAgIHJld29yayB0aGUgdGVzdHMgdGhh dCBhcmUgdGVzdGluZyBsb2dnaW5nKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHk6CisgICAgICAgIChSdW5EZXRhaWxzKToK KyAgICAgICAgKFJ1bkRldGFpbHMuX19pbml0X18pOgorICAgICAgICAoTWFuYWdlci5ydW4pOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHk6CisgICAgICAgIChydW4pOgorICAgICAgICAobWFpbik6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6 CisgICAgICAgIChwYXNzaW5nX3J1bik6CisgICAgICAgIChydW5fYW5kX2NhcHR1cmUpOgorICAg ICAgICAoTGludFRlc3QudGVzdF9saW50X3Rlc3RfZmlsZXMpOgorICAgICAgICAoTGludFRlc3Qu dGVzdF9saW50X3Rlc3RfZmlsZXNfX2Vycm9ycyk6CisgICAgICAgIChNYWluVGVzdC50ZXN0X3Zl cmJvc2VfaW5fY2hpbGRfcHJvY2Vzc2VzKToKKworMjAxMi0xMi0wNSAgRGlyayBQcmFua2UgIDxk cHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICBucnd0OiByZW1vdmUgLS1uby1yZWNvcmQt cmVzdWx0cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA0MDcyCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IGUwY2I4ODEwMjBmMjJkZWRlZDEwNGM5 OTBiNTRkZTdlZGNjMGNmZTAuLjI3MGQxNDhjN2Y4MGZjZDNiNWQxYWM3OWY0NGYxYjQ0Njk4YWFk ODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtNTYsNiArNTYsMTQgQEAgQlVJTERFUl9CQVNF X1VSTCA9ICJodHRwOi8vYnVpbGQuY2hyb21pdW0ub3JnL2J1aWxkYm90L2xheW91dF90ZXN0X3Jl c3VsdHMvIgogVGVzdEV4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3Rh dGlvbnMKIAogCitjbGFzcyBSdW5EZXRhaWxzKG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIGV4aXRfY29kZSwgc3VtbWFyaXplZF9yZXN1bHRzPU5vbmUsIHJlc3VsdF9zdW1tYXJ5PU5v bmUsIHJldHJ5X3N1bW1hcnk9Tm9uZSk6CisgICAgICAgIHNlbGYuZXhpdF9jb2RlID0gZXhpdF9j b2RlCisgICAgICAgIHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzID0gc3VtbWFyaXplZF9yZXN1bHRz CisgICAgICAgIHNlbGYucmVzdWx0X3N1bW1hcnkgPSByZXN1bHRfc3VtbWFyeQorICAgICAgICBz ZWxmLnJldHJ5X3N1bW1hcnkgPSByZXRyeV9zdW1tYXJ5CisKKwogZGVmIGludGVycHJldF90ZXN0 X2ZhaWx1cmVzKGZhaWx1cmVzKToKICAgICB0ZXN0X2RpY3QgPSB7fQogICAgIGZhaWx1cmVfdHlw ZXMgPSBbdHlwZShmYWlsdXJlKSBmb3IgZmFpbHVyZSBpbiBmYWlsdXJlc10KQEAgLTMzMSwxMyAr MzM5LDEzIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgcmV0dXJuIFRydWUKIAog ICAgIGRlZiBydW4oc2VsZiwgYXJncyk6Ci0gICAgICAgICIiIlJ1biBhbGwgb3VyIHRlc3RzIG9u IGFsbCBvdXIgdGVzdCBmaWxlcyBhbmQgcmV0dXJuIHRoZSBudW1iZXIgb2YgdW5leHBlY3RlZCBy ZXN1bHRzICgwID09IHN1Y2Nlc3MpLiIiIgorICAgICAgICAiIiJSdW4gdGhlIHRlc3RzIGFuZCBy ZXR1cm4gYSBSdW5EZXRhaWxzIG9iamVjdCB3aXRoIHRoZSByZXN1bHRzLiIiIgogICAgICAgICBz ZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgiQ29sbGVjdGluZyB0ZXN0cyAuLi4iKQogICAgICAg ICB0cnk6CiAgICAgICAgICAgICBwYXRocywgdGVzdF9uYW1lcyA9IHNlbGYuX2NvbGxlY3RfdGVz dHMoYXJncykKICAgICAgICAgZXhjZXB0IElPRXJyb3I6CiAgICAgICAgICAgICAjIFRoaXMgaXMg cmFpc2VkIGlmIC0tdGVzdC1saXN0IGRvZXNuJ3QgZXhpc3QKLSAgICAgICAgICAgIHJldHVybiAt MQorICAgICAgICAgICAgcmV0dXJuIFJ1bkRldGFpbHMoZXhpdF9jb2RlPS0xKQogCiAgICAgICAg IHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJQYXJzaW5nIGV4cGVjdGF0aW9ucyAuLi4iKQog ICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0 YXRpb25zKHNlbGYuX3BvcnQsIHRlc3RfbmFtZXMpCkBAIC0zNDgsMTAgKzM1NiwxMCBAQCBjbGFz cyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICMgQ2hlY2sgdG8gbWFrZSBzdXJlIHdlJ3JlIG5v dCBza2lwcGluZyBldmVyeSB0ZXN0LgogICAgICAgICBpZiBub3QgdGVzdHNfdG9fcnVuOgogICAg ICAgICAgICAgX2xvZy5jcml0aWNhbCgnTm8gdGVzdHMgdG8gcnVuLicpCi0gICAgICAgICAgICBy ZXR1cm4gLTEKKyAgICAgICAgICAgIHJldHVybiBSdW5EZXRhaWxzKGV4aXRfY29kZT0tMSkKIAog ICAgICAgICBpZiBub3Qgc2VsZi5fc2V0X3VwX3J1bih0ZXN0c190b19ydW4pOgotICAgICAgICAg ICAgcmV0dXJuIC0xCisgICAgICAgICAgICByZXR1cm4gUnVuRGV0YWlscyhleGl0X2NvZGU9LTEp CiAKICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAgICAgICAgIHRyeToKQEAgLTM5 MSw3ICszOTksOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzZWxmLl9vcHRpb25zLmZ1bGxfcmVzdWx0c19o dG1sIGFuZCByZXN1bHRfc3VtbWFyeS50b3RhbF9mYWlsdXJlcykpOgogICAgICAgICAgICAgICAg IHNlbGYuX3BvcnQuc2hvd19yZXN1bHRzX2h0bWxfZmlsZShyZXN1bHRzX3BhdGgpCiAKLSAgICAg ICAgcmV0dXJuIHNlbGYuX3BvcnQuZXhpdF9jb2RlX2Zyb21fc3VtbWFyaXplZF9yZXN1bHRzKHN1 bW1hcml6ZWRfcmVzdWx0cykKKyAgICAgICAgcmV0dXJuIFJ1bkRldGFpbHMoc2VsZi5fcG9ydC5l eGl0X2NvZGVfZnJvbV9zdW1tYXJpemVkX3Jlc3VsdHMoc3VtbWFyaXplZF9yZXN1bHRzKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzLCByZXN1bHRfc3VtbWFy eSwgcmV0cnlfc3VtbWFyeSkKIAogICAgIGRlZiBfcnVuX3Rlc3RzKHNlbGYsIHRlc3RzX3RvX3J1 biwgdGVzdHNfdG9fc2tpcCwgcmVwZWF0X2VhY2gsIGl0ZXJhdGlvbnMsIG51bV93b3JrZXJzLCBy ZXRyeWluZyk6CiAgICAgICAgIG5lZWRzX2h0dHAgPSBzZWxmLl9wb3J0LnJlcXVpcmVzX2h0dHBf c2VydmVyKCkgb3IgYW55KHNlbGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSBmb3IgdGVzdCBpbiB0ZXN0 c190b19ydW4pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBjYzg2YTdiY2UwMjgzMDMwODlmZmNjNmYwZDIw MzNjYmUyOTBlYWNjLi41OTE2ZGY2M2VhNGE3N2MyMzUzODMxYzhiZWYwNDVmYjhjZjVmMTE5IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKQEAgLTkxLDE5ICs5MSwxNiBAQCBkZWYgcnVuKHBvcnQsIG9wdGlvbnMs IGFyZ3MsIHJlZ3VsYXJfb3V0cHV0PXN5cy5zdGRlcnIsIGJ1aWxkYm90X291dHB1dD1zeXMuc3Rk bwogICAgICAgICBwcmludGVyID0gcHJpbnRpbmcuUHJpbnRlcihwb3J0LCBvcHRpb25zLCByZWd1 bGFyX291dHB1dCwgYnVpbGRib3Rfb3V0cHV0LCBsb2dnZXI9bG9nZ2luZy5nZXRMb2dnZXIoKSkK IAogICAgICAgICBfc2V0X3VwX2Rlcml2ZWRfb3B0aW9ucyhwb3J0LCBvcHRpb25zKQotCi0gICAg ICAgIGlmIG9wdGlvbnMubGludF90ZXN0X2ZpbGVzOgotICAgICAgICAgICAgcmV0dXJuIGxpbnQo cG9ydCwgb3B0aW9ucykKLQogICAgICAgICBtYW5hZ2VyID0gTWFuYWdlcihwb3J0LCBvcHRpb25z LCBwcmludGVyKQogICAgICAgICBwcmludGVyLnByaW50X2NvbmZpZyhwb3J0LnJlc3VsdHNfZGly ZWN0b3J5KCkpCiAKLSAgICAgICAgdW5leHBlY3RlZF9yZXN1bHRfY291bnQgPSBtYW5hZ2VyLnJ1 bihhcmdzKQotICAgICAgICBfbG9nLmRlYnVnKCJUZXN0aW5nIGNvbXBsZXRlZCwgRXhpdCBzdGF0 dXM6ICVkIiAlIHVuZXhwZWN0ZWRfcmVzdWx0X2NvdW50KQotICAgICAgICByZXR1cm4gdW5leHBl Y3RlZF9yZXN1bHRfY291bnQKKyAgICAgICAgcnVuX2RldGFpbHMgPSBtYW5hZ2VyLnJ1bihhcmdz KQorICAgICAgICBfbG9nLmRlYnVnKCJUZXN0aW5nIGNvbXBsZXRlZCwgRXhpdCBzdGF0dXM6ICVk IiAlIHJ1bl9kZXRhaWxzLmV4aXRfY29kZSkKKyAgICAgICAgcmV0dXJuIHJ1bl9kZXRhaWxzCiAg ICAgZmluYWxseToKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkKIAorCiBkZWYgX3NldF91cF9k ZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucyk6CiAgICAgIiIiU2V0cyB0aGUgb3B0aW9ucyB2 YWx1ZXMgdGhhdCBkZXBlbmQgb24gb3RoZXIgb3B0aW9ucyB2YWx1ZXMuIiIiCiAgICAgaWYgbm90 IG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzOgpAQCAtNDE5LDcgKzQxNiw5IEBAIGRlZiBtYWluKGFy Z3Y9Tm9uZSk6CiAKICAgICBsb2dnaW5nLmdldExvZ2dlcigpLnNldExldmVsKGxvZ2dpbmcuREVC VUcgaWYgb3B0aW9ucy5kZWJ1Z19yd3RfbG9nZ2luZyBlbHNlIGxvZ2dpbmcuSU5GTykKICAgICB0 cnk6Ci0gICAgICAgIHJldHVybiBydW4ocG9ydCwgb3B0aW9ucywgYXJncykKKyAgICAgICAgaWYg b3B0aW9ucy5saW50X3Rlc3RfZmlsZXM6CisgICAgICAgICAgICByZXR1cm4gbGludChwb3J0LCBv cHRpb25zKQorICAgICAgICByZXR1cm4gcnVuKHBvcnQsIG9wdGlvbnMsIGFyZ3MpLmV4aXRfY29k ZQogICAgIGV4Y2VwdCBFeGNlcHRpb24sIGU6CiAgICAgICAgIHByaW50ID4+IHN5cy5zdGRlcnIs ICdcbiVzIHJhaXNlZDogJXMnICUgKGUuX19jbGFzc19fLl9fbmFtZV9fLCBzdHIoZSkpCiAgICAg ICAgIHRyYWNlYmFjay5wcmludF9leGMoZmlsZT1zeXMuc3RkZXJyKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3Jh dGlvbnRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQppbmRleCA3Yjk2OWYxNjRlNmM1NDVhYjk5MDY1 YjQzNzQ2Y2EyZWJlYjUxNjM4Li4yY2E2ZmExNTVkZDAyMDQyODBmNTdjOWU5ZmE3YTY3ZTU5MTFi ZmEyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQpAQCAt ODgsOCArODgsOCBAQCBkZWYgcGFzc2luZ19ydW4oZXh0cmFfYXJncz1Ob25lLCBwb3J0X29iaj1O b25lLCB0ZXN0c19pbmNsdWRlZD1GYWxzZSwgaG9zdD1Ob25lLAogCiAgICAgYnVpbGRib3Rfb3V0 cHV0ID0gU3RyaW5nSU8uU3RyaW5nSU8oKQogICAgIHJlZ3VsYXJfb3V0cHV0ID0gU3RyaW5nSU8u U3RyaW5nSU8oKQotICAgIHJlcyA9IHJ1bl93ZWJraXRfdGVzdHMucnVuKHBvcnRfb2JqLCBvcHRp b25zLCBwYXJzZWRfYXJncywgYnVpbGRib3Rfb3V0cHV0PWJ1aWxkYm90X291dHB1dCwgcmVndWxh cl9vdXRwdXQ9cmVndWxhcl9vdXRwdXQpCi0gICAgcmV0dXJuIHJlcyA9PSAwCisgICAgcnVuX2Rl dGFpbHMgPSBydW5fd2Via2l0X3Rlc3RzLnJ1bihwb3J0X29iaiwgb3B0aW9ucywgcGFyc2VkX2Fy Z3MsIGJ1aWxkYm90X291dHB1dD1idWlsZGJvdF9vdXRwdXQsIHJlZ3VsYXJfb3V0cHV0PXJlZ3Vs YXJfb3V0cHV0KQorICAgIHJldHVybiBydW5fZGV0YWlscy5leGl0X2NvZGUgPT0gMAogCiAKIGRl ZiBsb2dnaW5nX3J1bihleHRyYV9hcmdzPU5vbmUsIHBvcnRfb2JqPU5vbmUsIHRlc3RzX2luY2x1 ZGVkPUZhbHNlLCBob3N0PU5vbmUsIG5ld19yZXN1bHRzPUZhbHNlLCBzaGFyZWRfcG9ydD1UcnVl KToKQEAgLTExMiwxMiArMTEyLDEyIEBAIGRlZiBydW5fYW5kX2NhcHR1cmUocG9ydF9vYmosIG9w dGlvbnMsIHBhcnNlZF9hcmdzLCBzaGFyZWRfcG9ydD1UcnVlKToKICAgICAgICAgb2MuY2FwdHVy ZV9vdXRwdXQoKQogICAgICAgICBidWlsZGJvdF9vdXRwdXQgPSBTdHJpbmdJTy5TdHJpbmdJTygp CiAgICAgICAgIHJlZ3VsYXJfb3V0cHV0ID0gU3RyaW5nSU8uU3RyaW5nSU8oKQotICAgICAgICBy ZXMgPSBydW5fd2Via2l0X3Rlc3RzLnJ1bihwb3J0X29iaiwgb3B0aW9ucywgcGFyc2VkX2FyZ3Ms Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkYm90X291dHB1dD1idWls ZGJvdF9vdXRwdXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZ3VsYXJf b3V0cHV0PXJlZ3VsYXJfb3V0cHV0KQorICAgICAgICBydW5fZGV0YWlscyA9IHJ1bl93ZWJraXRf dGVzdHMucnVuKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJncywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWlsZGJvdF9vdXRwdXQ9YnVpbGRib3Rfb3V0 cHV0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZ3VsYXJf b3V0cHV0PXJlZ3VsYXJfb3V0cHV0KQogICAgIGZpbmFsbHk6CiAgICAgICAgIG9jLnJlc3RvcmVf b3V0cHV0KCkKLSAgICByZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0LCByZWd1bGFyX291dHB1 dCkKKyAgICByZXR1cm4gKHJ1bl9kZXRhaWxzLmV4aXRfY29kZSwgYnVpbGRib3Rfb3V0cHV0LCBy ZWd1bGFyX291dHB1dCkKIAogCiBkZWYgZ2V0X3Rlc3RzX3J1bihleHRyYV9hcmdzPU5vbmUsIHRl c3RzX2luY2x1ZGVkPUZhbHNlLCBmbGF0dGVuX2JhdGNoZXM9RmFsc2UsCkBAIC0yNDUsMzAgKzI0 NSw0OSBAQCBjbGFzcyBMaW50VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01p eGluKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChob3N0LnBvcnRzX3BhcnNlZCwgWydhJ10p CiAKICAgICBkZWYgdGVzdF9saW50X3Rlc3RfZmlsZXMoc2VsZik6Ci0gICAgICAgIHJlcywgb3V0 LCBlcnIsIHVzZXIgPSBsb2dnaW5nX3J1bihbJy0tbGludC10ZXN0LWZpbGVzJ10pCisgICAgICAg IG9jID0gb3V0cHV0Y2FwdHVyZS5PdXRwdXRDYXB0dXJlKCkKKyAgICAgICAgb2MuY2FwdHVyZV9v dXRwdXQoKQorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXMgPSBydW5fd2Via2l0X3Rlc3Rz Lm1haW4oWyctLXBsYXRmb3JtJywgJ3Rlc3QnLCAnLS1saW50LXRlc3QtZmlsZXMnXSkKKyAgICAg ICAgZmluYWxseToKKyAgICAgICAgICAgIG91dCwgZXJyLCBsb2dzID0gb2MucmVzdG9yZV9vdXRw dXQoKQorCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzLCAwKQotICAgICAgICBzZWxmLmFz c2VydEVtcHR5KG91dCkKLSAgICAgICAgc2VsZi5hc3NlcnRDb250YWlucyhlcnIsICdMaW50IHN1 Y2NlZWRlZCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwob3V0LCAnJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChlcnIsICcnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ0xpbnQgc3Vj Y2VlZGVkJyBpbiBsb2dzKQogCiAgICAgZGVmIHRlc3RfbGludF90ZXN0X2ZpbGVzX19lcnJvcnMo c2VsZik6Ci0gICAgICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcGFyc2VfYXJncyhbJy0tbGlu dC10ZXN0LWZpbGVzJ10pCisgICAgICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcGFyc2VfYXJn cyhbJy0tcGxhdGZvcm0nLCAndGVzdCcsICctLWxpbnQtdGVzdC1maWxlcyddKQogICAgICAgICBo b3N0ID0gTW9ja0hvc3QoKQogICAgICAgICBwb3J0X29iaiA9IGhvc3QucG9ydF9mYWN0b3J5Lmdl dChvcHRpb25zLnBsYXRmb3JtLCBvcHRpb25zPW9wdGlvbnMpCiAgICAgICAgIHBvcnRfb2JqLmV4 cGVjdGF0aW9uc19kaWN0ID0gbGFtYmRhOiB7Jyc6ICctLSBzeW50YXggZXJyb3InfQotICAgICAg ICByZXMsIG91dCwgZXJyID0gcnVuX2FuZF9jYXB0dXJlKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJz ZWRfYXJncykKKworICAgICAgICBvYyA9IG91dHB1dGNhcHR1cmUuT3V0cHV0Q2FwdHVyZSgpCisg ICAgICAgIG9jLmNhcHR1cmVfb3V0cHV0KCkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmVz ID0gcnVuX3dlYmtpdF90ZXN0cy5saW50KHBvcnRfb2JqLCBvcHRpb25zKQorICAgICAgICBmaW5h bGx5OgorICAgICAgICAgICAgb3V0LCBlcnIsIGxvZ3MgPSBvYy5yZXN0b3JlX291dHB1dCgpCiAK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXMsIC0xKQotICAgICAgICBzZWxmLmFzc2VydEVt cHR5KG91dCkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGFueShbJ0xpbnQgZmFpbGVkJyBpbiBt c2cgZm9yIG1zZyBpbiBlcnIuYnVmbGlzdF0pKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG91 dCwgJycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXJyLCAnJykKKyAgICAgICAgc2VsZi5h c3NlcnRUcnVlKCdMaW50IGZhaWxlZCcgaW4gbG9ncykKIAogICAgICAgICAjIGVuc3VyZSB3ZSBs aW50ICphbGwqIG9mIHRoZSBmaWxlcyBpbiB0aGUgY2FzY2FkZS4KICAgICAgICAgcG9ydF9vYmou ZXhwZWN0YXRpb25zX2RpY3QgPSBsYW1iZGE6IHsnZm9vJzogJy0tIHN5bnRheCBlcnJvcjEnLCAn YmFyJzogJy0tIHN5bnRheCBlcnJvcjInfQotICAgICAgICByZXMsIG91dCwgZXJyID0gcnVuX2Fu ZF9jYXB0dXJlKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJncykKKyAgICAgICAgb2MuY2Fw dHVyZV9vdXRwdXQoKQorICAgICAgICB0cnk6CisgICAgICAgICAgICByZXMgPSBydW5fd2Via2l0 X3Rlc3RzLmxpbnQocG9ydF9vYmosIG9wdGlvbnMpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAg ICAgICBvdXQsIGVyciwgbG9ncyA9IG9jLnJlc3RvcmVfb3V0cHV0KCkKIAogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHJlcywgLTEpCi0gICAgICAgIHNlbGYuYXNzZXJ0RW1wdHkob3V0KQotICAg ICAgICBzZWxmLmFzc2VydFRydWUoYW55KFsnZm9vOjEnIGluIG1zZyBmb3IgbXNnIGluIGVyci5i dWZsaXN0XSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShhbnkoWydiYXI6MScgaW4gbXNnIGZv ciBtc2cgaW4gZXJyLmJ1Zmxpc3RdKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChvdXQsICcn KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGVyciwgJycpCisgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZSgnZm9vOjEnIGluIGxvZ3MpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnYmFyOjEnIGlu IGxvZ3MpCiAKIAogY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3Rp bmdNaXhpbik6CkBAIC05NDQsNyArOTYzLDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVz dENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgICAgIHBvcnRfb2JqID0gaG9zdC5wb3J0 X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZT1vcHRpb25zLnBsYXRmb3JtLCBvcHRpb25zPW9wdGlvbnMp CiAgICAgICAgIGJ1aWxkYm90X291dHB1dCA9IFN0cmluZ0lPLlN0cmluZ0lPKCkKICAgICAgICAg cmVndWxhcl9vdXRwdXQgPSBTdHJpbmdJTy5TdHJpbmdJTygpCi0gICAgICAgIHJlcyA9IHJ1bl93 ZWJraXRfdGVzdHMucnVuKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJncywgYnVpbGRib3Rf b3V0cHV0PWJ1aWxkYm90X291dHB1dCwgcmVndWxhcl9vdXRwdXQ9cmVndWxhcl9vdXRwdXQpCisg ICAgICAgIHJ1bl93ZWJraXRfdGVzdHMucnVuKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJn cywgYnVpbGRib3Rfb3V0cHV0PWJ1aWxkYm90X291dHB1dCwgcmVndWxhcl9vdXRwdXQ9cmVndWxh cl9vdXRwdXQpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgndGV4dC5odG1sIHBhc3NlZCcgaW4g cmVndWxhcl9vdXRwdXQuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdpbWFn ZS5odG1sIHBhc3NlZCcgaW4gcmVndWxhcl9vdXRwdXQuZ2V0dmFsdWUoKSkKIAo=