101081 2012-11-02 11:56:32 -0700 webkit-patch rebaseline is broken 2012-11-02 17:51:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth dbarton ojan oldest_to_newest 757423 0 dpranke 2012-11-02 11:56:32 -0700 webkit-patch rebaseline is broken 757425 1 172100 dpranke 2012-11-02 11:59:15 -0700 Created attachment 172100 Patch 757511 2 172100 ojan 2012-11-02 13:04:39 -0700 Comment on attachment 172100 Patch I don't understand this fix. Can you explain it more in the ChangeLog? 757633 3 172149 dpranke 2012-11-02 14:57:20 -0700 Created attachment 172149 clarify bugfix in changelog 757767 4 172149 ojan 2012-11-02 16:57:35 -0700 Comment on attachment 172149 clarify bugfix in changelog Not sure whether I prefer this or changing AbstractParallelRebaselineCommand to check: if hasattr(options, "results_directory"): They're both a little gross. Another option would be to have AbstractParallelRebaselineCommand._rebaseline not take an options argument at all and just take the individual arguments it needs to know about. That'd probably be cleanest. Up to you. 757785 5 dpranke 2012-11-02 17:23:53 -0700 (In reply to comment #4) > (From update of attachment 172149 [details]) > Not sure whether I prefer this or changing AbstractParallelRebaselineCommand to check: > if hasattr(options, "results_directory"): > > They're both a little gross. > > Another option would be to have AbstractParallelRebaselineCommand._rebaseline not take an options argument at all and just take the individual arguments it needs to know about. That'd probably be cleanest. > > Up to you. Yeah, I considered all of these options already. I really don't like the 'hasattr' approach (it's a real flaw in the way we handle all of the port-specific options in the layout_tests/port classes). I originally wasn't passing the options object down and was passing the arguments individually but that was getting increasingly unwieldy. I don't think this is far away from the idea that the options object has a set of default values, and then we provide command line flags to override them where relevant; that approach is cleaner, but the interface that the tool command constructors use to pass options back and forth don't give you a way to do this, unfortunately (we don't get direct access to the options argument until execute() is called, so we can't set default values anywhere). So I prefer the way I ended up doing it. Hope that helps explain the approach. 757790 6 ojan 2012-11-02 17:31:05 -0700 sgtm 757806 7 dpranke 2012-11-02 17:51:19 -0700 Committed r133382: <http://trac.webkit.org/changeset/133382> 172100 2012-11-02 11:59:15 -0700 2012-11-02 14:57:18 -0700 Patch bug-101081-20121102115735.patch text/plain 4488 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDhjM2IzNTI0N2M5MWZmMzllZmEyMjI0ZGRmYWEwNzMz OWQ5NDhiMS4uNjU4OWMxMDM3MGRkYmJlOWU4NDQ0ZjFkZjg4ZGI5NzIyMmY1MDgwNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIGlzIGJyb2tlbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMDgxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBicm9rZSB0aGlzIGluIHIxMzMwNjEg YW5kIHRoZSB1bml0IHRlc3RzIHdlcmVuJ3QgY292ZXJpbmcgdGhpcworICAgICAgICBjb2RlIHBh dGguIEZpeGVkIHRoZSBpc3N1ZSBhbmQgdGhlIHRlc3RzLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChSZWJhc2VsaW5l RXhwZWN0YXRpb25zLmV4ZWN1dGUpOgorICAgICAgICAoUmViYXNlbGluZS5leGVjdXRlKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVz dC5weToKKyAgICAgICAgKFRlc3RSZWJhc2VsaW5lKToKKyAgICAgICAgKFRlc3RSZWJhc2VsaW5l LnRlc3RfcmViYXNlbGluZSk6CisKIDIwMTItMTEtMDIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzMzMDMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv cmViYXNlbGluZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJh c2VsaW5lLnB5CmluZGV4IDljNjgzM2NkYjNhNDdjZWJiYzQ1ZjQ3MTY4MWNhMjU0YjIzYTcyZDcu LmUxMDJhNDJkYzU3MjRkOGQ0MTZjMGQ0NGMyMTk5ZGE5OGUyOGJlZDUgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC00MDMs NiArNDAzLDcgQEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdFBhcmFsbGVs UmViYXNlbGluZUNvbW1hbmQpOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9saXN0W3Rlc3RfbmFt ZV1bYnVpbGRlcl9uYW1lXSA9IHN1ZmZpeGVzCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRp b25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSA9IE5v bmUKICAgICAgICAgc2VsZi5fdGVzdF9saXN0ID0ge30KICAgICAgICAgZm9yIHBvcnRfbmFtZSBp biB0b29sLnBvcnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpOgogICAgICAgICAgICAgc2VsZi5f YWRkX3Rlc3RzX3RvX3JlYmFzZWxpbmVfZm9yX3BvcnQocG9ydF9uYW1lKQpAQCAtNDU5LDYgKzQ2 MCw3IEBAIGNsYXNzIFJlYmFzZWxpbmUoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5k KToKICAgICAgICAgcmV0dXJuIGxpc3Qoc3VmZml4ZXMpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxm LCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAgICAgb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9y eSA9IE5vbmUKICAgICAgICAgaWYgb3B0aW9ucy5idWlsZGVyczoKICAgICAgICAgICAgIGJ1aWxk ZXJzID0gW10KICAgICAgICAgICAgIGZvciBidWlsZGVyX25hbWVzIGluIG9wdGlvbnMuYnVpbGRl cnM6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmVi YXNlbGluZV91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5CmluZGV4IGU1Njk0ZDJmYjJjY2RhMTQ4OWI5MGFiNzIy ZjMyMTNjY2NjMTVkYzMuLmQ1ZWJlZjVlMTBkYjU1MzlmMDVlYWFhMDZmM2U0MWI5YzI3MDlkYzIg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2Vs aW5lX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5CkBAIC0yNzcsMjMgKzI3NywxNSBAQCBjbGFzcyBUZXN0 UmViYXNlbGluZUpzb24oX0Jhc2VUZXN0Q2FzZSk6CiBjbGFzcyBUZXN0UmViYXNlbGluZShfQmFz ZVRlc3RDYXNlKToKICAgICAjIFRoaXMgY29tbWFuZCBzaGFyZXMgbW9zdCBvZiBpdHMgbG9naWMg d2l0aCBSZWJhc2VsaW5lSnNvbiwgc28gdGhlc2UgdGVzdHMganVzdCB0ZXN0IHdoYXQgaXMgZGlm ZmVyZW50LgogCi0gICAgY29tbWFuZF9jb25zdHJ1Y3RvciA9IFJlYmFzZWxpbmUgICMgQUtBIHdl YmtpdC1wYXRjaCByZWJhc2VsaW5lLXRlc3QKKyAgICBjb21tYW5kX2NvbnN0cnVjdG9yID0gUmVi YXNlbGluZSAgIyBBS0Egd2Via2l0LXBhdGNoIHJlYmFzZWxpbmUKIAogICAgIGRlZiB0ZXN0X3Rl c3RzX3RvX3VwZGF0ZShzZWxmKToKICAgICAgICAgYnVpbGQgPSBNb2NrKCkKICAgICAgICAgT3V0 cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuY29tbWFuZC5fdGVzdHNfdG9f dXBkYXRlLCBbYnVpbGRdKQogCiAgICAgZGVmIHRlc3RfcmViYXNlbGluZShzZWxmKToKLSAgICAg ICAgIyBUaGlzIHRlc3QgYmFzaWNhbGx5IHRlc3RzIHRoZSBwYXRoIGZyb20gY29tbWFuZC5leGVj dXRlKCkgdG8gY29tbWFuZC5fcmViYXNlbGluZSgpOwotICAgICAgICAjIGl0IGRvZXNuJ3QgdGVz dCB0aGF0IF9yZWJhc2VsaW5lKCkgYWN0dWFsbHkgZG9lcyBhbnl0aGluZyAodGhhdCBpcyB0ZXN0 ZWQgaW4gVGVzdFJlYmFzZWxpbmVKc29uLgotICAgICAgICBzZWxmLnRlc3RfbGlzdCA9IHt9Ci0K LSAgICAgICAgZGVmIHJlYmFzZWxpbmVfc3R1YihvcHRpb25zLCB0ZXN0X2xpc3QpOgotICAgICAg ICAgICAgc2VsZi50ZXN0X2xpc3QgPSB0ZXN0X2xpc3QKLQogICAgICAgICBzZWxmLmNvbW1hbmQu X2J1aWxkZXJzX3RvX3B1bGxfZnJvbSA9IGxhbWJkYTogW01vY2tCdWlsZGVyKCdNT0NLIGJ1aWxk ZXInKV0KICAgICAgICAgc2VsZi5jb21tYW5kLl90ZXN0c190b191cGRhdGUgPSBsYW1iZGEgYnVp bGRlcjogWydtb2NrL3BhdGgvdG8vdGVzdC5odG1sJ10KLSAgICAgICAgc2VsZi5jb21tYW5kLl9y ZWJhc2VsaW5lID0gcmViYXNlbGluZV9zdHViCiAKICAgICAgICAgc2VsZi5femVyb19vdXRfdGVz dF9leHBlY3RhdGlvbnMoKQogCkBAIC0zMDQsMTIgKzI5NiwxNCBAQCBjbGFzcyBUZXN0UmViYXNl bGluZShfQmFzZVRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAiTU9DSyBidWlsZGVyIjogeyJw b3J0X25hbWUiOiAidGVzdC1tYWMtbGVvcGFyZCIsICJzcGVjaWZpZXJzIjogc2V0KFsibW9jay1z cGVjaWZpZXIiXSl9LAogICAgICAgICAgICAgfQogICAgICAgICAgICAgb2MuY2FwdHVyZV9vdXRw dXQoKQotICAgICAgICAgICAgc2VsZi5jb21tYW5kLmV4ZWN1dGUoTW9ja09wdGlvbnMob3B0aW1p emU9VHJ1ZSwgYnVpbGRlcnM9Tm9uZSwgc3VmZml4ZXM9WyJ0eHQiXSwgdmVyYm9zZT1UcnVlKSwg W10sIHNlbGYudG9vbCkKKyAgICAgICAgICAgIHNlbGYuY29tbWFuZC5leGVjdXRlKE1vY2tPcHRp b25zKG9wdGltaXplPUZhbHNlLCBidWlsZGVycz1Ob25lLCBzdWZmaXhlcz1bInR4dCJdLCB2ZXJi b3NlPVRydWUsIG1vdmVfb3ZlcndyaXR0ZW5fYmFzZWxpbmVzPUZhbHNlKSwgW10sIHNlbGYudG9v bCkKICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIG9jLnJlc3RvcmVfb3V0cHV0KCkKICAg ICAgICAgICAgIGJ1aWxkZXJzLl9leGFjdF9tYXRjaGVzID0gb2xkX2V4YWN0X21hdGNoZXMKIAot ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLnRlc3RfbGlzdCwgeydtb2NrL3BhdGgvdG8v dGVzdC5odG1sJzogeydNT0NLIGJ1aWxkZXInOiBbJ3R4dCddfX0pCisgICAgICAgIGNhbGxzID0g ZmlsdGVyKGxhbWJkYSB4OiB4ICE9IFsncW1ha2UnLCAnLXYnXSBhbmQgeFswXSAhPSAncGVybCcs IHNlbGYudG9vbC5leGVjdXRpdmUuY2FsbHMpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGNh bGxzLAorICAgICAgICAgICAgW1tbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywg Jy0tc3VmZml4ZXMnLCAndHh0JywgJy0tYnVpbGRlcicsICdNT0NLIGJ1aWxkZXInLCAnLS10ZXN0 JywgJ21vY2svcGF0aC90by90ZXN0Lmh0bWwnLCAnLS12ZXJib3NlJ11dXSkKIAogCiBjbGFzcyBU ZXN0UmViYXNlbGluZUV4cGVjdGF0aW9ucyhfQmFzZVRlc3RDYXNlKToK 172149 2012-11-02 14:57:20 -0700 2012-11-02 16:57:35 -0700 clarify bugfix in changelog bug-101081-20121102145539.patch text/plain 4837 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzE5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDhjM2IzNTI0N2M5MWZmMzllZmEyMjI0ZGRmYWEwNzMz OWQ5NDhiMS4uMzhiZjY5N2NjOTM2OTIxYzc3Nzk3MjBhZjliOWY1ODQ2ZmFkZTkwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIGlzIGJyb2tlbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMDgxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBicm9rZSB0aGlzIGluIHIxMzMwNjEg YW5kIHRoZSB1bml0IHRlc3RzIHdlcmVuJ3QgY292ZXJpbmcgdGhpcworICAgICAgICBjb2RlIHBh dGguIEZpeGVkIHRoZSBpc3N1ZSBhbmQgdGhlIHRlc3RzLiAtLXJlc3VsdHMtZGlyZWN0b3J5Cisg ICAgICAgIGRvZXNuJ3QgbWFrZSBzZW5zZSBmb3IgZWl0aGVyICd3ZWJraXQtcGF0Y2ggcmViYXNl bGluZScgb3IKKyAgICAgICAgJ3dlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucycs IHNvIHdlIGRvbid0IHdhbnQgdG8gZXhwb3NlCisgICAgICAgIHRoYXQgYXMgYSBjb21tYW5kIGxp bmUgb3B0aW9uLCBidXQgdGhleSBhbGwgY2FsbCBhIGNvbW1vbgorICAgICAgICBfcmViYXNlbGlu ZSgpIHJvdXRpbmUgdGhhdCByZWZlcmVuY2VzIG9wdGlvbnMucmVzdWx0c19kaXJlY3RvcnksCisg ICAgICAgIHNvIHdlIG5lZWQgdG8gc2V0IGEgZGVmYXVsdCB2YWx1ZS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5OgorICAgICAgICAoUmVi YXNlbGluZUV4cGVjdGF0aW9ucy5leGVjdXRlKToKKyAgICAgICAgKFJlYmFzZWxpbmUuZXhlY3V0 ZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVf dW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0UmViYXNlbGluZSk6CisgICAgICAgIChUZXN0UmVi YXNlbGluZS50ZXN0X3JlYmFzZWxpbmUpOgorCiAyMDEyLTExLTAyICBTaGVyaWZmIEJvdCAgPHdl YmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTMzMzAzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3JlYmFzZWxpbmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZS5weQppbmRleCA5YzY4MzNjZGIzYTQ3Y2ViYmM0NWY0NzE2ODFjYTI1NGIy M2E3MmQ3Li5lMTAyYTQyZGM1NzI0ZDhkNDE2YzBkNDRjMjE5OWRhOThlMjhiZWQ1IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpA QCAtNDAzLDYgKzQwMyw3IEBAIGNsYXNzIFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMoQWJzdHJhY3RQ YXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfbGlzdFt0 ZXN0X25hbWVdW2J1aWxkZXJfbmFtZV0gPSBzdWZmaXhlcwogCiAgICAgZGVmIGV4ZWN1dGUoc2Vs Ziwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIG9wdGlvbnMucmVzdWx0c19kaXJlY3Rv cnkgPSBOb25lCiAgICAgICAgIHNlbGYuX3Rlc3RfbGlzdCA9IHt9CiAgICAgICAgIGZvciBwb3J0 X25hbWUgaW4gdG9vbC5wb3J0X2ZhY3RvcnkuYWxsX3BvcnRfbmFtZXMoKToKICAgICAgICAgICAg IHNlbGYuX2FkZF90ZXN0c190b19yZWJhc2VsaW5lX2Zvcl9wb3J0KHBvcnRfbmFtZSkKQEAgLTQ1 OSw2ICs0NjAsNyBAQCBjbGFzcyBSZWJhc2VsaW5lKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5l Q29tbWFuZCk6CiAgICAgICAgIHJldHVybiBsaXN0KHN1ZmZpeGVzKQogCiAgICAgZGVmIGV4ZWN1 dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIG9wdGlvbnMucmVzdWx0c19k aXJlY3RvcnkgPSBOb25lCiAgICAgICAgIGlmIG9wdGlvbnMuYnVpbGRlcnM6CiAgICAgICAgICAg ICBidWlsZGVycyA9IFtdCiAgICAgICAgICAgICBmb3IgYnVpbGRlcl9uYW1lcyBpbiBvcHRpb25z LmJ1aWxkZXJzOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQppbmRleCBlNTY5NGQyZmIyY2NkYTE0ODli OTBhYjcyMmYzMjEzY2NjYzE1ZGMzLi5kNWViZWY1ZTEwZGI1NTM5ZjA1ZWFhYTA2ZjNlNDFiOWMy NzA5ZGMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv cmViYXNlbGluZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQpAQCAtMjc3LDIzICsyNzcsMTUgQEAgY2xh c3MgVGVzdFJlYmFzZWxpbmVKc29uKF9CYXNlVGVzdENhc2UpOgogY2xhc3MgVGVzdFJlYmFzZWxp bmUoX0Jhc2VUZXN0Q2FzZSk6CiAgICAgIyBUaGlzIGNvbW1hbmQgc2hhcmVzIG1vc3Qgb2YgaXRz IGxvZ2ljIHdpdGggUmViYXNlbGluZUpzb24sIHNvIHRoZXNlIHRlc3RzIGp1c3QgdGVzdCB3aGF0 IGlzIGRpZmZlcmVudC4KIAotICAgIGNvbW1hbmRfY29uc3RydWN0b3IgPSBSZWJhc2VsaW5lICAj IEFLQSB3ZWJraXQtcGF0Y2ggcmViYXNlbGluZS10ZXN0CisgICAgY29tbWFuZF9jb25zdHJ1Y3Rv ciA9IFJlYmFzZWxpbmUgICMgQUtBIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lCiAKICAgICBkZWYg dGVzdF90ZXN0c190b191cGRhdGUoc2VsZik6CiAgICAgICAgIGJ1aWxkID0gTW9jaygpCiAgICAg ICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLmNvbW1hbmQuX3Rl c3RzX3RvX3VwZGF0ZSwgW2J1aWxkXSkKIAogICAgIGRlZiB0ZXN0X3JlYmFzZWxpbmUoc2VsZik6 Ci0gICAgICAgICMgVGhpcyB0ZXN0IGJhc2ljYWxseSB0ZXN0cyB0aGUgcGF0aCBmcm9tIGNvbW1h bmQuZXhlY3V0ZSgpIHRvIGNvbW1hbmQuX3JlYmFzZWxpbmUoKTsKLSAgICAgICAgIyBpdCBkb2Vz bid0IHRlc3QgdGhhdCBfcmViYXNlbGluZSgpIGFjdHVhbGx5IGRvZXMgYW55dGhpbmcgKHRoYXQg aXMgdGVzdGVkIGluIFRlc3RSZWJhc2VsaW5lSnNvbi4KLSAgICAgICAgc2VsZi50ZXN0X2xpc3Qg PSB7fQotCi0gICAgICAgIGRlZiByZWJhc2VsaW5lX3N0dWIob3B0aW9ucywgdGVzdF9saXN0KToK LSAgICAgICAgICAgIHNlbGYudGVzdF9saXN0ID0gdGVzdF9saXN0Ci0KICAgICAgICAgc2VsZi5j b21tYW5kLl9idWlsZGVyc190b19wdWxsX2Zyb20gPSBsYW1iZGE6IFtNb2NrQnVpbGRlcignTU9D SyBidWlsZGVyJyldCiAgICAgICAgIHNlbGYuY29tbWFuZC5fdGVzdHNfdG9fdXBkYXRlID0gbGFt YmRhIGJ1aWxkZXI6IFsnbW9jay9wYXRoL3RvL3Rlc3QuaHRtbCddCi0gICAgICAgIHNlbGYuY29t bWFuZC5fcmViYXNlbGluZSA9IHJlYmFzZWxpbmVfc3R1YgogCiAgICAgICAgIHNlbGYuX3plcm9f b3V0X3Rlc3RfZXhwZWN0YXRpb25zKCkKIApAQCAtMzA0LDEyICsyOTYsMTQgQEAgY2xhc3MgVGVz dFJlYmFzZWxpbmUoX0Jhc2VUZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgIk1PQ0sgYnVpbGRl ciI6IHsicG9ydF9uYW1lIjogInRlc3QtbWFjLWxlb3BhcmQiLCAic3BlY2lmaWVycyI6IHNldChb Im1vY2stc3BlY2lmaWVyIl0pfSwKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG9jLmNhcHR1 cmVfb3V0cHV0KCkKLSAgICAgICAgICAgIHNlbGYuY29tbWFuZC5leGVjdXRlKE1vY2tPcHRpb25z KG9wdGltaXplPVRydWUsIGJ1aWxkZXJzPU5vbmUsIHN1ZmZpeGVzPVsidHh0Il0sIHZlcmJvc2U9 VHJ1ZSksIFtdLCBzZWxmLnRvb2wpCisgICAgICAgICAgICBzZWxmLmNvbW1hbmQuZXhlY3V0ZShN b2NrT3B0aW9ucyhvcHRpbWl6ZT1GYWxzZSwgYnVpbGRlcnM9Tm9uZSwgc3VmZml4ZXM9WyJ0eHQi XSwgdmVyYm9zZT1UcnVlLCBtb3ZlX292ZXJ3cml0dGVuX2Jhc2VsaW5lcz1GYWxzZSksIFtdLCBz ZWxmLnRvb2wpCiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBvYy5yZXN0b3JlX291dHB1 dCgpCiAgICAgICAgICAgICBidWlsZGVycy5fZXhhY3RfbWF0Y2hlcyA9IG9sZF9leGFjdF9tYXRj aGVzCiAKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi50ZXN0X2xpc3QsIHsnbW9jay9w YXRoL3RvL3Rlc3QuaHRtbCc6IHsnTU9DSyBidWlsZGVyJzogWyd0eHQnXX19KQorICAgICAgICBj YWxscyA9IGZpbHRlcihsYW1iZGEgeDogeCAhPSBbJ3FtYWtlJywgJy12J10gYW5kIHhbMF0gIT0g J3BlcmwnLCBzZWxmLnRvb2wuZXhlY3V0aXZlLmNhbGxzKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhjYWxscywKKyAgICAgICAgICAgIFtbWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdC1pbnRl cm5hbCcsICctLXN1ZmZpeGVzJywgJ3R4dCcsICctLWJ1aWxkZXInLCAnTU9DSyBidWlsZGVyJywg Jy0tdGVzdCcsICdtb2NrL3BhdGgvdG8vdGVzdC5odG1sJywgJy0tdmVyYm9zZSddXV0pCiAKIAog Y2xhc3MgVGVzdFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMoX0Jhc2VUZXN0Q2FzZSk6Cg==