81535 2012-03-19 12:09:01 -0700 NRWT runs some tests that are skipped with -i command line option 2012-03-19 15:43:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap dpranke abarth dpranke eric jberlin ojan tony oldest_to_newest 582022 0 ap 2012-03-19 12:09:01 -0700 I'm seeing some failures in http/tests even when running "run-webkit-tests -i http". Dirk discovered that this happens when an individual test is listed in text_expectations.txt. Clearly, a command line switch should have precedence over that. 582025 1 dpranke 2012-03-19 12:11:22 -0700 agreed. I was lazy when I implemented this the first time, and was hoping people wouldn't run into it ;). 582278 2 132677 dpranke 2012-03-19 14:46:32 -0700 Created attachment 132677 Patch 582287 3 132677 ojan 2012-03-19 14:51:46 -0700 Comment on attachment 132677 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132677&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:872 > + for test in expectation_line.matching_tests: > + self._model._clear_expectations_for_test(test, expectation_line) > + self._model._test_to_expectation_line[test] = expectation_line > + self._model._add_test(test, expectation_line, overrides_allowed=True) Could you instead add a boolean to add_expectation_line? Something like overwrite_existing? I'm not a huge fan of duplicating accounting code like this. If the code changes in add_expectation_line, we'd almost certainly want it to change here to. 582306 4 132682 dpranke 2012-03-19 15:16:21 -0700 Created attachment 132682 reuse add_expectation() instead 582308 5 dpranke 2012-03-19 15:17:24 -0700 (In reply to comment #3) > (From update of attachment 132677 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=132677&action=review > > > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:872 > > + for test in expectation_line.matching_tests: > > + self._model._clear_expectations_for_test(test, expectation_line) > > + self._model._test_to_expectation_line[test] = expectation_line > > + self._model._add_test(test, expectation_line, overrides_allowed=True) > > Could you instead add a boolean to add_expectation_line? Something like overwrite_existing? I'm not a huge fan of duplicating accounting code like this. If the code changes in add_expectation_line, we'd almost certainly want it to change here to. Yeah, I had tried that initially and hadn't been happy with how it looked. I've reworked it again with some different variable names and think this iteration is okay. Thanks for the review! 582346 6 dpranke 2012-03-19 15:43:09 -0700 Committed r111261: <http://trac.webkit.org/changeset/111261> 132677 2012-03-19 14:46:32 -0700 2012-03-19 15:16:17 -0700 Patch bug-81535-20120319144631.patch text/plain 8125 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjEzZWFlODI3YzhiYjJjYTZhY2NlYjUwODRkNTI3N2I0 NTUyOThkNC4uYzZjMjFmYWU4MDY0MzYyNjJjYmMxMjFlMzFlZmViYzgzYmFiZmJlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3 IEBACiAyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIE5SV1QgcnVucyBzb21lIHRlc3RzIHRoYXQgYXJlIHNraXBwZWQgd2l0aCAtaSBjb21t YW5kIGxpbmUgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MTUzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgY2hhbmdlIG1vZGlmaWVzIHRoZSBpbnRlcmFjdGlvbiBvZiBTa2lwcGVkIGZp bGVzIGFuZAorICAgICAgICB0ZXN0X2V4cGVjdGF0aW9ucyBmaWxlcyBzbyB0aGF0IGVudHJpZXMg aW4gU2tpcHBlZCBmaWxlcyAoYW5kCisgICAgICAgIHRoZSAtaSBjb21tYW5kIGxpbmUpIG92ZXJy aWRlICpldmVyeXRoaW5nKiBpbiB0aGUgZXhwZWN0YXRpb25zCisgICAgICAgIGZpbGUuCisKKyAg ICAgICAgU3BlY2lmaWNhbGx5LCBhIGRpcmVjdG9yeSBpbiBhIFNraXBwZWQgZmlsZSB3aWxsIGNh dXNlIGFsbCBvZgorICAgICAgICB0aGUgdGVzdHMgaW4gdGhlIGRpciB0byBiZSBza2lwcGVkIGV2 ZW4gaWYgaW5kaXZpZHVhbCB0ZXN0cyBpbgorICAgICAgICB0aGUgZGlyIGFyZSBsaXN0ZWQgaW4g dGhlIHRlc3RfZXhwZWN0YXRpb25zLnR4dC4KKworICAgICAgICBTa2lwcGVkIGZpbGVzIGFsc28g b3ZlcnJpZGUgYW55dGhpbmcgaW4gYW4gb3ZlcnJpZGVzIGZpbGVzLgorCisgICAgICAgIFRoaXMg c2VlbXMgdG8gbWFrZSBtb3JlIGludHVpdGl2ZSBzZW5zZSwgc2luY2UgaWYgeW91IGxpc3QKKyAg ICAgICAgc29tZXRoaW5nIGluIHRoZSBTa2lwcyBmaWxlIChhbmQgZXZlbiBtb3JlIHNwZWNpZnkg aXQgb24gdGhlCisgICAgICAgIGNvbW1hbmQgbGluZSkgeW91IHByb2JhYmx5IHdhbnQgaXQgdG8g YmUgdW5pdmVyc2FsbHkgYXBwbGllZC4KKworICAgICAgICBUaGVvcmV0aWNhbGx5IHdlIGNvdWxk IGFkZCBtb3JlIHByZWNlZGVuY2UgbGV2ZWxzIGFuZCBoYXZlIGZ1bGwKKyAgICAgICAgcGF0aHMg aW4gYW4gZXhwZWN0YXRpb25zIGZpbGUgb3ZlcnJpZGUgZGlycyBpbiBhIFNraXBwZWQgZmlsZQor ICAgICAgICAoYnV0IG5vdCB0aGUgY29tbWFuZCBsaW5lKSwgYnV0IEkgZG9uJ3Qga25vdyB5ZXQg dGhhdCB0aGF0IGxldmVsCisgICAgICAgIG9mIGNvbXBsZXhpdHkgaXMganVzdGlmaWVkLgorICAg ICAgICAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9leHBlY3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLl9faW5pdF9fKToK KyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMuX2FkZF9za2lwcGVkX3Rlc3RzKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNf dW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X21vcmVfc3BlY2lmaWNfb3ZlcnJpZGVfcmVzZXRz X3NraXApOgorICAgICAgICAoU2tpcHBlZFRlc3RzKToKKyAgICAgICAgKFNraXBwZWRUZXN0cy5n ZXRfZXhwKToKKyAgICAgICAgKFNraXBwZWRUZXN0cy5hc3NlcnRfZXhwKToKKyAgICAgICAgKFNr aXBwZWRUZXN0cy50ZXN0X3NraXBwZWRfdGVzdHNfd29yayk6CisgICAgICAgIChTa2lwcGVkVGVz dHMudGVzdF9kdXBsaWNhdGVfc2tpcHBlZF90ZXN0X2ZhaWxzX2xpbnQpOgorICAgICAgICAoU2tp cHBlZFRlc3RzLnRlc3Rfc2tpcHBlZF9maWxlX292ZXJyaWRlc19leHBlY3RhdGlvbnMpOgorICAg ICAgICAoU2tpcHBlZFRlc3RzLnRlc3Rfc2tpcHBlZF9kaXJfb3ZlcnJpZGVzX2V4cGVjdGF0aW9u cyk6CisgICAgICAgIChTa2lwcGVkVGVzdHMudGVzdF9za2lwcGVkX2ZpbGVfb3ZlcnJpZGVzX292 ZXJyaWRlcyk6CisgICAgICAgIChTa2lwcGVkVGVzdHMudGVzdF9za2lwcGVkX2Rpcl9vdmVycmlk ZXNfb3ZlcnJpZGVzKToKKworMjAxMi0wMy0xOSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9t aXVtLm9yZz4KKwogICAgICAgICBhZGQgZHByYW5rZSB0byB3ZWJraXRweSB3YXRjaGxpc3QKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxNDMzCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0 X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCBlNjliNTIxNWUzN2NhMjdiOTgzMThkZmVh ZDYyNTI5NDdhYzEwMTAzLi42NjBkOGQ5MGQ0Y2E4ZTk1MzMyZTE5OGRiYTQ1ZmMyYjk4ZTY5ZTYw IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv dGVzdF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC03MTcsMTMgKzcxNywxNCBAQCBj bGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAKICAgICAgICAgc2VsZi5fZXhwZWN0YXRp b25zID0gc2VsZi5fcGFyc2VyLnBhcnNlKGV4cGVjdGF0aW9ucykKICAgICAgICAgc2VsZi5fYWRk X2V4cGVjdGF0aW9ucyhzZWxmLl9leHBlY3RhdGlvbnMsIG92ZXJyaWRlc19hbGxvd2VkPUZhbHNl KQotICAgICAgICBzZWxmLl9hZGRfc2tpcHBlZF90ZXN0cyhza2lwcGVkX3Rlc3RzIG9yIFtdKQog CiAgICAgICAgIGlmIG92ZXJyaWRlczoKICAgICAgICAgICAgIG92ZXJyaWRlc19leHBlY3RhdGlv bnMgPSBzZWxmLl9wYXJzZXIucGFyc2Uob3ZlcnJpZGVzKQogICAgICAgICAgICAgc2VsZi5fYWRk X2V4cGVjdGF0aW9ucyhvdmVycmlkZXNfZXhwZWN0YXRpb25zLCBvdmVycmlkZXNfYWxsb3dlZD1U cnVlKQogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zICs9IG92ZXJyaWRlc19leHBlY3Rh dGlvbnMKIAorICAgICAgICBzZWxmLl9hZGRfc2tpcHBlZF90ZXN0cyhza2lwcGVkX3Rlc3RzIG9y IFtdKQorCiAgICAgICAgIHNlbGYuX2hhc193YXJuaW5ncyA9IEZhbHNlCiAgICAgICAgIHNlbGYu X3JlcG9ydF93YXJuaW5ncygpCiAgICAgICAgIHNlbGYuX3Byb2Nlc3NfdGVzdHNfd2l0aG91dF9l eHBlY3RhdGlvbnMoKQpAQCAtODYyLDUgKzg2MywxMCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25z KG9iamVjdCk6CiAgICAgICAgIGZvciBpbmRleCwgdGVzdCBpbiBlbnVtZXJhdGUoc2VsZi5fZXhw ZWN0YXRpb25zLCBzdGFydD0xKToKICAgICAgICAgICAgIGlmIHRlc3QubmFtZSBhbmQgdGVzdC5u YW1lIGluIHRlc3RzX3RvX3NraXA6CiAgICAgICAgICAgICAgICAgc2VsZi5fc2tpcHBlZF90ZXN0 c193YXJuaW5ncy5hcHBlbmQoJzolZCAlcyBpcyBhbHNvIGluIGEgU2tpcHBlZCBmaWxlLicgJSAo aW5kZXgsIHRlc3QubmFtZSkpCisKICAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiB0ZXN0c190b19z a2lwOgotICAgICAgICAgICAgc2VsZi5fbW9kZWwuYWRkX2V4cGVjdGF0aW9uX2xpbmUoc2VsZi5f cGFyc2VyLmV4cGVjdGF0aW9uX2Zvcl9za2lwcGVkX3Rlc3QodGVzdF9uYW1lKSwgb3ZlcnJpZGVz X2FsbG93ZWQ9VHJ1ZSkKKyAgICAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBzZWxmLl9wYXJz ZXIuZXhwZWN0YXRpb25fZm9yX3NraXBwZWRfdGVzdCh0ZXN0X25hbWUpCisgICAgICAgICAgICBm b3IgdGVzdCBpbiBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX3Rlc3RzOgorICAgICAgICAgICAg ICAgIHNlbGYuX21vZGVsLl9jbGVhcl9leHBlY3RhdGlvbnNfZm9yX3Rlc3QodGVzdCwgZXhwZWN0 YXRpb25fbGluZSkKKyAgICAgICAgICAgICAgICBzZWxmLl9tb2RlbC5fdGVzdF90b19leHBlY3Rh dGlvbl9saW5lW3Rlc3RdID0gZXhwZWN0YXRpb25fbGluZQorICAgICAgICAgICAgICAgIHNlbGYu X21vZGVsLl9hZGRfdGVzdCh0ZXN0LCBleHBlY3RhdGlvbl9saW5lLCBvdmVycmlkZXNfYWxsb3dl ZD1UcnVlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5Cmlu ZGV4IDllNGE0NzEwODYxYTY3M2Y5NzI1YTQ4NTljNDdmN2QwODk2YzE3MWUuLjM5YTQ2MTM3ZmY2 M2RmYmQ3YzA4NmRkYWFlMTY2ZmIxNTQ5ODNkYTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKQEAgLTI2MCwxNyArMjYwLDQxIEBAIFNLSVAgOiBmYWls dXJlcy9leHBlY3RlZC9pbWFnZS5odG1sIiIiLCBpc19saW50X21vZGU9VHJ1ZSkKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2ZhaWx1cmVzL2V4 cGVjdGVkL3RleHQuaHRtbCcpIGluCiAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fZXhw LmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKFNLSVApKQogCi0gICAgZGVmIHRlc3RfYWRkX3Nr aXBwZWRfdGVzdHMoc2VsZik6Ci0gICAgICAgIHBvcnQgPSBNb2NrSG9zdCgpLnBvcnRfZmFjdG9y eS5nZXQoJ3F0JykKLSAgICAgICAgcG9ydC5fZmlsZXN5c3RlbS5maWxlc1twb3J0Ll9maWxlc3lz dGVtLmpvaW4ocG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksICdmYWlsdXJlcy9leHBlY3RlZC90ZXh0 Lmh0bWwnKV0gPSAnZm9vJwotICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25z KHBvcnQsIHRlc3RzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJ10sIGV4cGVjdGF0aW9u cz0nJywgdGVzdF9jb25maWc9cG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24oKSwgc2tpcHBlZF90ZXN0 cz1zZXQoWydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSkpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWxzKGV4cGVjdGF0aW9ucy5nZXRfbW9kaWZpZXJzKCdmYWlsdXJlcy9leHBlY3RlZC90 ZXh0Lmh0bWwnKSwgW1Rlc3RFeHBlY3RhdGlvblBhcnNlci5EVU1NWV9CVUdfTU9ESUZJRVIsIFRl c3RFeHBlY3RhdGlvblBhcnNlci5TS0lQX01PRElGSUVSXSkKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoZXhwZWN0YXRpb25zLmdldF9leHBlY3RhdGlvbnMoJ2ZhaWx1cmVzL2V4cGVjdGVkL3Rl eHQuaHRtbCcpLCBzZXQoW1BBU1NdKSkKIAotICAgIGRlZiB0ZXN0X2FkZF9za2lwcGVkX3Rlc3Rz X2R1cGxpY2F0ZShzZWxmKToKK2NsYXNzIFNraXBwZWRUZXN0cyhCYXNlKToKKyAgICBkZWYgY2hl Y2soc2VsZiwgZXhwZWN0YXRpb25zLCBvdmVycmlkZXMsIHNraXBzLCBsaW50PUZhbHNlKToKICAg ICAgICAgcG9ydCA9IE1vY2tIb3N0KCkucG9ydF9mYWN0b3J5LmdldCgncXQnKQotICAgICAgICBw b3J0Ll9maWxlc3lzdGVtLmZpbGVzW3BvcnQuX2ZpbGVzeXN0ZW0uam9pbihwb3J0LmxheW91dF90 ZXN0c19kaXIoKSwgJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpXSA9ICdmb28nCi0gICAg ICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFBhcnNlRXJyb3IsIFRlc3RFeHBlY3RhdGlvbnMsIHBvcnQs IHRlc3RzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJ10sIGV4cGVjdGF0aW9ucz0nQlVH WCA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IHRleHRcbicsIHRlc3RfY29uZmlnPXBv cnQudGVzdF9jb25maWd1cmF0aW9uKCksIGlzX2xpbnRfbW9kZT1UcnVlLCBza2lwcGVkX3Rlc3Rz PXNldChbJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCddKSkKKyAgICAgICAgcG9ydC5fZmls ZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocG9ydC5fZmlsZXN5c3RlbS5qb2luKHBvcnQubGF5b3V0 X3Rlc3RzX2RpcigpLCAnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyksICdmb28nKQorICAg ICAgICBleHAgPSBUZXN0RXhwZWN0YXRpb25zKHBvcnQsIHRlc3RzPVsnZmFpbHVyZXMvZXhwZWN0 ZWQvdGV4dC5odG1sJ10sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0YXRp b25zPWV4cGVjdGF0aW9ucywgb3ZlcnJpZGVzPW92ZXJyaWRlcywgaXNfbGludF9tb2RlPWxpbnQs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9jb25maWc9cG9ydC50ZXN0X2Nv bmZpZ3VyYXRpb24oKSwgc2tpcHBlZF90ZXN0cz1zZXQoc2tpcHMpKQorCisgICAgICAgICMgQ2hl Y2sgdGhhdCB0aGUgZXhwZWN0YXRpb24gaXMgZm9yIEJVR19EVU1NWSBTS0lQIDogLi4uID0gUEFT UworICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhleHAuZ2V0X21vZGlmaWVycygnZmFpbHVyZXMv ZXhwZWN0ZWQvdGV4dC5odG1sJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgIFtUZXN0RXhw ZWN0YXRpb25QYXJzZXIuRFVNTVlfQlVHX01PRElGSUVSLCBUZXN0RXhwZWN0YXRpb25QYXJzZXIu U0tJUF9NT0RJRklFUl0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGV4cC5nZXRfZXhwZWN0 YXRpb25zKCdmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnKSwgc2V0KFtQQVNTXSkpCisKKyAg ICBkZWYgdGVzdF9za2lwcGVkX3Rlc3RzX3dvcmsoc2VsZik6CisgICAgICAgIHNlbGYuY2hlY2so ZXhwZWN0YXRpb25zPScnLCBvdmVycmlkZXM9Tm9uZSwgc2tpcHM9WydmYWlsdXJlcy9leHBlY3Rl ZC90ZXh0Lmh0bWwnXSkKKworICAgIGRlZiB0ZXN0X2R1cGxpY2F0ZV9za2lwcGVkX3Rlc3RfZmFp bHNfbGludChzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoUGFyc2VFcnJvciwgc2Vs Zi5jaGVjaywgZXhwZWN0YXRpb25zPSdCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1s ID0gdGV4dFxuJywgb3ZlcnJpZGVzPU5vbmUsIHNraXBzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4 dC5odG1sJ10sIGxpbnQ9VHJ1ZSkKKworICAgIGRlZiB0ZXN0X3NraXBwZWRfZmlsZV9vdmVycmlk ZXNfZXhwZWN0YXRpb25zKHNlbGYpOgorICAgICAgICBzZWxmLmNoZWNrKGV4cGVjdGF0aW9ucz0n QlVHWCA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IFRFWFRcbicsIG92ZXJyaWRlcz1O b25lLAorICAgICAgICAgICAgICAgICAgIHNraXBzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5o dG1sJ10pCisKKyAgICBkZWYgdGVzdF9za2lwcGVkX2Rpcl9vdmVycmlkZXNfZXhwZWN0YXRpb25z KHNlbGYpOgorICAgICAgICBzZWxmLmNoZWNrKGV4cGVjdGF0aW9ucz0nQlVHWCA6IGZhaWx1cmVz L2V4cGVjdGVkL3RleHQuaHRtbCA9IFRFWFRcbicsIG92ZXJyaWRlcz1Ob25lLAorICAgICAgICAg ICAgICAgICAgIHNraXBzPVsnZmFpbHVyZXMvZXhwZWN0ZWQnXSkKKworICAgIGRlZiB0ZXN0X3Nr aXBwZWRfZmlsZV9vdmVycmlkZXNfb3ZlcnJpZGVzKHNlbGYpOgorICAgICAgICBzZWxmLmNoZWNr KGV4cGVjdGF0aW9ucz0nJywgb3ZlcnJpZGVzPSdCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4 dC5odG1sID0gVEVYVFxuJywKKyAgICAgICAgICAgICAgICAgICBza2lwcz1bJ2ZhaWx1cmVzL2V4 cGVjdGVkL3RleHQuaHRtbCddKQorCisgICAgZGVmIHRlc3Rfc2tpcHBlZF9kaXJfb3ZlcnJpZGVz X292ZXJyaWRlcyhzZWxmKToKKyAgICAgICAgc2VsZi5jaGVjayhleHBlY3RhdGlvbnM9JycsIG92 ZXJyaWRlcz0nQlVHWCA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IFRFWFRcbicsCisg ICAgICAgICAgICAgICAgICAgc2tpcHM9WydmYWlsdXJlcy9leHBlY3RlZCddKQogCiAKIGNsYXNz IEV4cGVjdGF0aW9uU3ludGF4VGVzdHMoQmFzZSk6Cg== 132682 2012-03-19 15:16:21 -0700 2012-03-19 15:16:44 -0700 reuse add_expectation() instead bug-81535-20120319151620.patch text/plain 13062 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjEzZWFlODI3YzhiYjJjYTZhY2NlYjUwODRkNTI3N2I0 NTUyOThkNC4uOTRjYTNiNWYxZGI0YzgyNmU4NjY5YjU1OWE4M2M1Mjk3NTM0MTY2NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUx IEBACiAyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIE5SV1QgcnVucyBzb21lIHRlc3RzIHRoYXQgYXJlIHNraXBwZWQgd2l0aCAtaSBjb21t YW5kIGxpbmUgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04MTUzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgY2hhbmdlIG1vZGlmaWVzIHRoZSBpbnRlcmFjdGlvbiBvZiBTa2lwcGVkIGZp bGVzIGFuZAorICAgICAgICB0ZXN0X2V4cGVjdGF0aW9ucyBmaWxlcyBzbyB0aGF0IGVudHJpZXMg aW4gU2tpcHBlZCBmaWxlcyAoYW5kCisgICAgICAgIHRoZSAtaSBjb21tYW5kIGxpbmUpIG92ZXJy aWRlICpldmVyeXRoaW5nKiBpbiB0aGUgZXhwZWN0YXRpb25zCisgICAgICAgIGZpbGUuCisKKyAg ICAgICAgU3BlY2lmaWNhbGx5LCBhIGRpcmVjdG9yeSBpbiBhIFNraXBwZWQgZmlsZSB3aWxsIGNh dXNlIGFsbCBvZgorICAgICAgICB0aGUgdGVzdHMgaW4gdGhlIGRpciB0byBiZSBza2lwcGVkIGV2 ZW4gaWYgaW5kaXZpZHVhbCB0ZXN0cyBpbgorICAgICAgICB0aGUgZGlyIGFyZSBsaXN0ZWQgaW4g dGhlIHRlc3RfZXhwZWN0YXRpb25zLnR4dC4KKworICAgICAgICBTa2lwcGVkIGZpbGVzIGFsc28g b3ZlcnJpZGUgYW55dGhpbmcgaW4gYW4gb3ZlcnJpZGVzIGZpbGVzLgorCisgICAgICAgIFRoaXMg c2VlbXMgdG8gbWFrZSBtb3JlIGludHVpdGl2ZSBzZW5zZSwgc2luY2UgaWYgeW91IGxpc3QKKyAg ICAgICAgc29tZXRoaW5nIGluIHRoZSBTa2lwcyBmaWxlIChhbmQgZXZlbiBtb3JlIHNwZWNpZnkg aXQgb24gdGhlCisgICAgICAgIGNvbW1hbmQgbGluZSkgeW91IHByb2JhYmx5IHdhbnQgaXQgdG8g YmUgdW5pdmVyc2FsbHkgYXBwbGllZC4KKworICAgICAgICBUaGVvcmV0aWNhbGx5IHdlIGNvdWxk IGFkZCBtb3JlIHByZWNlZGVuY2UgbGV2ZWxzIGFuZCBoYXZlIGZ1bGwKKyAgICAgICAgcGF0aHMg aW4gYW4gZXhwZWN0YXRpb25zIGZpbGUgb3ZlcnJpZGUgZGlycyBpbiBhIFNraXBwZWQgZmlsZQor ICAgICAgICAoYnV0IG5vdCB0aGUgY29tbWFuZCBsaW5lKSwgYnV0IEkgZG9uJ3Qga25vdyB5ZXQg dGhhdCB0aGF0IGxldmVsCisgICAgICAgIG9mIGNvbXBsZXhpdHkgaXMganVzdGlmaWVkLgorICAg ICAgICAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9leHBlY3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLl9faW5pdF9fKToK KyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMuX2FkZF9za2lwcGVkX3Rlc3RzKToKKyAgICAgICAg KFRlc3RFeHBlY3RhdGlvbnMuX2FkZF90ZXN0KToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMu X2FkZF9leHBlY3RhdGlvbnMpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5fYWRkX2V4cGVj dGF0aW9uX2xpbmUpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5fYWxyZWFkeV9zZWVuX2Jl dHRlcl9tYXRjaCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5OgorICAgICAgICAodGVzdF9tb3JlX3Nw ZWNpZmljX292ZXJyaWRlX3Jlc2V0c19za2lwKToKKyAgICAgICAgKFNraXBwZWRUZXN0cyk6Cisg ICAgICAgIChTa2lwcGVkVGVzdHMuZ2V0X2V4cCk6CisgICAgICAgIChTa2lwcGVkVGVzdHMuYXNz ZXJ0X2V4cCk6CisgICAgICAgIChTa2lwcGVkVGVzdHMudGVzdF9za2lwcGVkX3Rlc3RzX3dvcmsp OgorICAgICAgICAoU2tpcHBlZFRlc3RzLnRlc3RfZHVwbGljYXRlX3NraXBwZWRfdGVzdF9mYWls c19saW50KToKKyAgICAgICAgKFNraXBwZWRUZXN0cy50ZXN0X3NraXBwZWRfZmlsZV9vdmVycmlk ZXNfZXhwZWN0YXRpb25zKToKKyAgICAgICAgKFNraXBwZWRUZXN0cy50ZXN0X3NraXBwZWRfZGly X292ZXJyaWRlc19leHBlY3RhdGlvbnMpOgorICAgICAgICAoU2tpcHBlZFRlc3RzLnRlc3Rfc2tp cHBlZF9maWxlX292ZXJyaWRlc19vdmVycmlkZXMpOgorICAgICAgICAoU2tpcHBlZFRlc3RzLnRl c3Rfc2tpcHBlZF9kaXJfb3ZlcnJpZGVzX292ZXJyaWRlcyk6CisKKzIwMTItMDMtMTkgIERpcmsg UHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgYWRkIGRwcmFua2UgdG8g d2Via2l0cHkgd2F0Y2hsaXN0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04MTQzMwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggZTY5 YjUyMTVlMzdjYTI3Yjk4MzE4ZGZlYWQ2MjUyOTQ3YWMxMDEwMy4uZWUxNGQzZjgwODY4YTQ2Njhh MTQ2YzkyMDg5MjYwYzQ3YWVkNDEwNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpA QCAtNDY3LDIxICs0NjcsMjEgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uc01vZGVsKG9iamVjdCk6 CiAgICAgZGVmIGdldF9leHBlY3RhdGlvbnMoc2VsZiwgdGVzdCk6CiAgICAgICAgIHJldHVybiBz ZWxmLl90ZXN0X3RvX2V4cGVjdGF0aW9uc1t0ZXN0XQogCi0gICAgZGVmIGFkZF9leHBlY3RhdGlv bl9saW5lKHNlbGYsIGV4cGVjdGF0aW9uX2xpbmUsIG92ZXJyaWRlc19hbGxvd2VkKToKKyAgICBk ZWYgYWRkX2V4cGVjdGF0aW9uX2xpbmUoc2VsZiwgZXhwZWN0YXRpb25fbGluZSwgaW5fb3ZlcnJp ZGVzPUZhbHNlLCBpbl9za2lwcGVkPUZhbHNlKToKICAgICAgICAgIiIiUmV0dXJucyBhIGxpc3Qg b2Ygd2FybmluZ3MgZW5jb3VudGVyZWQgd2hpbGUgbWF0Y2hpbmcgbW9kaWZpZXJzLiIiIgogCiAg ICAgICAgIGlmIGV4cGVjdGF0aW9uX2xpbmUuaXNfaW52YWxpZCgpOgogICAgICAgICAgICAgcmV0 dXJuCiAKICAgICAgICAgZm9yIHRlc3QgaW4gZXhwZWN0YXRpb25fbGluZS5tYXRjaGluZ190ZXN0 czoKLSAgICAgICAgICAgIGlmIHNlbGYuX2FscmVhZHlfc2Vlbl9iZXR0ZXJfbWF0Y2godGVzdCwg ZXhwZWN0YXRpb25fbGluZSwgb3ZlcnJpZGVzX2FsbG93ZWQpOgorICAgICAgICAgICAgaWYgbm90 IGluX3NraXBwZWQgYW5kIHNlbGYuX2FscmVhZHlfc2Vlbl9iZXR0ZXJfbWF0Y2godGVzdCwgZXhw ZWN0YXRpb25fbGluZSwgaW5fb3ZlcnJpZGVzKToKICAgICAgICAgICAgICAgICBjb250aW51ZQog CiAgICAgICAgICAgICBzZWxmLl9jbGVhcl9leHBlY3RhdGlvbnNfZm9yX3Rlc3QodGVzdCwgZXhw ZWN0YXRpb25fbGluZSkKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfdG9fZXhwZWN0YXRpb25fbGlu ZVt0ZXN0XSA9IGV4cGVjdGF0aW9uX2xpbmUKLSAgICAgICAgICAgIHNlbGYuX2FkZF90ZXN0KHRl c3QsIGV4cGVjdGF0aW9uX2xpbmUsIG92ZXJyaWRlc19hbGxvd2VkKQorICAgICAgICAgICAgc2Vs Zi5fYWRkX3Rlc3QodGVzdCwgZXhwZWN0YXRpb25fbGluZSwgaW5fb3ZlcnJpZGVzKQogCi0gICAg ZGVmIF9hZGRfdGVzdChzZWxmLCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lLCBvdmVycmlkZXNfYWxs b3dlZCk6CisgICAgZGVmIF9hZGRfdGVzdChzZWxmLCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lLCBp bl9vdmVycmlkZXMpOgogICAgICAgICAiIiJTZXRzIHRoZSBleHBlY3RlZCBzdGF0ZSBmb3IgYSBn aXZlbiB0ZXN0LgogCiAgICAgICAgIFRoaXMgcm91dGluZSBhc3N1bWVzIHRoZSB0ZXN0IGhhcyBu b3QgYmVlbiBhZGRlZCBiZWZvcmUuIElmIGl0IGhhcywKQEAgLTQ5MSw4ICs0OTEsNyBAQCBjbGFz cyBUZXN0RXhwZWN0YXRpb25zTW9kZWwob2JqZWN0KToKICAgICAgICAgQXJnczoKICAgICAgICAg ICB0ZXN0OiB0ZXN0IHRvIGFkZAogICAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmU6IGV4cGVjdGF0 aW9uIHRvIGFkZAotICAgICAgICAgIG92ZXJyaWRlc19hbGxvd2VkOiB3aGV0aGVyIHdlJ3JlIHBh cnNpbmcgdGhlIHJlZ3VsYXIgZXhwZWN0YXRpb25zCi0gICAgICAgICAgICAgIG9yIHRoZSBvdmVy cmlkZGluZyBleHBlY3RhdGlvbnMiIiIKKyAgICAgICAgICBpbl9vdmVycmlkZXM6IHdoZXRoZXIg d2UncmUgcGFyc2luZyB0aGUgcmVndWxhciBleHBlY3RhdGlvbnMgb3IgdGhlIG92ZXJyaWRkaW5n IGV4cGVjdGF0aW9ucyIiIgogICAgICAgICBzZWxmLl90ZXN0X3RvX2V4cGVjdGF0aW9uc1t0ZXN0 XSA9IGV4cGVjdGF0aW9uX2xpbmUucGFyc2VkX2V4cGVjdGF0aW9ucwogICAgICAgICBmb3IgZXhw ZWN0YXRpb24gaW4gZXhwZWN0YXRpb25fbGluZS5wYXJzZWRfZXhwZWN0YXRpb25zOgogICAgICAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25fdG9fdGVzdHNbZXhwZWN0YXRpb25dLmFkZCh0ZXN0KQpA QCAtNTE2LDcgKzUxNSw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbChvYmplY3QpOgog ICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fcmVzdWx0X3R5cGVfdG9fdGVzdHNbRkFJ TF0uYWRkKHRlc3QpCiAKLSAgICAgICAgaWYgb3ZlcnJpZGVzX2FsbG93ZWQ6CisgICAgICAgIGlm IGluX292ZXJyaWRlczoKICAgICAgICAgICAgIHNlbGYuX292ZXJyaWRkaW5nX3Rlc3RzLmFkZCh0 ZXN0KQogCiAgICAgZGVmIF9jbGVhcl9leHBlY3RhdGlvbnNfZm9yX3Rlc3Qoc2VsZiwgdGVzdCwg ZXhwZWN0YXRpb25fbGluZSk6CkBAIC01NDEsNyArNTQwLDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0 aW9uc01vZGVsKG9iamVjdCk6CiAgICAgICAgICAgICBpZiB0ZXN0IGluIHNldF9vZl90ZXN0czoK ICAgICAgICAgICAgICAgICBzZXRfb2ZfdGVzdHMucmVtb3ZlKHRlc3QpCiAKLSAgICBkZWYgX2Fs cmVhZHlfc2Vlbl9iZXR0ZXJfbWF0Y2goc2VsZiwgdGVzdCwgZXhwZWN0YXRpb25fbGluZSwgb3Zl cnJpZGVzX2FsbG93ZWQpOgorICAgIGRlZiBfYWxyZWFkeV9zZWVuX2JldHRlcl9tYXRjaChzZWxm LCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lLCBpbl9vdmVycmlkZXMpOgogICAgICAgICAiIiJSZXR1 cm5zIHdoZXRoZXIgd2UndmUgc2VlbiBhIGJldHRlciBtYXRjaCBhbHJlYWR5IGluIHRoZSBmaWxl LgogCiAgICAgICAgIFJldHVybnMgVHJ1ZSBpZiB3ZSd2ZSBhbHJlYWR5IHNlZW4gYSBleHBlY3Rh dGlvbl9saW5lLm5hbWUgdGhhdCBtYXRjaGVzIG1vcmUgb2YgdGhlIHRlc3QKQEAgLTU2Miw3ICs1 NjEsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zTW9kZWwob2JqZWN0KToKICAgICAgICAgICAg ICMgVGhpcyBwYXRoIG1hdGNoZXMgbW9yZSBvZiB0aGUgdGVzdC4KICAgICAgICAgICAgIHJldHVy biBGYWxzZQogCi0gICAgICAgIGlmIG92ZXJyaWRlc19hbGxvd2VkIGFuZCB0ZXN0IG5vdCBpbiBz ZWxmLl9vdmVycmlkZGluZ190ZXN0czoKKyAgICAgICAgaWYgaW5fb3ZlcnJpZGVzIGFuZCB0ZXN0 IG5vdCBpbiBzZWxmLl9vdmVycmlkZGluZ190ZXN0czoKICAgICAgICAgICAgICMgV2UgaGF2ZSBz ZWVuIHRoaXMgcGF0aCwgYnV0IHRoYXQncyBva2F5IGJlY2F1c2UgaXQgaXMKICAgICAgICAgICAg ICMgaW4gdGhlIG92ZXJyaWRlcyBhbmQgdGhlIGVhcmxpZXIgcGF0aCB3YXMgaW4gdGhlCiAgICAg ICAgICAgICAjIGV4cGVjdGF0aW9ucyAobm90IHRoZSBvdmVycmlkZXMpLgpAQCAtNTcxLDcgKzU3 MCw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbChvYmplY3QpOgogICAgICAgICAjIEF0 IHRoaXMgcG9pbnQgd2Uga25vdyB3ZSBoYXZlIHNlZW4gYSBwcmV2aW91cyBleGFjdCBtYXRjaCBv biB0aGlzCiAgICAgICAgICMgYmFzZSBwYXRoLCBzbyB3ZSBuZWVkIHRvIGNoZWNrIHRoZSB0d28g c2V0cyBvZiBtb2RpZmllcnMuCiAKLSAgICAgICAgaWYgb3ZlcnJpZGVzX2FsbG93ZWQ6CisgICAg ICAgIGlmIGluX292ZXJyaWRlczoKICAgICAgICAgICAgIGV4cGVjdGF0aW9uX3NvdXJjZSA9ICJv dmVycmlkZSIKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGV4cGVjdGF0aW9uX3NvdXJjZSA9 ICJleHBlY3RhdGlvbiIKQEAgLTcxNiwxNCArNzE1LDE1IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlv bnMob2JqZWN0KToKICAgICAgICAgc2VsZi5fc2tpcHBlZF90ZXN0c193YXJuaW5ncyA9IFtdCiAK ICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gc2VsZi5fcGFyc2VyLnBhcnNlKGV4cGVjdGF0 aW9ucykKLSAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhzZWxmLl9leHBlY3RhdGlvbnMs IG92ZXJyaWRlc19hbGxvd2VkPUZhbHNlKQotICAgICAgICBzZWxmLl9hZGRfc2tpcHBlZF90ZXN0 cyhza2lwcGVkX3Rlc3RzIG9yIFtdKQorICAgICAgICBzZWxmLl9hZGRfZXhwZWN0YXRpb25zKHNl bGYuX2V4cGVjdGF0aW9ucywgaW5fb3ZlcnJpZGVzPUZhbHNlKQogCiAgICAgICAgIGlmIG92ZXJy aWRlczoKICAgICAgICAgICAgIG92ZXJyaWRlc19leHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIu cGFyc2Uob3ZlcnJpZGVzKQotICAgICAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhvdmVy cmlkZXNfZXhwZWN0YXRpb25zLCBvdmVycmlkZXNfYWxsb3dlZD1UcnVlKQorICAgICAgICAgICAg c2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhvdmVycmlkZXNfZXhwZWN0YXRpb25zLCBpbl9vdmVycmlk ZXM9VHJ1ZSkKICAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyArPSBvdmVycmlkZXNfZXhw ZWN0YXRpb25zCiAKKyAgICAgICAgc2VsZi5fYWRkX3NraXBwZWRfdGVzdHMoc2tpcHBlZF90ZXN0 cyBvciBbXSkKKwogICAgICAgICBzZWxmLl9oYXNfd2FybmluZ3MgPSBGYWxzZQogICAgICAgICBz ZWxmLl9yZXBvcnRfd2FybmluZ3MoKQogICAgICAgICBzZWxmLl9wcm9jZXNzX3Rlc3RzX3dpdGhv dXRfZXhwZWN0YXRpb25zKCkKQEAgLTgxMyw3ICs4MTMsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRp b25zKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuX2Z1bGxfdGVzdF9saXN0OgogICAgICAgICAg ICAgZm9yIHRlc3QgaW4gc2VsZi5fZnVsbF90ZXN0X2xpc3Q6CiAgICAgICAgICAgICAgICAgaWYg bm90IHNlbGYuX21vZGVsLmhhc190ZXN0KHRlc3QpOgotICAgICAgICAgICAgICAgICAgICBzZWxm Ll9tb2RlbC5hZGRfZXhwZWN0YXRpb25fbGluZShUZXN0RXhwZWN0YXRpb25MaW5lLmNyZWF0ZV9w YXNzaW5nX2V4cGVjdGF0aW9uKHRlc3QpLCBvdmVycmlkZXNfYWxsb3dlZD1GYWxzZSkKKyAgICAg ICAgICAgICAgICAgICAgc2VsZi5fbW9kZWwuYWRkX2V4cGVjdGF0aW9uX2xpbmUoVGVzdEV4cGVj dGF0aW9uTGluZS5jcmVhdGVfcGFzc2luZ19leHBlY3RhdGlvbih0ZXN0KSkKIAogICAgIGRlZiBo YXNfd2FybmluZ3Moc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9oYXNfd2FybmluZ3MKQEAg LTg0OCwxMyArODQ4LDEzIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0KToKIAogICAg ICAgICByZXR1cm4gVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhmaWx0 ZXIod2l0aG91dF9yZWJhc2VsaW5lX21vZGlmaWVyLCBzZWxmLl9leHBlY3RhdGlvbnMpKQogCi0g ICAgZGVmIF9hZGRfZXhwZWN0YXRpb25zKHNlbGYsIGV4cGVjdGF0aW9uX2xpc3QsIG92ZXJyaWRl c19hbGxvd2VkKToKKyAgICBkZWYgX2FkZF9leHBlY3RhdGlvbnMoc2VsZiwgZXhwZWN0YXRpb25f bGlzdCwgaW5fb3ZlcnJpZGVzKToKICAgICAgICAgZm9yIGV4cGVjdGF0aW9uX2xpbmUgaW4gZXhw ZWN0YXRpb25fbGlzdDoKICAgICAgICAgICAgIGlmIG5vdCBleHBlY3RhdGlvbl9saW5lLmV4cGVj dGF0aW9uczoKICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICBpZiBzZWxm Ll9pc19saW50X21vZGUgb3Igc2VsZi5fdGVzdF9jb25maWcgaW4gZXhwZWN0YXRpb25fbGluZS5t YXRjaGluZ19jb25maWd1cmF0aW9uczoKLSAgICAgICAgICAgICAgICBzZWxmLl9tb2RlbC5hZGRf ZXhwZWN0YXRpb25fbGluZShleHBlY3RhdGlvbl9saW5lLCBvdmVycmlkZXNfYWxsb3dlZCkKKyAg ICAgICAgICAgICAgICBzZWxmLl9tb2RlbC5hZGRfZXhwZWN0YXRpb25fbGluZShleHBlY3RhdGlv bl9saW5lLCBpbl9vdmVycmlkZXMpCiAKICAgICBkZWYgX2FkZF9za2lwcGVkX3Rlc3RzKHNlbGYs IHRlc3RzX3RvX3NraXApOgogICAgICAgICBpZiBub3QgdGVzdHNfdG9fc2tpcDoKQEAgLTg2Miw1 ICs4NjIsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAgICAgICAgIGZvciBp bmRleCwgdGVzdCBpbiBlbnVtZXJhdGUoc2VsZi5fZXhwZWN0YXRpb25zLCBzdGFydD0xKToKICAg ICAgICAgICAgIGlmIHRlc3QubmFtZSBhbmQgdGVzdC5uYW1lIGluIHRlc3RzX3RvX3NraXA6CiAg ICAgICAgICAgICAgICAgc2VsZi5fc2tpcHBlZF90ZXN0c193YXJuaW5ncy5hcHBlbmQoJzolZCAl cyBpcyBhbHNvIGluIGEgU2tpcHBlZCBmaWxlLicgJSAoaW5kZXgsIHRlc3QubmFtZSkpCisKICAg ICAgICAgZm9yIHRlc3RfbmFtZSBpbiB0ZXN0c190b19za2lwOgotICAgICAgICAgICAgc2VsZi5f bW9kZWwuYWRkX2V4cGVjdGF0aW9uX2xpbmUoc2VsZi5fcGFyc2VyLmV4cGVjdGF0aW9uX2Zvcl9z a2lwcGVkX3Rlc3QodGVzdF9uYW1lKSwgb3ZlcnJpZGVzX2FsbG93ZWQ9VHJ1ZSkKKyAgICAgICAg ICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBzZWxmLl9wYXJzZXIuZXhwZWN0YXRpb25fZm9yX3NraXBw ZWRfdGVzdCh0ZXN0X25hbWUpCisgICAgICAgICAgICBzZWxmLl9tb2RlbC5hZGRfZXhwZWN0YXRp b25fbGluZShleHBlY3RhdGlvbl9saW5lLCBpbl9za2lwcGVkPVRydWUpCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlv bnNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXggOWU0YTQ3MTA4NjFhNjczZjk3 MjVhNDg1OWM0N2Y3ZDA4OTZjMTcxZS4uMzlhNDYxMzdmZjYzZGZiZDdjMDg2ZGRhYWUxNjZmYjE1 NDk4M2RhOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eQpAQCAtMjYwLDE3ICsyNjAsNDEgQEAgU0tJUCA6IGZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlLmh0 bWwiIiIsIGlzX2xpbnRfbW9kZT1UcnVlKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJykgaW4K ICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9leHAuZ2V0X3Rlc3RzX3dpdGhfcmVzdWx0 X3R5cGUoU0tJUCkpCiAKLSAgICBkZWYgdGVzdF9hZGRfc2tpcHBlZF90ZXN0cyhzZWxmKToKLSAg ICAgICAgcG9ydCA9IE1vY2tIb3N0KCkucG9ydF9mYWN0b3J5LmdldCgncXQnKQotICAgICAgICBw b3J0Ll9maWxlc3lzdGVtLmZpbGVzW3BvcnQuX2ZpbGVzeXN0ZW0uam9pbihwb3J0LmxheW91dF90 ZXN0c19kaXIoKSwgJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpXSA9ICdmb28nCi0gICAg ICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnMocG9ydCwgdGVzdHM9WydmYWlsdXJl cy9leHBlY3RlZC90ZXh0Lmh0bWwnXSwgZXhwZWN0YXRpb25zPScnLCB0ZXN0X2NvbmZpZz1wb3J0 LnRlc3RfY29uZmlndXJhdGlvbigpLCBza2lwcGVkX3Rlc3RzPXNldChbJ2ZhaWx1cmVzL2V4cGVj dGVkL3RleHQuaHRtbCddKSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0YXRpb25z LmdldF9tb2RpZmllcnMoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpLCBbVGVzdEV4cGVj dGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19NT0RJRklFUiwgVGVzdEV4cGVjdGF0aW9uUGFyc2VyLlNL SVBfTU9ESUZJRVJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhleHBlY3RhdGlvbnMuZ2V0 X2V4cGVjdGF0aW9ucygnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyksIHNldChbUEFTU10p KQogCi0gICAgZGVmIHRlc3RfYWRkX3NraXBwZWRfdGVzdHNfZHVwbGljYXRlKHNlbGYpOgorY2xh c3MgU2tpcHBlZFRlc3RzKEJhc2UpOgorICAgIGRlZiBjaGVjayhzZWxmLCBleHBlY3RhdGlvbnMs IG92ZXJyaWRlcywgc2tpcHMsIGxpbnQ9RmFsc2UpOgogICAgICAgICBwb3J0ID0gTW9ja0hvc3Qo KS5wb3J0X2ZhY3RvcnkuZ2V0KCdxdCcpCi0gICAgICAgIHBvcnQuX2ZpbGVzeXN0ZW0uZmlsZXNb cG9ydC5fZmlsZXN5c3RlbS5qb2luKHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCAnZmFpbHVyZXMv ZXhwZWN0ZWQvdGV4dC5odG1sJyldID0gJ2ZvbycKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMo UGFyc2VFcnJvciwgVGVzdEV4cGVjdGF0aW9ucywgcG9ydCwgdGVzdHM9WydmYWlsdXJlcy9leHBl Y3RlZC90ZXh0Lmh0bWwnXSwgZXhwZWN0YXRpb25zPSdCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQv dGV4dC5odG1sID0gdGV4dFxuJywgdGVzdF9jb25maWc9cG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24o KSwgaXNfbGludF9tb2RlPVRydWUsIHNraXBwZWRfdGVzdHM9c2V0KFsnZmFpbHVyZXMvZXhwZWN0 ZWQvdGV4dC5odG1sJ10pKQorICAgICAgICBwb3J0Ll9maWxlc3lzdGVtLndyaXRlX3RleHRfZmls ZShwb3J0Ll9maWxlc3lzdGVtLmpvaW4ocG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksICdmYWlsdXJl cy9leHBlY3RlZC90ZXh0Lmh0bWwnKSwgJ2ZvbycpCisgICAgICAgIGV4cCA9IFRlc3RFeHBlY3Rh dGlvbnMocG9ydCwgdGVzdHM9WydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RhdGlvbnM9ZXhwZWN0YXRpb25zLCBvdmVy cmlkZXM9b3ZlcnJpZGVzLCBpc19saW50X21vZGU9bGludCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB0ZXN0X2NvbmZpZz1wb3J0LnRlc3RfY29uZmlndXJhdGlvbigpLCBza2lwcGVk X3Rlc3RzPXNldChza2lwcykpCisKKyAgICAgICAgIyBDaGVjayB0aGF0IHRoZSBleHBlY3RhdGlv biBpcyBmb3IgQlVHX0RVTU1ZIFNLSVAgOiAuLi4gPSBQQVNTCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKGV4cC5nZXRfbW9kaWZpZXJzKCdmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnKSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgW1Rlc3RFeHBlY3RhdGlvblBhcnNlci5EVU1NWV9C VUdfTU9ESUZJRVIsIFRlc3RFeHBlY3RhdGlvblBhcnNlci5TS0lQX01PRElGSUVSXSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwLmdldF9leHBlY3RhdGlvbnMoJ2ZhaWx1cmVzL2V4cGVj dGVkL3RleHQuaHRtbCcpLCBzZXQoW1BBU1NdKSkKKworICAgIGRlZiB0ZXN0X3NraXBwZWRfdGVz dHNfd29yayhzZWxmKToKKyAgICAgICAgc2VsZi5jaGVjayhleHBlY3RhdGlvbnM9JycsIG92ZXJy aWRlcz1Ob25lLCBza2lwcz1bJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCddKQorCisgICAg ZGVmIHRlc3RfZHVwbGljYXRlX3NraXBwZWRfdGVzdF9mYWlsc19saW50KHNlbGYpOgorICAgICAg ICBzZWxmLmFzc2VydFJhaXNlcyhQYXJzZUVycm9yLCBzZWxmLmNoZWNrLCBleHBlY3RhdGlvbnM9 J0JVR1ggOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSB0ZXh0XG4nLCBvdmVycmlkZXM9 Tm9uZSwgc2tpcHM9WydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSwgbGludD1UcnVlKQor CisgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX292ZXJyaWRlc19leHBlY3RhdGlvbnMoc2VsZik6 CisgICAgICAgIHNlbGYuY2hlY2soZXhwZWN0YXRpb25zPSdCVUdYIDogZmFpbHVyZXMvZXhwZWN0 ZWQvdGV4dC5odG1sID0gVEVYVFxuJywgb3ZlcnJpZGVzPU5vbmUsCisgICAgICAgICAgICAgICAg ICAgc2tpcHM9WydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSkKKworICAgIGRlZiB0ZXN0 X3NraXBwZWRfZGlyX292ZXJyaWRlc19leHBlY3RhdGlvbnMoc2VsZik6CisgICAgICAgIHNlbGYu Y2hlY2soZXhwZWN0YXRpb25zPSdCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0g VEVYVFxuJywgb3ZlcnJpZGVzPU5vbmUsCisgICAgICAgICAgICAgICAgICAgc2tpcHM9WydmYWls dXJlcy9leHBlY3RlZCddKQorCisgICAgZGVmIHRlc3Rfc2tpcHBlZF9maWxlX292ZXJyaWRlc19v dmVycmlkZXMoc2VsZik6CisgICAgICAgIHNlbGYuY2hlY2soZXhwZWN0YXRpb25zPScnLCBvdmVy cmlkZXM9J0JVR1ggOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSBURVhUXG4nLAorICAg ICAgICAgICAgICAgICAgIHNraXBzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJ10pCisK KyAgICBkZWYgdGVzdF9za2lwcGVkX2Rpcl9vdmVycmlkZXNfb3ZlcnJpZGVzKHNlbGYpOgorICAg ICAgICBzZWxmLmNoZWNrKGV4cGVjdGF0aW9ucz0nJywgb3ZlcnJpZGVzPSdCVUdYIDogZmFpbHVy ZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0gVEVYVFxuJywKKyAgICAgICAgICAgICAgICAgICBza2lw cz1bJ2ZhaWx1cmVzL2V4cGVjdGVkJ10pCiAKIAogY2xhc3MgRXhwZWN0YXRpb25TeW50YXhUZXN0 cyhCYXNlKToK