88947 2012-06-12 19:43:45 -0700 nrwt: implement the actual cascade of TestExpectations 2012-06-13 13:43:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88946 65834 88948 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 647612 0 dpranke 2012-06-12 19:43:45 -0700 nrwt: implement the actual cascade of TestExpectations 647614 1 147218 dpranke 2012-06-12 19:46:14 -0700 Created attachment 147218 Patch 648141 2 147218 ojan 2012-06-13 09:39:13 -0700 Comment on attachment 147218 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147218&action=review > Tools/ChangeLog:15 > + There is an actual semantic change in this patch, in that > + setting an expectation on a directory in one file will override > + the expectations on any individual tests set in prior files. The > + test_overrides__directory() unit test verifies this. I really think we should simplify the logic of test_expectations entirely (in a separate patch obviously) to last one wins. Even within the same expectations file. The "more specific wins" is more confusing than the benefit it brings. > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:597 > + if prev_expectation_line.filename != expectation_line.filename: Clever! 648191 3 dpranke 2012-06-13 10:11:09 -0700 (In reply to comment #2) > I really think we should simplify the logic of test_expectations entirely (in a separate patch obviously) to last one wins. Even within the same expectations file. The "more specific wins" is more confusing than the benefit it brings. Yeah, as we've discussed before, it's hard to say what the right answer is here. Once we get chromium moved to a world where long-standing expectations are checked in and the file becomes much shorter, you're probably right. In the meantime, I think allowing duplicates in the file might just make it less maintainable. Hopefully the checked-in-failures world is not far away and we'll be able to test this theory. 648423 4 dpranke 2012-06-13 13:43:26 -0700 Committed r120243: <http://trac.webkit.org/changeset/120243> 147218 2012-06-12 19:46:14 -0700 2012-06-13 09:39:13 -0700 Patch bug-88947-20120612194614.patch text/plain 9949 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWNhZDNjYmM3NmZlODY4OTdlNjdiMTdiYzZkMGU0NzIx Njc4OGUxNy4uMzcyMjExZWNlODBmMGRlZDNlNmRjMDA4YzM4NDczOTYyOTI3MGY0MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDEyLTA2LTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGltcGxlbWVudCB0aGUgYWN0dWFsIGNhc2NhZGUgb2YgVGVzdEV4cGVjdGF0 aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5 NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSBpbXBsZW1lbnRzIHRoZSBhY3R1YWwgY2FzY2FkZSBieSByZW1vdmluZyB0aGUKKyAg ICAgICAgY29uY2VwdCBvZiAnb3ZlcnJpZGVzJyBmcm9tIHRoZSBUZXN0RXhwZWN0YXRpb25zIG9i amVjdCBhbmQKKyAgICAgICAgcGFyc2luZyBlYWNoIGZpbGUgc2VwYXJhdGVseS4KKworICAgICAg ICBUaGVyZSBpcyBhbiBhY3R1YWwgc2VtYW50aWMgY2hhbmdlIGluIHRoaXMgcGF0Y2gsIGluIHRo YXQKKyAgICAgICAgc2V0dGluZyBhbiBleHBlY3RhdGlvbiBvbiBhIGRpcmVjdG9yeSBpbiBvbmUg ZmlsZSB3aWxsIG92ZXJyaWRlCisgICAgICAgIHRoZSBleHBlY3RhdGlvbnMgb24gYW55IGluZGl2 aWR1YWwgdGVzdHMgc2V0IGluIHByaW9yIGZpbGVzLiBUaGUKKyAgICAgICAgdGVzdF9vdmVycmlk ZXNfX2RpcmVjdG9yeSgpIHVuaXQgdGVzdCB2ZXJpZmllcyB0aGlzLgorCisgICAgICAgIE90aGVy d2lzZSwgdGhpcyBwYXRjaCBtb3N0bHkgY29uc2lzdHMgb2YgZGVsZXRpbmcgY29kZSA6KS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVj dGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnNNb2RlbC5fX2luaXRfXyk6Cisg ICAgICAgIChUZXN0RXhwZWN0YXRpb25zTW9kZWwuYWRkX2V4cGVjdGF0aW9uX2xpbmUpOgorICAg ICAgICAoVGVzdEV4cGVjdGF0aW9uc01vZGVsLl9hZGRfdGVzdCk6CisgICAgICAgIChUZXN0RXhw ZWN0YXRpb25zTW9kZWwuX2FscmVhZHlfc2Vlbl9iZXR0ZXJfbWF0Y2gpOgorICAgICAgICAoVGVz dEV4cGVjdGF0aW9ucy5fX2luaXRfXyk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLl9hZGRf ZXhwZWN0YXRpb25zKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9t b2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X292ZXJy aWRlc19fZGlyZWN0b3J5KToKKworMjAxMi0wNi0xMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogdXBkYXRlIGNhbGxlcnMgdG8gdXNlIHBv cnQuZXhwZWN0YXRpb25fZGljdCgpIGluc3RlYWQgb2YgdGVzdF9leHBlY3RhdGlvbnMoKSBhbmQg dGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg4OTQ2CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5w eQppbmRleCAxZjUyOGQ2M2RjNTgzMDVmNjQ2ZWFjNzdlNzVmZjY4ZjE0MDgyZjI0Li5jNDViNzZk ZjFmYzI5ZDlmZjQzNjU5ODZmMDMwODM1YjZmNzhiNTY3IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0 YXRpb25zLnB5CkBAIC00NDUsMTMgKzQ0NSw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2Rl bChvYmplY3QpOgogICAgICAgICAjIE1hcHMgYSB0ZXN0IHRvIGEgVGVzdEV4cGVjdGF0aW9uTGlu ZSBpbnN0YW5jZS4KICAgICAgICAgc2VsZi5fdGVzdF90b19leHBlY3RhdGlvbl9saW5lID0ge30K IAotICAgICAgICAjIExpc3Qgb2YgdGVzdHMgdGhhdCBhcmUgaW4gdGhlIG92ZXJyaWRlcyBmaWxl ICh1c2VkIGZvciBjaGVja2luZyBmb3IKLSAgICAgICAgIyBkdXBsaWNhdGVzIGluc2lkZSB0aGUg b3ZlcnJpZGVzIGZpbGUgaXRzZWxmKS4gTm90ZSB0aGF0IGp1c3QgYmVjYXVzZQotICAgICAgICAj IGEgdGVzdCBpcyBpbiB0aGlzIHNldCBkb2Vzbid0IG1lYW4gaXQncyBuZWNlc3NhcmlseSBvdmVy cmlkZGluZyBhCi0gICAgICAgICMgZXhwZWN0YXRpb24gaW4gdGhlIHJlZ3VsYXIgZXhwZWN0YXRp b25zOyB0aGUgdGVzdCBtaWdodCBub3QgYmUKLSAgICAgICAgIyBtZW50aW9uZWQgaW4gdGhlIHJl Z3VsYXIgZXhwZWN0YXRpb25zIGZpbGUgYXQgYWxsLgotICAgICAgICBzZWxmLl9vdmVycmlkZGlu Z190ZXN0cyA9IHNldCgpCi0KICAgICAgICAgc2VsZi5fbW9kaWZpZXJfdG9fdGVzdHMgPSBzZWxm Ll9kaWN0X29mX3NldHMoVGVzdEV4cGVjdGF0aW9ucy5NT0RJRklFUlMpCiAgICAgICAgIHNlbGYu X2V4cGVjdGF0aW9uX3RvX3Rlc3RzID0gc2VsZi5fZGljdF9vZl9zZXRzKFRlc3RFeHBlY3RhdGlv bnMuRVhQRUNUQVRJT05TKQogICAgICAgICBzZWxmLl90aW1lbGluZV90b190ZXN0cyA9IHNlbGYu X2RpY3Rfb2Zfc2V0cyhUZXN0RXhwZWN0YXRpb25zLlRJTUVMSU5FUykKQEAgLTUyMywzMSArNTE2 LDI2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbChvYmplY3QpOgogICAgIGRlZiBnZXRf ZXhwZWN0YXRpb25zKHNlbGYsIHRlc3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF90b19l eHBlY3RhdGlvbnNbdGVzdF0KIAotICAgIGRlZiBhZGRfZXhwZWN0YXRpb25fbGluZShzZWxmLCBl eHBlY3RhdGlvbl9saW5lLCBpbl9vdmVycmlkZXM9RmFsc2UsIGluX3NraXBwZWQ9RmFsc2UpOgor ICAgIGRlZiBhZGRfZXhwZWN0YXRpb25fbGluZShzZWxmLCBleHBlY3RhdGlvbl9saW5lLCBpbl9z a2lwcGVkPUZhbHNlKToKICAgICAgICAgIiIiUmV0dXJucyBhIGxpc3Qgb2Ygd2FybmluZ3MgZW5j b3VudGVyZWQgd2hpbGUgbWF0Y2hpbmcgbW9kaWZpZXJzLiIiIgogCiAgICAgICAgIGlmIGV4cGVj dGF0aW9uX2xpbmUuaXNfaW52YWxpZCgpOgogICAgICAgICAgICAgcmV0dXJuCiAKICAgICAgICAg Zm9yIHRlc3QgaW4gZXhwZWN0YXRpb25fbGluZS5tYXRjaGluZ190ZXN0czoKLSAgICAgICAgICAg IGlmIG5vdCBpbl9za2lwcGVkIGFuZCBzZWxmLl9hbHJlYWR5X3NlZW5fYmV0dGVyX21hdGNoKHRl c3QsIGV4cGVjdGF0aW9uX2xpbmUsIGluX292ZXJyaWRlcyk6CisgICAgICAgICAgICBpZiBub3Qg aW5fc2tpcHBlZCBhbmQgc2VsZi5fYWxyZWFkeV9zZWVuX2JldHRlcl9tYXRjaCh0ZXN0LCBleHBl Y3RhdGlvbl9saW5lKToKICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICBz ZWxmLl9jbGVhcl9leHBlY3RhdGlvbnNfZm9yX3Rlc3QodGVzdCwgZXhwZWN0YXRpb25fbGluZSkK ICAgICAgICAgICAgIHNlbGYuX3Rlc3RfdG9fZXhwZWN0YXRpb25fbGluZVt0ZXN0XSA9IGV4cGVj dGF0aW9uX2xpbmUKLSAgICAgICAgICAgIHNlbGYuX2FkZF90ZXN0KHRlc3QsIGV4cGVjdGF0aW9u X2xpbmUsIGluX292ZXJyaWRlcykKKyAgICAgICAgICAgIHNlbGYuX2FkZF90ZXN0KHRlc3QsIGV4 cGVjdGF0aW9uX2xpbmUpCiAKLSAgICBkZWYgX2FkZF90ZXN0KHNlbGYsIHRlc3QsIGV4cGVjdGF0 aW9uX2xpbmUsIGluX292ZXJyaWRlcyk6CisgICAgZGVmIF9hZGRfdGVzdChzZWxmLCB0ZXN0LCBl eHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgIiIiU2V0cyB0aGUgZXhwZWN0ZWQgc3RhdGUgZm9y IGEgZ2l2ZW4gdGVzdC4KIAogICAgICAgICBUaGlzIHJvdXRpbmUgYXNzdW1lcyB0aGUgdGVzdCBo YXMgbm90IGJlZW4gYWRkZWQgYmVmb3JlLiBJZiBpdCBoYXMsCiAgICAgICAgIHVzZSBfY2xlYXJf ZXhwZWN0YXRpb25zX2Zvcl90ZXN0KCkgdG8gcmVzZXQgdGhlIHN0YXRlIHByaW9yIHRvCi0gICAg ICAgIGNhbGxpbmcgdGhpcy4KLQotICAgICAgICBBcmdzOgotICAgICAgICAgIHRlc3Q6IHRlc3Qg dG8gYWRkCi0gICAgICAgICAgZXhwZWN0YXRpb25fbGluZTogZXhwZWN0YXRpb24gdG8gYWRkCi0g ICAgICAgICAgaW5fb3ZlcnJpZGVzOiB3aGV0aGVyIHdlJ3JlIHBhcnNpbmcgdGhlIHJlZ3VsYXIg ZXhwZWN0YXRpb25zIG9yIHRoZSBvdmVycmlkZGluZyBleHBlY3RhdGlvbnMiIiIKKyAgICAgICAg Y2FsbGluZyB0aGlzLiIiIgogICAgICAgICBzZWxmLl90ZXN0X3RvX2V4cGVjdGF0aW9uc1t0ZXN0 XSA9IGV4cGVjdGF0aW9uX2xpbmUucGFyc2VkX2V4cGVjdGF0aW9ucwogICAgICAgICBmb3IgZXhw ZWN0YXRpb24gaW4gZXhwZWN0YXRpb25fbGluZS5wYXJzZWRfZXhwZWN0YXRpb25zOgogICAgICAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25fdG9fdGVzdHNbZXhwZWN0YXRpb25dLmFkZCh0ZXN0KQpA QCAtNTcxLDkgKzU1OSw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbChvYmplY3QpOgog ICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fcmVzdWx0X3R5cGVfdG9fdGVzdHNbRkFJ TF0uYWRkKHRlc3QpCiAKLSAgICAgICAgaWYgaW5fb3ZlcnJpZGVzOgotICAgICAgICAgICAgc2Vs Zi5fb3ZlcnJpZGRpbmdfdGVzdHMuYWRkKHRlc3QpCi0KICAgICBkZWYgX2NsZWFyX2V4cGVjdGF0 aW9uc19mb3JfdGVzdChzZWxmLCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lKToKICAgICAgICAgIiIi UmVtb3ZlIHByZXhpc3RpbmcgZXhwZWN0YXRpb25zIGZvciB0aGlzIHRlc3QuCiAgICAgICAgIFRo aXMgaGFwcGVucyBpZiB3ZSBhcmUgc2VlaW5nIGEgbW9yZSBwcmVjaXNlIHBhdGgKQEAgLTU5Niw3 ICs1ODEsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zTW9kZWwob2JqZWN0KToKICAgICAgICAg ICAgIGlmIHRlc3QgaW4gc2V0X29mX3Rlc3RzOgogICAgICAgICAgICAgICAgIHNldF9vZl90ZXN0 cy5yZW1vdmUodGVzdCkKIAotICAgIGRlZiBfYWxyZWFkeV9zZWVuX2JldHRlcl9tYXRjaChzZWxm LCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lLCBpbl9vdmVycmlkZXMpOgorICAgIGRlZiBfYWxyZWFk eV9zZWVuX2JldHRlcl9tYXRjaChzZWxmLCB0ZXN0LCBleHBlY3RhdGlvbl9saW5lKToKICAgICAg ICAgIiIiUmV0dXJucyB3aGV0aGVyIHdlJ3ZlIHNlZW4gYSBiZXR0ZXIgbWF0Y2ggYWxyZWFkeSBp biB0aGUgZmlsZS4KIAogICAgICAgICBSZXR1cm5zIFRydWUgaWYgd2UndmUgYWxyZWFkeSBzZWVu IGEgZXhwZWN0YXRpb25fbGluZS5uYW1lIHRoYXQgbWF0Y2hlcyBtb3JlIG9mIHRoZSB0ZXN0CkBA IC02MDksNiArNTk0LDEwIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2RlbChvYmplY3QpOgog CiAgICAgICAgIHByZXZfZXhwZWN0YXRpb25fbGluZSA9IHNlbGYuX3Rlc3RfdG9fZXhwZWN0YXRp b25fbGluZVt0ZXN0XQogCisgICAgICAgIGlmIHByZXZfZXhwZWN0YXRpb25fbGluZS5maWxlbmFt ZSAhPSBleHBlY3RhdGlvbl9saW5lLmZpbGVuYW1lOgorICAgICAgICAgICAgIyBXZSd2ZSBtb3Zl ZCBvbiB0byBhIG5ldyBleHBlY3RhdGlvbiBmaWxlLCB3aGljaCBvdmVycmlkZXMgb2xkZXIgb25l cy4KKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgICAgIGlmIGxlbihwcmV2X2V4cGVj dGF0aW9uX2xpbmUucGF0aCkgPiBsZW4oZXhwZWN0YXRpb25fbGluZS5wYXRoKToKICAgICAgICAg ICAgICMgVGhlIHByZXZpb3VzIHBhdGggbWF0Y2hlZCBtb3JlIG9mIHRoZSB0ZXN0LgogICAgICAg ICAgICAgcmV0dXJuIFRydWUKQEAgLTYxNywyMCArNjA2LDkgQEAgY2xhc3MgVGVzdEV4cGVjdGF0 aW9uc01vZGVsKG9iamVjdCk6CiAgICAgICAgICAgICAjIFRoaXMgcGF0aCBtYXRjaGVzIG1vcmUg b2YgdGhlIHRlc3QuCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICBpZiBpbl9v dmVycmlkZXMgYW5kIHRlc3Qgbm90IGluIHNlbGYuX292ZXJyaWRkaW5nX3Rlc3RzOgotICAgICAg ICAgICAgIyBXZSBoYXZlIHNlZW4gdGhpcyBwYXRoLCBidXQgdGhhdCdzIG9rYXkgYmVjYXVzZSBp dCBpcwotICAgICAgICAgICAgIyBpbiB0aGUgb3ZlcnJpZGVzIGFuZCB0aGUgZWFybGllciBwYXRo IHdhcyBpbiB0aGUKLSAgICAgICAgICAgICMgZXhwZWN0YXRpb25zIChub3QgdGhlIG92ZXJyaWRl cykuCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLQogICAgICAgICAjIEF0IHRoaXMgcG9pbnQg d2Uga25vdyB3ZSBoYXZlIHNlZW4gYSBwcmV2aW91cyBleGFjdCBtYXRjaCBvbiB0aGlzCiAgICAg ICAgICMgYmFzZSBwYXRoLCBzbyB3ZSBuZWVkIHRvIGNoZWNrIHRoZSB0d28gc2V0cyBvZiBtb2Rp ZmllcnMuCiAKLSAgICAgICAgaWYgaW5fb3ZlcnJpZGVzOgotICAgICAgICAgICAgZXhwZWN0YXRp b25fc291cmNlID0gIm92ZXJyaWRlIgotICAgICAgICBlbHNlOgotICAgICAgICAgICAgZXhwZWN0 YXRpb25fc291cmNlID0gImV4cGVjdGF0aW9uIgotCiAgICAgICAgICMgRklYTUU6IFRoaXMgY29k ZSB3YXMgb3JpZ2luYWxseSBkZXNpZ25lZCB0byBhbGxvdyBsaW5lcyB0aGF0IG1hdGNoZWQKICAg ICAgICAgIyBtb3JlIG1vZGlmaWVycyB0byBvdmVycmlkZSBsaW5lcyB0aGF0IG1hdGNoZWQgZmV3 ZXIgbW9kaWZpZXJzLgogICAgICAgICAjIEhvd2V2ZXIsIHdlIGN1cnJlbnRseSB2aWV3IHRoZXNl IGFzIGVycm9ycy4KQEAgLTc1OSwxMyArNzM3LDEzIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMo b2JqZWN0KToKIAogICAgICAgICBleHBlY3RhdGlvbnNfZGljdCA9IHBvcnQuZXhwZWN0YXRpb25z X2RpY3QoKQogICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2Uo ZXhwZWN0YXRpb25zX2RpY3Qua2V5cygpWzBdLCBleHBlY3RhdGlvbnNfZGljdC52YWx1ZXMoKVsw XSkKLSAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhzZWxmLl9leHBlY3RhdGlvbnMsIGlu X292ZXJyaWRlcz1GYWxzZSkKKyAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9ucyhzZWxmLl9l eHBlY3RhdGlvbnMpCiAKICAgICAgICAgaWYgbGVuKGV4cGVjdGF0aW9uc19kaWN0KSA+IDEgYW5k IGluY2x1ZGVfb3ZlcnJpZGVzOgotICAgICAgICAgICAgb3ZlcnJpZGVzID0gJycuam9pbihleHBl Y3RhdGlvbnNfZGljdC52YWx1ZXMoKVsxOl0pCi0gICAgICAgICAgICBvdmVycmlkZXNfZXhwZWN0 YXRpb25zID0gc2VsZi5fcGFyc2VyLnBhcnNlKCdvdmVycmlkZXMnLCBvdmVycmlkZXMpCi0gICAg ICAgICAgICBzZWxmLl9hZGRfZXhwZWN0YXRpb25zKG92ZXJyaWRlc19leHBlY3RhdGlvbnMsIGlu X292ZXJyaWRlcz1UcnVlKQotICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zICs9IG92ZXJy aWRlc19leHBlY3RhdGlvbnMKKyAgICAgICAgICAgIGZvciBuYW1lIGluIGV4cGVjdGF0aW9uc19k aWN0LmtleXMoKVsxOl06CisgICAgICAgICAgICAgICAgZXhwZWN0YXRpb25zID0gc2VsZi5fcGFy c2VyLnBhcnNlKG5hbWUsIGV4cGVjdGF0aW9uc19kaWN0W25hbWVdKQorICAgICAgICAgICAgICAg IHNlbGYuX2FkZF9leHBlY3RhdGlvbnMoZXhwZWN0YXRpb25zKQorICAgICAgICAgICAgICAgIHNl bGYuX2V4cGVjdGF0aW9ucyArPSBleHBlY3RhdGlvbnMKIAogICAgICAgICAjIEZJWE1FOiBtb3Zl IGlnbm9yZV90ZXN0cyBpbnRvIHBvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKQogICAgICAgICBz ZWxmLl9hZGRfc2tpcHBlZF90ZXN0cyhwb3J0LnNraXBwZWRfbGF5b3V0X3Rlc3RzKHRlc3RzKS51 bmlvbihzZXQocG9ydC5nZXRfb3B0aW9uKCdpZ25vcmVfdGVzdHMnLCBbXSkpKSkKQEAgLTg5NSwx MyArODczLDEzIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0KToKIAogICAgICAgICBy ZXR1cm4gVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhmaWx0ZXIod2l0 aG91dF9yZWJhc2VsaW5lX21vZGlmaWVyLCBzZWxmLl9leHBlY3RhdGlvbnMpKQogCi0gICAgZGVm IF9hZGRfZXhwZWN0YXRpb25zKHNlbGYsIGV4cGVjdGF0aW9uX2xpc3QsIGluX292ZXJyaWRlcyk6 CisgICAgZGVmIF9hZGRfZXhwZWN0YXRpb25zKHNlbGYsIGV4cGVjdGF0aW9uX2xpc3QpOgogICAg ICAgICBmb3IgZXhwZWN0YXRpb25fbGluZSBpbiBleHBlY3RhdGlvbl9saXN0OgogICAgICAgICAg ICAgaWYgbm90IGV4cGVjdGF0aW9uX2xpbmUuZXhwZWN0YXRpb25zOgogICAgICAgICAgICAgICAg IGNvbnRpbnVlCiAKICAgICAgICAgICAgIGlmIHNlbGYuX2lzX2xpbnRfbW9kZSBvciBzZWxmLl90 ZXN0X2NvbmZpZyBpbiBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgot ICAgICAgICAgICAgICAgIHNlbGYuX21vZGVsLmFkZF9leHBlY3RhdGlvbl9saW5lKGV4cGVjdGF0 aW9uX2xpbmUsIGluX292ZXJyaWRlcykKKyAgICAgICAgICAgICAgICBzZWxmLl9tb2RlbC5hZGRf ZXhwZWN0YXRpb25fbGluZShleHBlY3RhdGlvbl9saW5lKQogCiAgICAgZGVmIF9hZGRfc2tpcHBl ZF90ZXN0cyhzZWxmLCB0ZXN0c190b19za2lwKToKICAgICAgICAgaWYgbm90IHRlc3RzX3RvX3Nr aXA6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXgg NWZjZjE1NjMyYWQyNWFmOWIxNDY2ZjFkYWNmOWRkNTBhN2E2NDkwNi4uYTUxYjk5ZWY5NjFlOGQy ZGJmYTFiNzA5ZjA2YzlmOTlhODE0Y2ZjYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVj dGF0aW9uc191bml0dGVzdC5weQpAQCAtMjQ0LDYgKzI0NCwxMiBAQCBTS0lQIDogZmFpbHVyZXMv ZXhwZWN0ZWQvaW1hZ2UuaHRtbCIiIiwgaXNfbGludF9tb2RlPVRydWUpCiAgICAgICAgICAgICAg ICAgICAgICAgICJCVUdfT1ZFUlJJREUgOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSBJ TUFHRSIpCiAgICAgICAgIHNlbGYuYXNzZXJ0X2V4cCgnZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5o dG1sJywgSU1BR0UpCiAKKyAgICBkZWYgdGVzdF9vdmVycmlkZXNfX2RpcmVjdG9yeShzZWxmKToK KyAgICAgICAgc2VsZi5wYXJzZV9leHAoIkJVR19FWFA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQu aHRtbCA9IFRFWFQiLAorICAgICAgICAgICAgICAgICAgICAgICAiQlVHX09WRVJSSURFOiBmYWls dXJlcy9leHBlY3RlZCA9IENSQVNIIikKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmYWlsdXJl cy9leHBlY3RlZC90ZXh0Lmh0bWwnLCBDUkFTSCkKKyAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdm YWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1sJywgQ1JBU0gpCisKICAgICBkZWYgdGVzdF9vdmVy cmlkZXNfX2R1cGxpY2F0ZShzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRfYmFkX2V4cGVjdGF0 aW9ucygiQlVHX0VYUDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0gVEVYVCIsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkJVR19PVkVSUklERSA6IGZhaWx1cmVz L2V4cGVjdGVkL3RleHQuaHRtbCA9IElNQUdFXG4iCg==