94545 2012-08-20 16:32:49 -0700 Cleanup TestExpectationParser.parse 2012-08-20 22:57:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89161 1 rniwa rniwa abarth dpranke ojan tony webkit.review.bot oldest_to_newest 700148 0 rniwa 2012-08-20 16:32:49 -0700 Cleanup TestExpectationParser.parse 700160 1 159560 rniwa 2012-08-20 16:39:14 -0700 Created attachment 159560 Cleanup 700469 2 159560 dpranke 2012-08-20 22:08:02 -0700 Comment on attachment 159560 Cleanup So, the change looks more or less correct, but it's not obvious to me that it's better. Can you update the changelog to say why you think things are better (or just update the bug)? Maybe it'll make subsequent refactoring easier or something? 700473 3 rniwa 2012-08-20 22:11:06 -0700 (In reply to comment #2) > (From update of attachment 159560 [details]) > So, the change looks more or less correct, but it's not obvious to me that it's better. Can you update the changelog to say why you think things are better (or just update the bug)? Maybe it'll make subsequent refactoring easier or something? I'm trying to reduce the number of functions to make the subsequent refactoring easier. Also, the check for having both timeout and slow was done in _parse_line instead of _parse_modifiers where other modifier errors were generated. 700475 4 dpranke 2012-08-20 22:12:37 -0700 ok. 700489 5 159560 webkit.review.bot 2012-08-20 22:57:00 -0700 Comment on attachment 159560 Cleanup Clearing flags on attachment: 159560 Committed r126135: <http://trac.webkit.org/changeset/126135> 700490 6 webkit.review.bot 2012-08-20 22:57:03 -0700 All reviewed patches have been landed. Closing bug. 159560 2012-08-20 16:39:14 -0700 2012-08-20 22:56:59 -0700 Cleanup bug-94545-20120820163834.patch text/plain 11491 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyNjA4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDEyLTA4LTIwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIENsZWFudXAgVGVzdEV4cGVjdGF0aW9uUGFyc2VyLnBhcnNlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDU0NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9yIFRlc3RFeHBlY3Rh dGlvbnMgdG8gc2ltcGxpZnkgdGhlIGNvZGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0 RXhwZWN0YXRpb25QYXJzZXIucGFyc2UpOiBNZXJnZWQgX3Rva2VuaXplX2xpc3QuCisgICAgICAg IChUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3BhcnNlX2xpbmUpOiBSZW1vdmVkIHRoZSBjYWxsIHRv IF9jaGVja19tb2RpZmllcnNfYWdhaW5zdF9leHBlY3RhdGlvbnMKKyAgICAgICAgc2luY2UgdGhl IGNoZWNrIGlzIG5vdyBkb25lIGluIF9wYXJzZXJfbW9kaWZpZXJzLgorICAgICAgICAoVGVzdEV4 cGVjdGF0aW9uUGFyc2VyLl9wYXJzZV9tb2RpZmllcnMpOiBNZXJnZWQgX2NoZWNrX21vZGlmaWVy c19hZ2FpbnN0X2V4cGVjdGF0aW9ucy4KKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNlci5f dG9rZW5pemVfbGluZSk6IFJlbmFtZWQgZnJvbSBfdG9rZW5pemUuCisgICAgICAgIChUZXN0RXhw ZWN0YXRpb25QYXJzZXIuX3NwbGl0X3NwYWNlX3NlcGFyYXRlZCk6IE5vIGxvbmdlciBjYWxscyBs b3dlcigpIG9uIGFsbCBtb2RpZmllcnMuCisgICAgICAgIFRoaXMgaXMgZG9uZSBvbiBhIGxvY2Fs IHZhcmlhYmxlIGluIF9wYXJzZV9tb2RpZmllcnMsIHByZXNlcnZpbmcgdGhlIG9yaWdpbmFsIGNh c2UuCisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLnJlbW92ZV9yZWJhc2VsaW5lZF90ZXN0cy53 aXRob3V0X3JlYmFzZWxpbmVfbW9kaWZpZXIpOiBDaGVjayB0aGUgZXhpc3RlbmNlCisgICAgICAg IG9mICdyZWJhc2VsaW5lJyBhZ2FpbnN0IHBhcnNlZCBtb2RpZmllcnMuCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyVGVzdHMuX3Rva2VuaXplKToK KyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzLnRlc3RfdG9rZW5pemVfdmFsaWRf d2l0aF9jb21tZW50KTogUHJlc2VydmVzIGNhc2UuCisgICAgICAgIChUZXN0RXhwZWN0YXRpb25Q YXJzZXJUZXN0cy50ZXN0X3Rva2VuaXplX3ZhbGlkX3dpdGhfbXVsdGlwbGVfbW9kaWZpZXJzKTog RGl0dG8uCisgICAgICAgIChUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyVGVzdHMuX3Rva2VuaXpl KToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cy5hc3NlcnRfbGlzdF9y b3VuZF90cmlwKTogQ2FsbCBwYXJzZSBzaW5jZSBfdG9rZW5pemVfbGlzdCBoYXMKKyAgICAgICAg YmVlbiBtZXJnZWQgaW50byBwYXJzZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wv Y29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weToKKyAgICAgICAgKFByaW50RXhwZWN0YXRpb25z VGVzdC50ZXN0X2Nzdik6IFByZXNlcnZlcyB0aGUgY2FzZS4KKwogMjAxMi0wOC0yMCAgR2Vvcmdl IFN0YWlrb3MgIDxzdGFpa29zQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEVu YWJsZSBYSFIgUmVzcG9uc2UgQkxPQgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5w eQkocmV2aXNpb24gMTI2MDc0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMDYsMTAg KzIwNiwxNCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAg c2VsZi5fYWxsb3dfcmViYXNlbGluZV9tb2RpZmllciA9IGFsbG93X3JlYmFzZWxpbmVfbW9kaWZp ZXIKIAogICAgIGRlZiBwYXJzZShzZWxmLCBmaWxlbmFtZSwgZXhwZWN0YXRpb25zX3N0cmluZyk6 Ci0gICAgICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5fdG9rZW5pemVf bGlzdChmaWxlbmFtZSwgZXhwZWN0YXRpb25zX3N0cmluZykKLSAgICAgICAgZm9yIGV4cGVjdGF0 aW9uX2xpbmUgaW4gZXhwZWN0YXRpb25zOgotICAgICAgICAgICAgc2VsZi5fcGFyc2VfbGluZShl eHBlY3RhdGlvbl9saW5lKQotICAgICAgICByZXR1cm4gZXhwZWN0YXRpb25zCisgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmVzID0gW10KKyAgICAgICAgbGluZV9udW1iZXIgPSAwCisgICAgICAgIGZv ciBsaW5lIGluIGV4cGVjdGF0aW9uc19zdHJpbmcuc3BsaXQoIlxuIik6CisgICAgICAgICAgICBs aW5lX251bWJlciArPSAxCisgICAgICAgICAgICB0ZXN0X2V4cGVjdGF0aW9uID0gc2VsZi5fdG9r ZW5pemVfbGluZShmaWxlbmFtZSwgbGluZSwgbGluZV9udW1iZXIpCisgICAgICAgICAgICBzZWxm Ll9wYXJzZV9saW5lKHRlc3RfZXhwZWN0YXRpb24pCisgICAgICAgICAgICBleHBlY3RhdGlvbl9s aW5lcy5hcHBlbmQodGVzdF9leHBlY3RhdGlvbikKKyAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9u X2xpbmVzCiAKICAgICBkZWYgZXhwZWN0YXRpb25fZm9yX3NraXBwZWRfdGVzdChzZWxmLCB0ZXN0 X25hbWUpOgogICAgICAgICBleHBlY3RhdGlvbl9saW5lID0gVGVzdEV4cGVjdGF0aW9uTGluZSgp CkBAIC0yMzEsOCArMjM1LDYgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6 CiAgICAgICAgIGlmIG5vdCBleHBlY3RhdGlvbl9saW5lLm5hbWU6CiAgICAgICAgICAgICByZXR1 cm4KIAotICAgICAgICBzZWxmLl9jaGVja19tb2RpZmllcnNfYWdhaW5zdF9leHBlY3RhdGlvbnMo ZXhwZWN0YXRpb25fbGluZSkKLQogICAgICAgICBleHBlY3RhdGlvbl9saW5lLmlzX2ZpbGUgPSBz ZWxmLl9wb3J0LnRlc3RfaXNmaWxlKGV4cGVjdGF0aW9uX2xpbmUubmFtZSkKICAgICAgICAgaWYg bm90IGV4cGVjdGF0aW9uX2xpbmUuaXNfZmlsZSBhbmQgc2VsZi5fY2hlY2tfcGF0aF9kb2VzX25v dF9leGlzdChleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgICAgIHJldHVybgpAQCAtMjUxLDcg KzI1MywxNCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAg aGFzX3dvbnRmaXggPSBGYWxzZQogICAgICAgICBoYXNfYnVnaWQgPSBGYWxzZQogICAgICAgICBw YXJzZWRfc3BlY2lmaWVycyA9IHNldCgpCi0gICAgICAgIGZvciBtb2RpZmllciBpbiBleHBlY3Rh dGlvbl9saW5lLm1vZGlmaWVyczoKKworICAgICAgICBtb2RpZmllcnMgPSBbbW9kaWZpZXIubG93 ZXIoKSBmb3IgbW9kaWZpZXIgaW4gZXhwZWN0YXRpb25fbGluZS5tb2RpZmllcnNdCisgICAgICAg IGV4cGVjdGF0aW9ucyA9IFtleHBlY3RhdGlvbi5sb3dlcigpIGZvciBleHBlY3RhdGlvbiBpbiBl eHBlY3RhdGlvbl9saW5lLmV4cGVjdGF0aW9uc10KKworICAgICAgICBpZiBzZWxmLlNMT1dfTU9E SUZJRVIgaW4gbW9kaWZpZXJzIGFuZCBzZWxmLlRJTUVPVVRfRVhQRUNUQVRJT04gaW4gZXhwZWN0 YXRpb25zOgorICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBlbmQoJ0Eg dGVzdCBjYW4gbm90IGJlIGJvdGggU0xPVyBhbmQgVElNRU9VVC4gSWYgaXQgdGltZXMgb3V0IGlu ZGVmaW5pdGVseSwgdGhlbiBpdCBzaG91bGQgYmUganVzdCBUSU1FT1VULicpCisKKyAgICAgICAg Zm9yIG1vZGlmaWVyIGluIG1vZGlmaWVyczoKICAgICAgICAgICAgIGlmIG1vZGlmaWVyIGluIFRl c3RFeHBlY3RhdGlvbnMuTU9ESUZJRVJTOgogICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9uX2xp bmUucGFyc2VkX21vZGlmaWVycy5hcHBlbmQobW9kaWZpZXIpCiAgICAgICAgICAgICAgICAgaWYg bW9kaWZpZXIgPT0gc2VsZi5XT05URklYX01PRElGSUVSOgpAQCAtMjY4LDcgKzI3Nyw3IEBAIGNs YXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlcihvYmplY3QpOgogICAgICAgICBpZiBub3QgZXhwZWN0 YXRpb25fbGluZS5wYXJzZWRfYnVnX21vZGlmaWVycyBhbmQgbm90IGhhc193b250Zml4IGFuZCBu b3QgaGFzX2J1Z2lkOgogICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBl bmQoJ1Rlc3QgbGFja3MgQlVHIG1vZGlmaWVyLicpCiAKLSAgICAgICAgaWYgc2VsZi5fYWxsb3df cmViYXNlbGluZV9tb2RpZmllciBhbmQgc2VsZi5SRUJBU0VMSU5FX01PRElGSUVSIGluIGV4cGVj dGF0aW9uX2xpbmUubW9kaWZpZXJzOgorICAgICAgICBpZiBzZWxmLl9hbGxvd19yZWJhc2VsaW5l X21vZGlmaWVyIGFuZCBzZWxmLlJFQkFTRUxJTkVfTU9ESUZJRVIgaW4gbW9kaWZpZXJzOgogICAg ICAgICAgICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBlbmQoJ1JFQkFTRUxJTkUgc2hv dWxkIG9ubHkgYmUgdXNlZCBmb3IgcnVubmluZyByZWJhc2VsaW5lLnB5LiBDYW5ub3QgYmUgY2hl Y2tlZCBpbi4nKQogCiAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUubWF0Y2hpbmdfY29uZmlndXJh dGlvbnMgPSBzZWxmLl90ZXN0X2NvbmZpZ3VyYXRpb25fY29udmVydGVyLnRvX2NvbmZpZ19zZXQo cGFyc2VkX3NwZWNpZmllcnMsIGV4cGVjdGF0aW9uX2xpbmUud2FybmluZ3MpCkBAIC0yODMsMTAg KzI5Miw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlcihvYmplY3QpOgogICAgICAgICAg ICAgcmVzdWx0LmFkZChleHBlY3RhdGlvbikKICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5wYXJz ZWRfZXhwZWN0YXRpb25zID0gcmVzdWx0CiAKLSAgICBkZWYgX2NoZWNrX21vZGlmaWVyc19hZ2Fp bnN0X2V4cGVjdGF0aW9ucyhzZWxmLCBleHBlY3RhdGlvbl9saW5lKToKLSAgICAgICAgaWYgc2Vs Zi5TTE9XX01PRElGSUVSIGluIGV4cGVjdGF0aW9uX2xpbmUubW9kaWZpZXJzIGFuZCBzZWxmLlRJ TUVPVVRfRVhQRUNUQVRJT04gaW4gZXhwZWN0YXRpb25fbGluZS5leHBlY3RhdGlvbnM6Ci0gICAg ICAgICAgICBleHBlY3RhdGlvbl9saW5lLndhcm5pbmdzLmFwcGVuZCgnQSB0ZXN0IGNhbiBub3Qg YmUgYm90aCBTTE9XIGFuZCBUSU1FT1VULiBJZiBpdCB0aW1lcyBvdXQgaW5kZWZpbml0ZWx5LCB0 aGVuIGl0IHNob3VsZCBiZSBqdXN0IFRJTUVPVVQuJykKLQogICAgIGRlZiBfY2hlY2tfcGF0aF9k b2VzX25vdF9leGlzdChzZWxmLCBleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgIyBXZWJLaXQn cyB3YXkgb2Ygc2tpcHBpbmcgdGVzdHMgaXMgdG8gYWRkIGEgLWRpc2FibGVkIHN1ZmZpeC4KICAg ICAgICAgIyBTbyB3ZSBzaG91bGQgY29uc2lkZXIgdGhlIHBhdGggZXhpc3RpbmcgaWYgdGhlIHBh dGggb3IgdGhlCkBAIC0zMjQsNyArMzI5LDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2Vy KG9iamVjdCk6CiAgICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX3Rlc3RzLmFw cGVuZChleHBlY3RhdGlvbl9saW5lLnBhdGgpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYg X3Rva2VuaXplKGNscywgZmlsZW5hbWUsIGV4cGVjdGF0aW9uX3N0cmluZywgbGluZV9udW1iZXIp OgorICAgIGRlZiBfdG9rZW5pemVfbGluZShjbHMsIGZpbGVuYW1lLCBleHBlY3RhdGlvbl9zdHJp bmcsIGxpbmVfbnVtYmVyKToKICAgICAgICAgIiIiVG9rZW5pemVzIGEgbGluZSBmcm9tIFRlc3RF eHBlY3RhdGlvbnMgYW5kIHJldHVybnMgYW4gdW5wYXJzZWQgVGVzdEV4cGVjdGF0aW9uTGluZSBp bnN0YW5jZS4KIAogICAgICAgICBUaGUgZm9ybWF0IG9mIGEgdGVzdCBleHBlY3RhdGlvbiBsaW5l IGlzOgpAQCAtMzY0LDIwICszNjksOSBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXIob2Jq ZWN0KToKICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9uX2xpbmUKIAogICAgIEBjbGFzc21ldGhv ZAotICAgIGRlZiBfdG9rZW5pemVfbGlzdChjbHMsIGZpbGVuYW1lLCBleHBlY3RhdGlvbnNfc3Ry aW5nKToKLSAgICAgICAgIiIiUmV0dXJucyBhIGxpc3Qgb2YgVGVzdEV4cGVjdGF0aW9uTGluZXMs IG9uZSBmb3IgZWFjaCBsaW5lIGluIGV4cGVjdGF0aW9uc19zdHJpbmcuIiIiCi0gICAgICAgIGV4 cGVjdGF0aW9uX2xpbmVzID0gW10KLSAgICAgICAgbGluZV9udW1iZXIgPSAwCi0gICAgICAgIGZv ciBsaW5lIGluIGV4cGVjdGF0aW9uc19zdHJpbmcuc3BsaXQoIlxuIik6Ci0gICAgICAgICAgICBs aW5lX251bWJlciArPSAxCi0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lcy5hcHBlbmQoY2xz Ll90b2tlbml6ZShmaWxlbmFtZSwgbGluZSwgbGluZV9udW1iZXIpKQotICAgICAgICByZXR1cm4g ZXhwZWN0YXRpb25fbGluZXMKLQotICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBfc3BsaXRfc3Bh Y2Vfc2VwYXJhdGVkKGNscywgc3BhY2Vfc2VwYXJhdGVkX3N0cmluZyk6CiAgICAgICAgICIiIlNw bGl0cyBhIHNwYWNlLXNlcGFyYXRlZCBzdHJpbmcgaW50byBhbiBhcnJheS4iIiIKLSAgICAgICAg IyBGSVhNRTogTG93ZXItY2FzaW5nIGlzIG5lY2Vzc2FyeSB0byBzdXBwb3J0IGxlZ2FjeSBjb2Rl LiBOZWVkIHRvIGVsaW1pbmF0ZS4KLSAgICAgICAgcmV0dXJuIFtwYXJ0LnN0cmlwKCkubG93ZXIo KSBmb3IgcGFydCBpbiBzcGFjZV9zZXBhcmF0ZWRfc3RyaW5nLnN0cmlwKCkuc3BsaXQoJyAnKV0K KyAgICAgICAgcmV0dXJuIFtwYXJ0LnN0cmlwKCkgZm9yIHBhcnQgaW4gc3BhY2Vfc2VwYXJhdGVk X3N0cmluZy5zdHJpcCgpLnNwbGl0KCcgJyldCiAKIAogY2xhc3MgVGVzdEV4cGVjdGF0aW9uTGlu ZShvYmplY3QpOgpAQCAtODU3LDcgKzg1MSw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2Jq ZWN0KToKICAgICAgICAgZGVmIHdpdGhvdXRfcmViYXNlbGluZV9tb2RpZmllcihleHBlY3RhdGlv bik6CiAgICAgICAgICAgICByZXR1cm4gbm90IChub3QgZXhwZWN0YXRpb24uaXNfaW52YWxpZCgp IGFuZAogICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0YXRpb24ubmFtZSBpbiBleGNlcHRf dGhlc2VfdGVzdHMgYW5kCi0gICAgICAgICAgICAgICAgICAgICAgICAicmViYXNlbGluZSIgaW4g ZXhwZWN0YXRpb24ubW9kaWZpZXJzIGFuZAorICAgICAgICAgICAgICAgICAgICAgICAgJ3JlYmFz ZWxpbmUnIGluIGV4cGVjdGF0aW9uLnBhcnNlZF9tb2RpZmllcnMgYW5kCiAgICAgICAgICAgICAg ICAgICAgICAgICBmaWxlbmFtZSA9PSBleHBlY3RhdGlvbi5maWxlbmFtZSkKIAogICAgICAgICBy ZXR1cm4gVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhmaWx0ZXIod2l0 aG91dF9yZWJhc2VsaW5lX21vZGlmaWVyLCBzZWxmLl9leHBlY3RhdGlvbnMpKQpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQkocmV2aXNpb24gMTI2 MDc0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3Rf ZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00ODgsNyArNDg4LDcg QEAgY2xhc3MgUmViYXNlbGluaW5nVGVzdChCYXNlKToKIAogY2xhc3MgVGVzdEV4cGVjdGF0aW9u UGFyc2VyVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBfdG9rZW5pemUoc2VsZiwg bGluZSk6Ci0gICAgICAgIHJldHVybiBUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplKCdw YXRoJywgbGluZSwgMCkKKyAgICAgICAgcmV0dXJuIFRlc3RFeHBlY3RhdGlvblBhcnNlci5fdG9r ZW5pemVfbGluZSgncGF0aCcsIGxpbmUsIDApCiAKICAgICBkZWYgdGVzdF90b2tlbml6ZV9ibGFu ayhzZWxmKToKICAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnJykKQEAgLTUy OSwxNSArNTI5LDE1IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzKHVuaXR0ZXMK ICAgICBkZWYgdGVzdF90b2tlbml6ZV92YWxpZF93aXRoX2NvbW1lbnQoc2VsZik6CiAgICAgICAg IGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTyA6IGJhciA9IEJBWiAvL1F1eC4nKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQsICdRdXguJykKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24ubW9kaWZpZXJzKSwgJ1tcJ2Zv b1wnXScpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGV4cGVjdGF0aW9uLmV4cGVjdGF0 aW9ucyksICdbXCdiYXpcJ10nKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3Rh dGlvbi5tb2RpZmllcnMpLCAiWydGT08nXSIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Ry KGV4cGVjdGF0aW9uLmV4cGVjdGF0aW9ucyksICJbJ0JBWiddIikKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsZW4oZXhwZWN0YXRpb24ud2FybmluZ3MpLCAwKQogCiAgICAgZGVmIHRlc3RfdG9r ZW5pemVfdmFsaWRfd2l0aF9tdWx0aXBsZV9tb2RpZmllcnMoc2VsZik6CiAgICAgICAgIGV4cGVj dGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTzEgRk9PMiA6IGJhciA9IEJBWiAvL1F1eC4nKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQsICdRdXguJykKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24ubW9kaWZpZXJzKSwgJ1tcJ2Zv bzFcJywgXCdmb28yXCddJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRp b24uZXhwZWN0YXRpb25zKSwgJ1tcJ2JhelwnXScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c3RyKGV4cGVjdGF0aW9uLm1vZGlmaWVycyksICJbJ0ZPTzEnLCAnRk9PMiddIikKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24uZXhwZWN0YXRpb25zKSwgIlsnQkFaJ10i KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDAp CiAKICAgICBkZWYgdGVzdF9wYXJzZV9lbXB0eV9zdHJpbmcoc2VsZik6CkBAIC01NjAsNyArNTYw LDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplclRlc3RzKHVuaQogICAgICAgICB1 bml0dGVzdC5UZXN0Q2FzZS5fX2luaXRfXyhzZWxmLCB0ZXN0RnVuYykKIAogICAgIGRlZiBfdG9r ZW5pemUoc2VsZiwgbGluZSk6Ci0gICAgICAgIHJldHVybiBUZXN0RXhwZWN0YXRpb25QYXJzZXIu X3Rva2VuaXplKCdwYXRoJywgbGluZSwgMCkKKyAgICAgICAgcmV0dXJuIFRlc3RFeHBlY3RhdGlv blBhcnNlci5fdG9rZW5pemVfbGluZSgncGF0aCcsIGxpbmUsIDApCiAKICAgICBkZWYgYXNzZXJ0 X3JvdW5kX3RyaXAoc2VsZiwgaW5fc3RyaW5nLCBleHBlY3RlZF9zdHJpbmc9Tm9uZSk6CiAgICAg ICAgIGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoaW5fc3RyaW5nKQpAQCAtNTY5LDcgKzU2 OSw5IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cyh1bmkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChleHBlY3RlZF9zdHJpbmcsIHNlbGYuX3NlcmlhbGl6ZXIudG9fc3Ry aW5nKGV4cGVjdGF0aW9uKSkKIAogICAgIGRlZiBhc3NlcnRfbGlzdF9yb3VuZF90cmlwKHNlbGYs IGluX3N0cmluZywgZXhwZWN0ZWRfc3RyaW5nPU5vbmUpOgotICAgICAgICBleHBlY3RhdGlvbnMg PSBUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplX2xpc3QoJ3BhdGgnLCBpbl9zdHJpbmcp CisgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCisgICAgICAgIHBhcnNlciA9IFRlc3RFeHBlY3Rh dGlvblBhcnNlcihob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rlc3Qtd2luLXhwJywgTm9uZSksIFtd LCBhbGxvd19yZWJhc2VsaW5lX21vZGlmaWVyPUZhbHNlKQorICAgICAgICBleHBlY3RhdGlvbnMg PSBwYXJzZXIucGFyc2UoJ3BhdGgnLCBpbl9zdHJpbmcpCiAgICAgICAgIGlmIGV4cGVjdGVkX3N0 cmluZyBpcyBOb25lOgogICAgICAgICAgICAgZXhwZWN0ZWRfc3RyaW5nID0gaW5fc3RyaW5nCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0ZWRfc3RyaW5nLCBUZXN0RXhwZWN0YXRpb25T ZXJpYWxpemVyLmxpc3RfdG9fc3RyaW5nKGV4cGVjdGF0aW9ucywgc2VsZi5fY29udmVydGVyKSkK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9xdWVyaWVzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMjYwNzQpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtMjE3LDggKzIxNyw4IEBAIGNsYXNzIFByaW50RXhwZWN0YXRpb25zVGVzdCh1bml0dGVz dC5UZXMKIAogICAgIGRlZiB0ZXN0X2NzdihzZWxmKToKICAgICAgICAgc2VsZi5ydW5fdGVzdChb J2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcsICdmYWlsdXJlcy9leHBlY3RlZC9pbWFnZS5o dG1sJ10sCi0gICAgICAgICAgICAgICAgICAgICAgKCd0ZXN0LXdpbi14cCxmYWlsdXJlcy9leHBl Y3RlZC9pbWFnZS5odG1sLHdvbnRmaXgsaW1hZ2VcbicKLSAgICAgICAgICAgICAgICAgICAgICAg J3Rlc3Qtd2luLXhwLGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCx3b250Zml4LHRleHRcbicp LAorICAgICAgICAgICAgICAgICAgICAgICgndGVzdC13aW4teHAsZmFpbHVyZXMvZXhwZWN0ZWQv aW1hZ2UuaHRtbCxXT05URklYLElNQUdFXG4nCisgICAgICAgICAgICAgICAgICAgICAgICd0ZXN0 LXdpbi14cCxmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwsV09OVEZJWCxURVhUXG4nKSwKICAg ICAgICAgICAgICAgICAgICAgICBjc3Y9VHJ1ZSkKIAogCg==