88946 2012-06-12 19:38:38 -0700 webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides() 2012-06-13 13:14:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88944 88945 65834 88947 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 647608 0 dpranke 2012-06-12 19:38:38 -0700 webkitpy: update callers to use port.expectation_dict() instead of test_expectations() and test_expectations_overrides() 647609 1 147217 dpranke 2012-06-12 19:39:34 -0700 Created attachment 147217 Patch 648137 2 147217 ojan 2012-06-13 09:34:53 -0700 Comment on attachment 147217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147217&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:764 > + if len(expectations_dict) > 1 and include_overrides: Side nit: why do we even have an include_overrides boolean? It seems like this should go away, esp as we're adding cascading. 648187 3 dpranke 2012-06-13 10:09:09 -0700 (In reply to comment #2) > (From update of attachment 147217 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147217&action=review > > > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:764 > > + if len(expectations_dict) > 1 and include_overrides: > > Side nit: why do we even have an include_overrides boolean? It seems like this should go away, esp as we're adding cascading. This is needed when we're writing the file out again after running webkit-patch rebaseline-expectations; because that command is not aware of the cascade, it cats the contents of all of the files into the main file. With the flag, we don't remove any REBASELINEs from other files in the cascade, which is okay for chromium, but won't work when we have real cascades instead of overrides. Fixing this is a separate issue that I'll work on after this series of patches land. 648398 4 dpranke 2012-06-13 13:14:57 -0700 Committed r120240: <http://trac.webkit.org/changeset/120240> 147217 2012-06-12 19:39:34 -0700 2012-06-13 09:34:53 -0700 Patch bug-88946-20120612193933.patch text/plain 13505 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTVlMzdkZGI5MjU4ZWUzNWU4NTlkM2ZhZjc1ZmI3NjFj Njk0NzEyNy4uZWNhZDNjYmM3NmZlODY4OTdlNjdiMTdiYzZkMGU0NzIxNjc4OGUxNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTA2LTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiB1cGRhdGUgY2FsbGVycyB0byB1c2UgcG9ydC5leHBlY3RhdGlvbl9k aWN0KCkgaW5zdGVhZCBvZiB0ZXN0X2V4cGVjdGF0aW9ucygpIGFuZCB0ZXN0X2V4cGVjdGF0aW9u c19vdmVycmlkZXMoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODg5NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBJbiBwcmVwYXJhdGlvbiBmb3IgZnVsbHkgc3VwcG9ydGluZyBjYXNjYWRpbmcgZXhwZWN0 YXRpb25zIGZpbGVzCisgICAgICAgIGFuZCByZW1vdmluZyB0aGUgJ292ZXJyaWRlcycgY29uY2Vw dC4KKworICAgICAgICBUaGVyZSBzaG91bGQgYmUgbm8gZnVuY3Rpb25hbCBjaGFuZ2VzIGluIHRo aXMgcGF0Y2guCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QudGVzdF91 cGRhdGVfc3VtbWFyeV93aXRoX3Jlc3VsdCk6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC5n ZXRfcmVzdWx0X3N1bW1hcnkpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlv bnMuX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKHBhcnNlX2V4cCk6 CisgICAgICAgIChTa2lwcGVkVGVzdHMuY2hlY2spOgorICAgICAgICAoUmVtb3ZlQ29uZmlndXJh dGlvbnNUZXN0LnRlc3RfcmVtb3ZlKToKKyAgICAgICAgKHRlc3RfcmVtb3ZlX2xpbmUpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50 ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoTGludFRlc3QudGVzdF9hbGxfY29uZmlndXJhdGlv bnMuRmFrZVBvcnQuX19pbml0X18pOgorICAgICAgICAoTGludFRlc3QudGVzdF9hbGxfY29uZmln dXJhdGlvbnMuRmFrZVBvcnQuZXhwZWN0YXRpb25zX2RpY3QpOgorICAgICAgICAoTGludFRlc3Qu dGVzdF9saW50X3Rlc3RfZmlsZXNfX2Vycm9ycyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X292 ZXJyaWRlc19hcmVfaW5jbHVkZWRfY29ycmVjdGx5KToKKworMjAxMi0wNi0xMiAgRGlyayBQcmFu a2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogcmV3b3JrIHRo ZSBUZXN0RXhwZWN0YXRpb25zIHN0eWxlIGNoZWNrZXIgaW4gcHJlcGFyYXRpb24gZm9yIHRoZSBj YXNjYWRlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 ODk0NQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQppbmRleCAzZGRhYjhl YzM3YjNiNzFmNTk4ZDg2YWVjMGU1ZTlkZjAwMGM0ZDU0Li42OWJkMjE4YTU5NTQ1M2ZlMjhjODg5 NDY5Njg5NmRhYTgwZjY0MWU4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3Qu cHkKQEAgLTI4MCw3ICsyODAsNyBAQCBjbGFzcyBNYW5hZ2VyVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRf ZmFjdG9yeS5nZXQoJ3Rlc3Qtd2luLXhwJykKICAgICAgICAgdGVzdCA9ICdmYWlsdXJlcy9leHBl Y3RlZC9yZWZ0ZXN0Lmh0bWwnCi0gICAgICAgIHBvcnQudGVzdF9leHBlY3RhdGlvbnMgPSBsYW1i ZGE6ICdXT05URklYIDogZmFpbHVyZXMvZXhwZWN0ZWQvcmVmdGVzdC5odG1sID0gSU1BR0UnCisg ICAgICAgIHBvcnQuZXhwZWN0YXRpb25zX2RpY3QgPSBsYW1iZGE6IHsnJzogJ1dPTlRGSVggOiBm YWlsdXJlcy9leHBlY3RlZC9yZWZ0ZXN0Lmh0bWwgPSBJTUFHRSd9CiAgICAgICAgIGV4cGVjdGF0 aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnMocG9ydCwgdGVzdHM9W3Rlc3RdKQogICAgICAgICAjIFJl ZnRlc3RzIGV4cGVjdGVkIHRvIGJlIGltYWdlIG1pc21hdGNoIHNob3VsZCBiZSByZXNwZWN0ZWQg d2hlbiBwaXhlbF90ZXN0cz1GYWxzZS4KICAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydD1w b3J0LCBvcHRpb25zPU1vY2tPcHRpb25zKHBpeGVsX3Rlc3RzPUZhbHNlLCBleGl0X2FmdGVyX25f ZmFpbHVyZXM9Tm9uZSwgZXhpdF9hZnRlcl9uX2NyYXNoZXNfb3JfdGltZW91dHM9Tm9uZSksIHBy aW50ZXI9TW9jaygpKQpAQCAtNDIyLDcgKzQyMiw3IEBAIGNsYXNzIFJlc3VsdFN1bW1hcnlUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcmV0dXJuIHRlc3RfcmVzdWx0cy5UZXN0UmVz dWx0KHRlc3RfbmFtZSwgZmFpbHVyZXM9ZmFpbHVyZXMsIHRlc3RfcnVuX3RpbWU9cnVuX3RpbWUp CiAKICAgICBkZWYgZ2V0X3Jlc3VsdF9zdW1tYXJ5KHNlbGYsIHBvcnQsIHRlc3RfbmFtZXMsIGV4 cGVjdGF0aW9uc19zdHIpOgotICAgICAgICBwb3J0LnRlc3RfZXhwZWN0YXRpb25zID0gbGFtYmRh OiBleHBlY3RhdGlvbnNfc3RyCisgICAgICAgIHBvcnQuZXhwZWN0YXRpb25zX2RpY3QgPSBsYW1i ZGE6IHsnJzogZXhwZWN0YXRpb25zX3N0cn0KICAgICAgICAgZXhwZWN0YXRpb25zID0gdGVzdF9l eHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0ZXN0X25hbWVzKQogICAgICAgICBy ZXR1cm4gdGVzdF9uYW1lcywgcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3VtbWFyeShleHBlY3RhdGlv bnMsIHRlc3RfbmFtZXMpLCBleHBlY3RhdGlvbnMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z LnB5CmluZGV4IGU2YjRlN2RlODFhMTVmYzVjMWJkMzFjNDg2MWI3Mjc2YTIwYjljZGIuLjFmNTI4 ZDYzZGM1ODMwNWY2NDZlYWM3N2U3NWZmNjhmMTQwODJmMjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBl Y3RhdGlvbnMucHkKQEAgLTc1NywxMSArNzU3LDEyIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMo b2JqZWN0KToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAgICAgc2VsZi5fc2tpcHBl ZF90ZXN0c193YXJuaW5ncyA9IFtdCiAKLSAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gc2Vs Zi5fcGFyc2VyLnBhcnNlKHBvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCksIHBv cnQudGVzdF9leHBlY3RhdGlvbnMoKSkKKyAgICAgICAgZXhwZWN0YXRpb25zX2RpY3QgPSBwb3J0 LmV4cGVjdGF0aW9uc19kaWN0KCkKKyAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gc2VsZi5f cGFyc2VyLnBhcnNlKGV4cGVjdGF0aW9uc19kaWN0LmtleXMoKVswXSwgZXhwZWN0YXRpb25zX2Rp Y3QudmFsdWVzKClbMF0pCiAgICAgICAgIHNlbGYuX2FkZF9leHBlY3RhdGlvbnMoc2VsZi5fZXhw ZWN0YXRpb25zLCBpbl9vdmVycmlkZXM9RmFsc2UpCiAKLSAgICAgICAgb3ZlcnJpZGVzID0gcG9y dC50ZXN0X2V4cGVjdGF0aW9uc19vdmVycmlkZXMoKQotICAgICAgICBpZiBvdmVycmlkZXMgYW5k IGluY2x1ZGVfb3ZlcnJpZGVzOgorICAgICAgICBpZiBsZW4oZXhwZWN0YXRpb25zX2RpY3QpID4g MSBhbmQgaW5jbHVkZV9vdmVycmlkZXM6CisgICAgICAgICAgICBvdmVycmlkZXMgPSAnJy5qb2lu KGV4cGVjdGF0aW9uc19kaWN0LnZhbHVlcygpWzE6XSkKICAgICAgICAgICAgIG92ZXJyaWRlc19l eHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2UoJ292ZXJyaWRlcycsIG92ZXJyaWRlcykK ICAgICAgICAgICAgIHNlbGYuX2FkZF9leHBlY3RhdGlvbnMob3ZlcnJpZGVzX2V4cGVjdGF0aW9u cywgaW5fb3ZlcnJpZGVzPVRydWUpCiAgICAgICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgKz0g b3ZlcnJpZGVzX2V4cGVjdGF0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z X3VuaXR0ZXN0LnB5CmluZGV4IDA4NDFkNDQ3NDRjZDZkMGVmN2U5NTEyMTg2M2M2OTBiYjgzNzFi NGIuLjVmY2YxNTYzMmFkMjVhZjliMTQ2NmYxZGFjZjlkZDUwYTdhNjQ5MDYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0 aW9uc191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKQEAgLTM1LDYgKzM1LDEyIEBA IGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1w b3J0ICoKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2V4cGVjdGF0aW9u cyBpbXBvcnQgKgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmln dXJhdGlvbiBpbXBvcnQgKgogCit0cnk6CisgICAgZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgT3Jk ZXJlZERpY3QKK2V4Y2VwdCBJbXBvcnRFcnJvcjoKKyAgICAjIE5lZWRlZCBmb3IgUHl0aG9uIDwg Mi43CisgICAgZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5Lm9yZGVyZWRfZGljdCBpbXBvcnQgT3Jk ZXJlZERpY3QKKwogCiBjbGFzcyBNb2NrQnVnTWFuYWdlcihvYmplY3QpOgogICAgIGRlZiBjbG9z ZV9idWcoc2VsZiwgYnVnX2lkLCByZWZlcmVuY2VfYnVnX2lkPU5vbmUpOgpAQCAtMTI4LDggKzEz NCwxMSBAQCBCVUdfVEVTVCBXT05URklYIE1BQyA6IGZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlLmh0 bWwgPSBJTUFHRQogIiIiCiAKICAgICBkZWYgcGFyc2VfZXhwKHNlbGYsIGV4cGVjdGF0aW9ucywg b3ZlcnJpZGVzPU5vbmUsIGlzX2xpbnRfbW9kZT1GYWxzZSk6Ci0gICAgICAgIHNlbGYuX3BvcnQu dGVzdF9leHBlY3RhdGlvbnMgPSBsYW1iZGE6IGV4cGVjdGF0aW9ucwotICAgICAgICBzZWxmLl9w b3J0LnRlc3RfZXhwZWN0YXRpb25zX292ZXJyaWRlcyA9IGxhbWJkYTogb3ZlcnJpZGVzCisgICAg ICAgIHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0ID0gT3JkZXJlZERpY3QoKQorICAgICAgICBzZWxm Ll9leHBlY3RhdGlvbnNfZGljdFsnZXhwZWN0YXRpb25zJ10gPSBleHBlY3RhdGlvbnMKKyAgICAg ICAgaWYgb3ZlcnJpZGVzOgorICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RbJ292 ZXJyaWRlcyddID0gb3ZlcnJpZGVzCisgICAgICAgIHNlbGYuX3BvcnQuZXhwZWN0YXRpb25zX2Rp Y3QgPSBsYW1iZGE6IHNlbGYuX2V4cGVjdGF0aW9uc19kaWN0CiAgICAgICAgIHNlbGYuX2V4cCA9 IFRlc3RFeHBlY3RhdGlvbnMoc2VsZi5fcG9ydCwgc2VsZi5nZXRfYmFzaWNfdGVzdHMoKSwgaXNf bGludF9tb2RlKQogCiAgICAgZGVmIGFzc2VydF9leHAoc2VsZiwgdGVzdCwgcmVzdWx0KToKQEAg LTIwNiwxNyArMjE1LDE3IEBAIEJVR1ggV09OVEZJWCA6IGZhaWx1cmVzL2V4cGVjdGVkID0gSU1B R0UKIFNLSVAgOiBmYWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1sIiIiLCBpc19saW50X21vZGU9 VHJ1ZSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoVHJ1ZSwgIlBhcnNlRXJyb3Igd2Fz bid0IHJhaXNlZCIpCiAgICAgICAgIGV4Y2VwdCBQYXJzZUVycm9yLCBlOgotICAgICAgICAgICAg d2FybmluZ3MgPSBbdSI6MSBUZXN0IGxhY2tzIEJVRyBtb2RpZmllci4gZmFpbHVyZXMvZXhwZWN0 ZWQvdGV4dC5odG1sIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIHUiOjEgVW5yZWNvZ25pemVk IG1vZGlmaWVyICdmb28nIGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCIsCi0gICAgICAgICAg ICAgICAgICAgICAgICB1IjoyIE1pc3NpbmcgZXhwZWN0YXRpb25zIFNLSVAgOiBmYWlsdXJlcy9l eHBlY3RlZC9pbWFnZS5odG1sIl0KLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGUp LCAnXG4nLmpvaW4oc2VsZi5fcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSAr IHN0cih3YXJuaW5nKSBmb3Igd2FybmluZyBpbiB3YXJuaW5ncykpCisgICAgICAgICAgICB3YXJu aW5ncyA9ICgiZXhwZWN0YXRpb25zOjEgVGVzdCBsYWNrcyBCVUcgbW9kaWZpZXIuIGZhaWx1cmVz L2V4cGVjdGVkL3RleHQuaHRtbFxuIgorICAgICAgICAgICAgICAgICAgICAgICAgImV4cGVjdGF0 aW9uczoxIFVucmVjb2duaXplZCBtb2RpZmllciAnZm9vJyBmYWlsdXJlcy9leHBlY3RlZC90ZXh0 Lmh0bWxcbiIKKyAgICAgICAgICAgICAgICAgICAgICAgICJleHBlY3RhdGlvbnM6MiBNaXNzaW5n IGV4cGVjdGF0aW9ucyBTS0lQIDogZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2UuaHRtbCIpCisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihlKSwgd2FybmluZ3MpCiAKICAgICAgICAgdHJ5 OgogICAgICAgICAgICAgc2VsZi5wYXJzZV9leHAoJ1NLSVAgOiBmYWlsdXJlcy9leHBlY3RlZC90 ZXh0Lmh0bWwgPSBURVhUJywgaXNfbGludF9tb2RlPVRydWUpCiAgICAgICAgICAgICBzZWxmLmFz c2VydEZhbHNlKFRydWUsICJQYXJzZUVycm9yIHdhc24ndCByYWlzZWQiKQogICAgICAgICBleGNl cHQgUGFyc2VFcnJvciwgZToKLSAgICAgICAgICAgIHdhcm5pbmdzID0gW3UnOjEgVGVzdCBsYWNr cyBCVUcgbW9kaWZpZXIuIGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCddCi0gICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHN0cihlKSwgJ1xuJy5qb2luKHNlbGYuX3BvcnQucGF0aF90b190 ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkgKyBzdHIod2FybmluZykgZm9yIHdhcm5pbmcgaW4gd2Fy bmluZ3MpKQorICAgICAgICAgICAgd2FybmluZ3MgPSB1J2V4cGVjdGF0aW9uczoxIFRlc3QgbGFj a3MgQlVHIG1vZGlmaWVyLiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnCisgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHN0cihlKSwgd2FybmluZ3MpCiAKICAgICBkZWYgdGVzdF9lcnJv cl9vbl9kaWZmZXJlbnRfcGxhdGZvcm0oc2VsZik6CiAgICAgICAgICMgcGFyc2VfZXhwIHVzZXMg YSBXaW5kb3dzIHBvcnQuIEFzc2VydCBlcnJvcnMgb24gTWFjIHNob3cgdXAgaW4gbGludCBtb2Rl LgpAQCAtMjcwLDggKzI3OSwxMSBAQCBjbGFzcyBTa2lwcGVkVGVzdHMoQmFzZSk6CiAgICAgZGVm IGNoZWNrKHNlbGYsIGV4cGVjdGF0aW9ucywgb3ZlcnJpZGVzLCBza2lwcywgbGludD1GYWxzZSk6 CiAgICAgICAgIHBvcnQgPSBNb2NrSG9zdCgpLnBvcnRfZmFjdG9yeS5nZXQoJ3F0JykKICAgICAg ICAgcG9ydC5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocG9ydC5fZmlsZXN5c3RlbS5qb2lu KHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCAnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyks ICdmb28nKQotICAgICAgICBwb3J0LnRlc3RfZXhwZWN0YXRpb25zID0gbGFtYmRhOiBleHBlY3Rh dGlvbnMKLSAgICAgICAgcG9ydC50ZXN0X2V4cGVjdGF0aW9uc19vdmVycmlkZXMgPSBsYW1iZGE6 IG92ZXJyaWRlcworICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnNfZGljdCA9IE9yZGVyZWREaWN0 KCkKKyAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zX2RpY3RbJ2V4cGVjdGF0aW9ucyddID0gZXhw ZWN0YXRpb25zCisgICAgICAgIGlmIG92ZXJyaWRlczoKKyAgICAgICAgICAgIHNlbGYuX2V4cGVj dGF0aW9uc19kaWN0WydvdmVycmlkZXMnXSA9IG92ZXJyaWRlcworICAgICAgICBwb3J0LmV4cGVj dGF0aW9uc19kaWN0ID0gbGFtYmRhOiBzZWxmLl9leHBlY3RhdGlvbnNfZGljdAogICAgICAgICBw b3J0LnNraXBwZWRfbGF5b3V0X3Rlc3RzID0gbGFtYmRhIHRlc3RzOiBzZXQoc2tpcHMpCiAgICAg ICAgIGV4cCA9IFRlc3RFeHBlY3RhdGlvbnMocG9ydCwgWydmYWlsdXJlcy9leHBlY3RlZC90ZXh0 Lmh0bWwnXSwgbGludCkKIApAQCAtNDE2LDkgKzQyOCw5IEBAIGNsYXNzIFJlbW92ZUNvbmZpZ3Vy YXRpb25zVGVzdChCYXNlKToKICAgICAgICAgdGVzdF9wb3J0LnRlc3RfaXNmaWxlID0gbGFtYmRh IHRlc3Q6IFRydWUKIAogICAgICAgICB0ZXN0X2NvbmZpZyA9IHRlc3RfcG9ydC50ZXN0X2NvbmZp Z3VyYXRpb24oKQotICAgICAgICB0ZXN0X3BvcnQudGVzdF9leHBlY3RhdGlvbnMgPSBsYW1iZGE6 ICIiIkJVR1ggTElOVVggV0lOIFJFTEVBU0UgOiBmYWlsdXJlcy9leHBlY3RlZC9mb28uaHRtbCA9 IFRFWFQKKyAgICAgICAgdGVzdF9wb3J0LmV4cGVjdGF0aW9uc19kaWN0ID0gbGFtYmRhOiB7ImV4 cGVjdGF0aW9ucyI6ICIiIkJVR1ggTElOVVggV0lOIFJFTEVBU0UgOiBmYWlsdXJlcy9leHBlY3Rl ZC9mb28uaHRtbCA9IFRFWFQKIEJVR1kgV0lOIE1BQyBERUJVRyA6IGZhaWx1cmVzL2V4cGVjdGVk L2Zvby5odG1sID0gQ1JBU0gKLSIiIgorIiIifQogICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0 RXhwZWN0YXRpb25zKHRlc3RfcG9ydCwgc2VsZi5nZXRfYmFzaWNfdGVzdHMoKSkKIAogICAgICAg ICBhY3R1YWxfZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9u X2Zyb21fdGVzdCgnZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwnLCB0ZXN0X2NvbmZpZykKQEAg LTQzNCw5ICs0NDYsOSBAQCBCVUdZIFdJTiBNQUMgREVCVUcgOiBmYWlsdXJlcy9leHBlY3RlZC9m b28uaHRtbCA9IENSQVNICiAgICAgICAgIHRlc3RfcG9ydC50ZXN0X2lzZmlsZSA9IGxhbWJkYSB0 ZXN0OiBUcnVlCiAKICAgICAgICAgdGVzdF9jb25maWcgPSB0ZXN0X3BvcnQudGVzdF9jb25maWd1 cmF0aW9uKCkKLSAgICAgICAgdGVzdF9wb3J0LnRlc3RfZXhwZWN0YXRpb25zID0gbGFtYmRhOiAi IiJCVUdYIFdJTiBSRUxFQVNFIDogZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwgPSBURVhUCisg ICAgICAgIHRlc3RfcG9ydC5leHBlY3RhdGlvbnNfZGljdCA9IGxhbWJkYTogeydleHBlY3RhdGlv bnMnOiAiIiJCVUdYIFdJTiBSRUxFQVNFIDogZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwgPSBU RVhUCiBCVUdZIFdJTiBERUJVRyA6IGZhaWx1cmVzL2V4cGVjdGVkL2Zvby5odG1sID0gQ1JBU0gK LSIiIgorIiIifQogICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zKHRlc3Rf cG9ydCkKIAogICAgICAgICBhY3R1YWxfZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zLnJlbW92 ZV9jb25maWd1cmF0aW9uX2Zyb21fdGVzdCgnZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0bWwnLCB0 ZXN0X2NvbmZpZykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkK aW5kZXggOGZjYTI5YTJlMTRiZjVlNDRiZWQ1YTQ2MGQ4NWY2ZmI5ODg4YWZlYi4uMWZjNjhlNzdk Yjg1MGFjOTJlYTk1ZWU2OWIzNzc4MjdiOTJjZTM4ZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKQEAgLTE5NywxOCArMTk3LDE1IEBAIGNsYXNzIExpbnRU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4pOgogICAgICAgICAgICAg ICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAgICAgICAgICBzZWxmLnBhdGggPSBwYXRoCiAK LSAgICAgICAgICAgIGRlZiB0ZXN0X2V4cGVjdGF0aW9ucyhzZWxmKToKLSAgICAgICAgICAgICAg ICBzZWxmLmhvc3QucG9ydHNfcGFyc2VkLmFwcGVuZChzZWxmLm5hbWUpCi0gICAgICAgICAgICAg ICAgcmV0dXJuICcnCi0KICAgICAgICAgICAgIGRlZiBwYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25z X2ZpbGUoc2VsZik6CiAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYucGF0aAogCiAgICAgICAg ICAgICBkZWYgdGVzdF9jb25maWd1cmF0aW9uKHNlbGYpOgogICAgICAgICAgICAgICAgIHJldHVy biBOb25lCiAKLSAgICAgICAgICAgIGRlZiB0ZXN0X2V4cGVjdGF0aW9uc19vdmVycmlkZXMoc2Vs Zik6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAgICAgICAgICAgIGRlZiBleHBlY3Rh dGlvbnNfZGljdChzZWxmKToKKyAgICAgICAgICAgICAgICBzZWxmLmhvc3QucG9ydHNfcGFyc2Vk LmFwcGVuZChzZWxmLm5hbWUpCisgICAgICAgICAgICAgICAgcmV0dXJuIHtzZWxmLnBhdGg6ICcn fQogCiAgICAgICAgICAgICBkZWYgc2tpcHBlZF9sYXlvdXRfdGVzdHMoc2VsZiwgdGVzdHMpOgog ICAgICAgICAgICAgICAgIHJldHVybiBzZXQoW10pCkBAIC0yNjEsNyArMjU4LDcgQEAgY2xhc3Mg TGludFRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgICAg IG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcGFyc2VfYXJncyhbJy0tbGludC10ZXN0LWZpbGVzJ10p CiAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIHBvcnRfb2JqID0gaG9zdC5wb3J0 X2ZhY3RvcnkuZ2V0KG9wdGlvbnMucGxhdGZvcm0sIG9wdGlvbnM9b3B0aW9ucykKLSAgICAgICAg cG9ydF9vYmoudGVzdF9leHBlY3RhdGlvbnMgPSBsYW1iZGE6ICIjIHN5bnRheCBlcnJvciIKKyAg ICAgICAgcG9ydF9vYmouZXhwZWN0YXRpb25zX2RpY3QgPSBsYW1iZGE6IHsnJzogJyMgc3ludGF4 IGVycm9yJ30KICAgICAgICAgcmVzLCBvdXQsIGVyciA9IHJ1bl9hbmRfY2FwdHVyZShwb3J0X29i aiwgb3B0aW9ucywgcGFyc2VkX2FyZ3MpCiAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZXMs IC0xKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3Jl YmFzZWxpbmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZV91bml0dGVzdC5weQppbmRleCBmMDc0MGYxZTBlMDc2OWYzOTI5YzBjODZm MjUyNjQ2OWI4MjFmMzk2Li5kMzMwNzU3N2ZkY2ZiMmEwZDgwYjBiNmU4OGRhZmRlNGZiMmI2MDlj IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNl bGluZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZV91bml0dGVzdC5weQpAQCAtMjU0LDEyICsyNTQsMTYgQEAgTU9DSyBydW5f Y29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdCcsICctLXN1ZmZpeGVzJywgJ3BuZycs ICdXZWJraXQgV2luJywKIAogICAgICAgICAjIFRoaXMgdGVzdHMgdGhhdCB0aGUgYW55IHRlc3Rz IG1hcmtlZCBhcyBSRUJBU0VMSU5FIGluIHRoZSBvdmVycmlkZXMgYXJlIGZvdW5kLCBidXQKICAg ICAgICAgIyB0aGF0IHRoZSBvdmVycmlkZXMgZG8gbm90IGdldCB3cml0dGVuIGludG8gdGhlIG1h aW4gZmlsZS4KLSAgICAgICAgc2VsZi5vdmVycmlkZXMgPSAoJ0JVR1ggUkVCQVNFTElORSA6IHVz ZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sID0gVEVYVFxuJwotICAgICAgICAgICAgICAgICAg ICAgICAgICAnQlVHWSA6IHVzZXJzY3JpcHRzL3Rlc3QuaHRtbCA9IENSQVNIXG4nKQorICAgICAg ICBleHBlY3RhdGlvbnNfcGF0aCA9IHBvcnQuZXhwZWN0YXRpb25zX2ZpbGVzKClbMF0KKyAgICAg ICAgZXhwZWN0YXRpb25zX2NvbnRlbnRzID0gJycKKyAgICAgICAgcG9ydC5fZmlsZXN5c3RlbS53 cml0ZV90ZXh0X2ZpbGUoZXhwZWN0YXRpb25zX3BhdGgsIGV4cGVjdGF0aW9uc19jb250ZW50cykK KyAgICAgICAgcG9ydC5leHBlY3RhdGlvbnNfZGljdCA9IGxhbWJkYTogeworICAgICAgICAgICAg ZXhwZWN0YXRpb25zX3BhdGg6IGV4cGVjdGF0aW9uc19jb250ZW50cywKKyAgICAgICAgICAgICdv dmVycmlkZXMnOiAoJ0JVR1ggUkVCQVNFTElORSA6IHVzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5o dG1sID0gVEVYVFxuJworICAgICAgICAgICAgICAgICAgICAgICAgICAnQlVHWSA6IHVzZXJzY3Jp cHRzL3Rlc3QuaHRtbCA9IENSQVNIXG4nKX0KIAogICAgICAgICBmb3IgcGF0aCBpbiBwb3J0LmV4 cGVjdGF0aW9uc19maWxlcygpOgogICAgICAgICAgICAgcG9ydC5fZmlsZXN5c3RlbS53cml0ZV90 ZXh0X2ZpbGUocGF0aCwgJycpCiAgICAgICAgIHBvcnQuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9m aWxlKHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpICsgJy91c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3Qu aHRtbCcsICcnKQotICAgICAgICBwb3J0LnRlc3RfZXhwZWN0YXRpb25zX292ZXJyaWRlcyA9IGxh bWJkYTogc2VsZi5vdmVycmlkZXMKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoY29tbWFuZC5f dGVzdHNfdG9fcmViYXNlbGluZShwb3J0KSwgeyd1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRt bCc6IHNldChbJ3R4dCddKX0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBvcnQuX2ZpbGVz eXN0ZW0ucmVhZF90ZXh0X2ZpbGUocG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUo KSksICcnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhwb3J0Ll9maWxlc3lzdGVtLnJlYWRf dGV4dF9maWxlKGV4cGVjdGF0aW9uc19wYXRoKSwgZXhwZWN0YXRpb25zX2NvbnRlbnRzKQo=