64462 2011-07-13 10:21:48 -0700 Introduce TestExpectationSerializer.list_to_string. 2011-07-13 12:40:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64385 1 dglazkov dglazkov abarth oldest_to_newest 436499 0 dglazkov 2011-07-13 10:21:48 -0700 Introduce TestExpectationSerializer.list_to_string. 436501 1 100682 dglazkov 2011-07-13 10:22:57 -0700 Created attachment 100682 Patch 436502 2 100682 abarth 2011-07-13 10:24:20 -0700 Comment on attachment 100682 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100682&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:514 > + return TestExpectationSerializer.list_to_string([expectation for expectation in self._expectations if not (expectation.valid and expectation.name in tests and "rebaseline" in expectation.modifiers)]) OMG! Can we break out a helper function here somewhere? 436511 3 dglazkov 2011-07-13 10:31:17 -0700 (In reply to comment #2) > (From update of attachment 100682 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=100682&action=review > > > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:514 > > + return TestExpectationSerializer.list_to_string([expectation for expectation in self._expectations if not (expectation.valid and expectation.name in tests and "rebaseline" in expectation.modifiers)]) > > OMG! Can we break out a helper function here somewhere? Lemme try. 436514 4 100683 dglazkov 2011-07-13 10:45:24 -0700 Created attachment 100683 Better? 436515 5 100684 dglazkov 2011-07-13 10:46:29 -0700 Created attachment 100684 Better? 436521 6 100684 abarth 2011-07-13 10:52:36 -0700 Comment on attachment 100684 Better? Thanks. Much more understandable! 436604 7 100684 dglazkov 2011-07-13 12:40:15 -0700 Comment on attachment 100684 Better? Clearing flags on attachment: 100684 Committed r90942: <http://trac.webkit.org/changeset/90942> 436605 8 dglazkov 2011-07-13 12:40:19 -0700 All reviewed patches have been landed. Closing bug. 100682 2011-07-13 10:22:57 -0700 2011-07-13 10:45:21 -0700 Patch bug-64462-20110713102256.patch text/plain 4164 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5MjAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0NjQzNjQ0NTE2MGM3MTY2MThlMDllNjRjNzIzYWFkMWU4 ODIxNTBlLi5iNWQ2MWQ3NjE4MTFkODAzZTIyMGE0YmY1ZDdhZTQ1YmY1ZmExMmIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMDctMTMgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K IAorICAgICAgICBJbnRyb2R1Y2UgVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0 cmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0 NDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6 IEFkZGVkIGxpc3RfdG9fc3RyaW5nIGFuZCBjaGFuZ2UgdGhlIHJlbGV2YW50IGNhbGxzaXRlIHRv IHVzZSBpdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv dGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6IEFkZGVkIHRlc3RzIGZvciBpdC4KKworMjAx MS0wNy0xMyAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIENvbnNvbGlkYXRlIGV4cGVjdGF0aW9ucyBwYXJzaW5nIGNvZGUuCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDQ2MAogCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlv bnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnMucHkKaW5kZXggODZkY2JhZGE3YTJmNjRmOTRhNTVkYjc3YWRhZTRiNzRhZWFj Yjg2NC4uMGMyN2EyYTRiYzU1OTliNzhjYmIyYzQ2M2RkMTM0YWU0OGJkNTA5MyAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0 YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtMTU3LDYgKzE1NywxMCBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25TZXJpYWxpemVyOgogCiAgICAgICAgIHJldHVybiAnJy5qb2luKHJlc3VsdCkKIAor ICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBsaXN0X3RvX3N0cmluZyhjbHMsIGV4cGVjdGF0aW9u cyk6CisgICAgICAgIHJldHVybiAiXG4iLmpvaW4oW1Rlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIu dG9fc3RyaW5nKGV4cGVjdGF0aW9uKSBmb3IgZXhwZWN0YXRpb24gaW4gZXhwZWN0YXRpb25zXSkK KwogCiBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXI6CiAgICAgIiIiUHJvdmlkZXMgcGFyc2lu ZyBmYWNpbGl0aWVzIGZvciBsaW5lcyBpbiB0aGUgdGVzdF9leHBlY3RhdGlvbi50eHQgZmlsZS4i IiIKQEAgLTUwNywxMSArNTExLDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uczoKIAogICAgIGRl ZiByZW1vdmVfcmViYXNlbGluZWRfdGVzdHMoc2VsZiwgdGVzdHMpOgogICAgICAgICAiIiJSZXR1 cm5zIGEgY29weSBvZiB0aGUgZXhwZWN0YXRpb25zIHdpdGggdGhlIHRlc3RzIHJlbW92ZWQuIiIi Ci0gICAgICAgIGxpbmVzID0gW10KLSAgICAgICAgZm9yIGV4cGVjdGF0aW9uIGluIHNlbGYuX2V4 cGVjdGF0aW9uczoKLSAgICAgICAgICAgIGlmIG5vdCAoZXhwZWN0YXRpb24udmFsaWQgYW5kIGV4 cGVjdGF0aW9uLm5hbWUgaW4gdGVzdHMgYW5kICJyZWJhc2VsaW5lIiBpbiBleHBlY3RhdGlvbi5t b2RpZmllcnMpOgotICAgICAgICAgICAgICAgIGxpbmVzLmFwcGVuZChUZXN0RXhwZWN0YXRpb25T ZXJpYWxpemVyLnRvX3N0cmluZyhleHBlY3RhdGlvbikpCi0gICAgICAgIHJldHVybiAiXG4iLmpv aW4obGluZXMpCisgICAgICAgIHJldHVybiBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLmxpc3Rf dG9fc3RyaW5nKFtleHBlY3RhdGlvbiBmb3IgZXhwZWN0YXRpb24gaW4gc2VsZi5fZXhwZWN0YXRp b25zIGlmIG5vdCAoZXhwZWN0YXRpb24udmFsaWQgYW5kIGV4cGVjdGF0aW9uLm5hbWUgaW4gdGVz dHMgYW5kICJyZWJhc2VsaW5lIiBpbiBleHBlY3RhdGlvbi5tb2RpZmllcnMpXSkKIAogICAgIGRl ZiBfYWRkX3RvX2FsbF9leHBlY3RhdGlvbnMoc2VsZiwgdGVzdCwgb3B0aW9ucywgZXhwZWN0YXRp b25zKToKICAgICAgICAgaWYgbm90IHRlc3QgaW4gc2VsZi5fYWxsX2V4cGVjdGF0aW9uczoKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0 X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQppbmRleCA2MWVhM2Yz MzJmOTcwMGZmYWU5NmU5ZjYwN2ExMzhiZmMwMTEzZmRiLi4wN2EzNWUxZTkzNTQ0YzY5OWJhNTg2 NzViMWE5MWZhNzlhZWI0MDQzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z X3VuaXR0ZXN0LnB5CkBAIC01NTcsNiArNTU3LDEyIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblNl cmlhbGl6ZXJUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBleHBlY3RlZF9z dHJpbmcgPSBpbl9zdHJpbmcKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RlZF9zdHJp bmcsIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIudG9fc3RyaW5nKGV4cGVjdGF0aW9uKSkKIAor ICAgIGRlZiBhc3NlcnRfbGlzdF9yb3VuZF90cmlwKHNlbGYsIGluX3N0cmluZywgZXhwZWN0ZWRf c3RyaW5nPU5vbmUpOgorICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25QYXJz ZXIucGFyc2VfbGlzdChpbl9zdHJpbmcsIFRlc3RWYWxpZGF0b3IoKSkKKyAgICAgICAgaWYgZXhw ZWN0ZWRfc3RyaW5nIGlzIE5vbmU6CisgICAgICAgICAgICBleHBlY3RlZF9zdHJpbmcgPSBpbl9z dHJpbmcKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RlZF9zdHJpbmcsIFRlc3RFeHBl Y3RhdGlvblNlcmlhbGl6ZXIubGlzdF90b19zdHJpbmcoZXhwZWN0YXRpb25zKSkKKwogICAgIGRl ZiBhc3NlcnRfdG9fc3RyaW5nKHNlbGYsIGV4cGVjdGF0aW9uLCBleHBlY3RlZF9zdHJpbmcpOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIudG9fc3Ry aW5nKGV4cGVjdGF0aW9uKSwgZXhwZWN0ZWRfc3RyaW5nKQogCkBAIC02MDIsNiArNjA4LDE0IEBA IGNsYXNzIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAgICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJy8vIEZvbyA6JykKICAgICAgICAgc2Vs Zi5hc3NlcnRfcm91bmRfdHJpcCgnLy8gRm9vIDogPScpCiAKKyAgICBkZWYgdGVzdF9saXN0X3Jv dW5kdHJpcChzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9yb3VuZF90cmlwKCcnKQor ICAgICAgICBzZWxmLmFzc2VydF9saXN0X3JvdW5kX3RyaXAoJ1xuJykKKyAgICAgICAgc2VsZi5h c3NlcnRfbGlzdF9yb3VuZF90cmlwKCdcblxuJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9y b3VuZF90cmlwKCdiYXInKQorICAgICAgICBzZWxmLmFzc2VydF9saXN0X3JvdW5kX3RyaXAoJ2Jh clxuLy9RdXguJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9yb3VuZF90cmlwKCdiYXJcbi8v UXV4LlxuJykKKwogICAgIGRlZiB0ZXN0X3N0cmluZ193aGl0ZXNwYWNlX3N0cmlwcGluZyhzZWxm KToKICAgICAgICAgc2VsZi5hc3NlcnRfcm91bmRfdHJpcCgnXG4nLCAnJykKICAgICAgICAgc2Vs Zi5hc3NlcnRfcm91bmRfdHJpcCgnICBGT08gOiBiYXIgPSBCQVonLCAnRk9PIDogYmFyID0gQkFa JykK 100683 2011-07-13 10:45:24 -0700 2011-07-13 10:46:26 -0700 Better? bug-64462-20110713104523.patch text/plain 13582 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5MjAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiODFlNjgzOGYyMjkxNWE5NTlhZTFiOGMwM2FmOWY3MjZh MjMwY2Q3Li5iNWQ2MWQ3NjE4MTFkODAzZTIyMGE0YmY1ZDdhZTQ1YmY1ZmExMmIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTEtMDctMTMgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K KworICAgICAgICBJbnRyb2R1Y2UgVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0 cmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0 NDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6 IEFkZGVkIGxpc3RfdG9fc3RyaW5nIGFuZCBjaGFuZ2UgdGhlIHJlbGV2YW50IGNhbGxzaXRlIHRv IHVzZSBpdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv dGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6IEFkZGVkIHRlc3RzIGZvciBpdC4KKworMjAx MS0wNy0xMyAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCisgICAg ICAgIENvbnNvbGlkYXRlIGV4cGVjdGF0aW9ucyBwYXJzaW5nIGNvZGUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDQ2MAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5OiBGb2xkZWQgVGVzdEV4cGVjdGF0 aW9uUGFyc2VyLl9zcGxpdF9leHBlY3RhdGlvbl9zdHJpbmcgaW50byBUZXN0RXhwZWN0YXRpb25Q YXJzZXIucGFyc2UuCisKKzIwMTEtMDctMTMgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNo cm9taXVtLm9yZz4KKworICAgICAgICBFbGltaW5hdGUgVGVzdEV4cGVjdGF0aW9uc0ZpbGUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDQ1OAorCisg ICAgICAgIFR1cm5zIG91dCwgd2UgY2FuIGp1c3QgdXNlIGEgUHl0aG9uIGxpc3QuCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6IEZvbGRlZCBUZXN0 RXhwZWN0YXRpb25zRmlsZS5hcHBlbmQgaW50byBUZXN0RXhwZWN0YXRpb25QYXJzZXIucGFyc2Vf bGlzdCwKKyAgICAgICAgICAgIHJlbW92ZWQgVGVzdEV4cGVjdGF0aW9uc0ZpbGUuCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z X3VuaXR0ZXN0LnB5OiBNb3ZlZCB0ZXN0cyB0byBiZXR0ZXIgcmVmbGVjdCBuZXcgbmFtZXMsIHJl bW92ZWQgaXRlcmF0b3IgdGVzdCwKKyAgICAgICAgICAgIHNpbmNlIHRoZXJlJ3Mgbm8gbW9yZSBj dXN0b20gaXRlcmF0b3IgbWFjaGluZXJ5LgorCiAyMDExLTA3LTEyICBEaW1pdHJpIEdsYXprb3Yg IDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRXh0cmFjdCBtb2RlbC1saWtlIFRl c3RFeHBlY3RhdGlvbkxpbmUgYW5kIFRlc3RFeHBlY3RhdGlvbkZpbGUgZnJvbSBUZXN0RXhwZWN0 YXRpb25zLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDkyMGE4YWE0ZDk5YjM4 NzQyNzJlYzQ4MmVlYjY2NTY0NzI0YTNiM2MuLjk3MGRjN2RiZWE1ZjZjZjQ2YmNlMTI4YmE5ZThh YWI0YzUxM2Q2MjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTE1Nyw2ICsx NTcsMTAgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplcjoKIAogICAgICAgICByZXR1 cm4gJycuam9pbihyZXN1bHQpCiAKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgbGlzdF90b19z dHJpbmcoY2xzLCBleHBlY3RhdGlvbnMpOgorICAgICAgICByZXR1cm4gIlxuIi5qb2luKFtUZXN0 RXhwZWN0YXRpb25TZXJpYWxpemVyLnRvX3N0cmluZyhleHBlY3RhdGlvbikgZm9yIGV4cGVjdGF0 aW9uIGluIGV4cGVjdGF0aW9uc10pCisKIAogY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyOgog ICAgICIiIlByb3ZpZGVzIHBhcnNpbmcgZmFjaWxpdGllcyBmb3IgbGluZXMgaW4gdGhlIHRlc3Rf ZXhwZWN0YXRpb24udHh0IGZpbGUuIiIiCkBAIC0xNzMsNTUgKzE3Nyw1MiBAQCBjbGFzcyBUZXN0 RXhwZWN0YXRpb25QYXJzZXI6CiAgICAgICAgIEFueSBlcnJhbnQgd2hpdGVzcGFjZSBpcyBub3Qg cHJlc2VydmVkLgogCiAgICAgICAgICIiIgotICAgICAgICByZXN1bHQgPSBUZXN0RXhwZWN0YXRp b25MaW5lKCkKKyAgICAgICAgZXhwZWN0YXRpb24gPSBUZXN0RXhwZWN0YXRpb25MaW5lKCkKICAg ICAgICAgZXJyb3JzID0gW10KLSAgICAgICAgKG1vZGlmaWVycywgbmFtZSwgZXhwZWN0YXRpb25z LCBjb21tZW50KSA9IGNscy5fc3BsaXRfZXhwZWN0YXRpb25fc3RyaW5nKGV4cGVjdGF0aW9uX3N0 cmluZywgZXJyb3JzKQotICAgICAgICBpZiBsZW4oZXJyb3JzKSA+IDA6Ci0gICAgICAgICAgICBy ZXN1bHQubWFsZm9ybWVkID0gVHJ1ZQotICAgICAgICAgICAgcmVzdWx0LmNvbW1lbnQgPSBleHBl Y3RhdGlvbl9zdHJpbmcKLSAgICAgICAgICAgIHJlc3VsdC52YWxpZCA9IEZhbHNlCi0gICAgICAg IGVsc2U6Ci0gICAgICAgICAgICByZXN1bHQubWFsZm9ybWVkID0gRmFsc2UKLSAgICAgICAgICAg IHJlc3VsdC5jb21tZW50ID0gY29tbWVudAotICAgICAgICAgICAgcmVzdWx0LnZhbGlkID0gVHJ1 ZQotICAgICAgICAgICAgcmVzdWx0Lm5hbWUgPSBuYW1lCi0gICAgICAgICAgICAjIEZJWE1FOiBN b2RpZmllcnMgc2hvdWxkIGJlIGl0cyBvd24gY2xhc3MgZXZlbnR1YWxseS4KLSAgICAgICAgICAg IGlmIG1vZGlmaWVycyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgICAgICByZXN1bHQubW9kaWZp ZXJzID0gY2xzLl9zcGxpdF9zcGFjZV9zZXBhcmF0ZWQobW9kaWZpZXJzKQotICAgICAgICAgICAg IyBGSVhNRTogRXhwZWN0YXRpb25zIHNob3VsZCBiZSBpdHMgb3duIGNsYXNzIGV2ZW50dWFsbHku Ci0gICAgICAgICAgICBpZiBleHBlY3RhdGlvbnMgaXMgbm90IE5vbmU6Ci0gICAgICAgICAgICAg ICAgcmVzdWx0LmV4cGVjdGF0aW9ucyA9IGNscy5fc3BsaXRfc3BhY2Vfc2VwYXJhdGVkKGV4cGVj dGF0aW9ucykKLQotICAgICAgICByZXR1cm4gKHJlc3VsdCwgZXJyb3JzKQotCi0gICAgQGNsYXNz bWV0aG9kCi0gICAgZGVmIF9zcGxpdF9leHBlY3RhdGlvbl9zdHJpbmcoY2xzLCBsaW5lLCBlcnJv cnMpOgotICAgICAgICAiIiJTcGxpdHMgbGluZSBpbnRvIGEgc3RyaW5nIG9mIG1vZGlmaWVycywg YSB0ZXN0IG5hbWUsIGEgc3RyaW5nIG9mIGV4cGVjdGF0aW9ucywgYW5kIGEgY29tbWVudCwKLSAg ICAgICAgcmV0dXJuaW5nIHRoZW0gYXMgYSB0dXBsZS4gSW4gY2FzZSBwYXJzaW5nIGVycm9yLCBy ZXR1cm5zIGVtcHR5IHR1cGxlLgotICAgICAgICAiIiIKLSAgICAgICAgY29tbWVudF9pbmRleCA9 IGxpbmUuZmluZCgiLy8iKQotICAgICAgICBjb21tZW50ID0gJycKKyAgICAgICAgY29tbWVudF9p bmRleCA9IGV4cGVjdGF0aW9uX3N0cmluZy5maW5kKCIvLyIpCiAgICAgICAgIGlmIGNvbW1lbnRf aW5kZXggPT0gLTE6Ci0gICAgICAgICAgICBjb21tZW50X2luZGV4ID0gbGVuKGxpbmUpCi0gICAg ICAgICAgICBjb21tZW50ID0gTm9uZQorICAgICAgICAgICAgY29tbWVudF9pbmRleCA9IGxlbihl eHBlY3RhdGlvbl9zdHJpbmcpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBjb21tZW50ID0g bGluZVtjb21tZW50X2luZGV4ICsgMjpdCisgICAgICAgICAgICBleHBlY3RhdGlvbi5jb21tZW50 ID0gZXhwZWN0YXRpb25fc3RyaW5nW2NvbW1lbnRfaW5kZXggKyAyOl0KIAotICAgICAgICBsaW5l ID0gcmUuc3ViKHIiXHMrIiwgIiAiLCBsaW5lWzpjb21tZW50X2luZGV4XS5zdHJpcCgpKQotICAg ICAgICBpZiBsZW4obGluZSkgPT0gMDoKLSAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSwg Tm9uZSwgY29tbWVudCkKKyAgICAgICAgcmVtYWluaW5nX3N0cmluZyA9IHJlLnN1YihyIlxzKyIs ICIgIiwgZXhwZWN0YXRpb25fc3RyaW5nWzpjb21tZW50X2luZGV4XS5zdHJpcCgpKQorICAgICAg ICBpZiBsZW4ocmVtYWluaW5nX3N0cmluZykgPT0gMDoKKyAgICAgICAgICAgIGV4cGVjdGF0aW9u Lm1hbGZvcm1lZCA9IEZhbHNlCisgICAgICAgICAgICBleHBlY3RhdGlvbi52YWxpZCA9IFRydWUK KyAgICAgICAgICAgIHJldHVybiBleHBlY3RhdGlvbiwgZXJyb3JzCiAKLSAgICAgICAgcGFydHMg PSBsaW5lLnNwbGl0KCc6JykKKyAgICAgICAgcGFydHMgPSByZW1haW5pbmdfc3RyaW5nLnNwbGl0 KCc6JykKICAgICAgICAgaWYgbGVuKHBhcnRzKSAhPSAyOgotICAgICAgICAgICAgZXJyb3JzLmFw cGVuZCgoIk1pc3NpbmcgYSAnOicgaW4iIGlmIGxlbihwYXJ0cykgPCAyIGVsc2UgIkV4dHJhbmVv dXMgJzonIGluIiwgIiciICsgbGluZSArICInIikpCi0gICAgICAgICAgICByZXR1cm4gKE5vbmUs IE5vbmUsIE5vbmUsIE5vbmUpCisgICAgICAgICAgICBlcnJvcnMuYXBwZW5kKCgiTWlzc2luZyBh ICc6JyBpbiIgaWYgbGVuKHBhcnRzKSA8IDIgZWxzZSAiRXh0cmFuZW91cyAnOicgaW4iLCAiJyIg KyBleHBlY3RhdGlvbl9zdHJpbmcgKyAiJyIpKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAg dGVzdF9hbmRfZXhwZWN0YXRpb24gPSBwYXJ0c1sxXS5zcGxpdCgnPScpCisgICAgICAgICAgICBp ZiBsZW4odGVzdF9hbmRfZXhwZWN0YXRpb24pICE9IDI6CisgICAgICAgICAgICAgICAgZXJyb3Jz LmFwcGVuZCgoIk1pc3NpbmcgZXhwZWN0YXRpb25zIGluIiBpZiBsZW4odGVzdF9hbmRfZXhwZWN0 YXRpb24pIDwgMiBlbHNlICJFeHRyYW5lb3VzICc9JyBpbiIsICInIiArIGV4cGVjdGF0aW9uX3N0 cmluZyArICInIikpCiAKLSAgICAgICAgdGVzdF9hbmRfZXhwZWN0YXRpb24gPSBwYXJ0c1sxXS5z cGxpdCgnPScpCi0gICAgICAgIGlmIGxlbih0ZXN0X2FuZF9leHBlY3RhdGlvbikgIT0gMjoKLSAg ICAgICAgICAgIGVycm9ycy5hcHBlbmQoKCJNaXNzaW5nIGV4cGVjdGF0aW9ucyBpbiIgaWYgbGVu KHRlc3RfYW5kX2V4cGVjdGF0aW9uKSA8IDIgZWxzZSAiRXh0cmFuZW91cyAnPScgaW4iLCAiJyIg KyBsaW5lICsgIiciKSkKLSAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSwgTm9uZSwgTm9u ZSkKKyAgICAgICAgaWYgbGVuKGVycm9ycykgPiAwOgorICAgICAgICAgICAgZXhwZWN0YXRpb24u Y29tbWVudCA9IGV4cGVjdGF0aW9uX3N0cmluZworICAgICAgICAgICAgZXhwZWN0YXRpb24ubWFs Zm9ybWVkID0gVHJ1ZQorICAgICAgICAgICAgZXhwZWN0YXRpb24udmFsaWQgPSBGYWxzZQorICAg ICAgICBlbHNlOgorICAgICAgICAgICAgZXhwZWN0YXRpb24ubWFsZm9ybWVkID0gRmFsc2UKKyAg ICAgICAgICAgIGV4cGVjdGF0aW9uLnZhbGlkID0gVHJ1ZQorICAgICAgICAgICAgZXhwZWN0YXRp b24ubW9kaWZpZXJzID0gY2xzLl9zcGxpdF9zcGFjZV9zZXBhcmF0ZWQocGFydHNbMF0pCisgICAg ICAgICAgICBleHBlY3RhdGlvbi5uYW1lID0gdGVzdF9hbmRfZXhwZWN0YXRpb25bMF0uc3RyaXAo KQorICAgICAgICAgICAgZXhwZWN0YXRpb24uZXhwZWN0YXRpb25zID0gY2xzLl9zcGxpdF9zcGFj ZV9zZXBhcmF0ZWQodGVzdF9hbmRfZXhwZWN0YXRpb25bMV0pCiAKLSAgICAgICAgcmV0dXJuIChw YXJ0c1swXS5zdHJpcCgpLCB0ZXN0X2FuZF9leHBlY3RhdGlvblswXS5zdHJpcCgpLCB0ZXN0X2Fu ZF9leHBlY3RhdGlvblsxXS5zdHJpcCgpLCBjb21tZW50KQorICAgICAgICByZXR1cm4gZXhwZWN0 YXRpb24sIGVycm9ycworCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHBhcnNlX2xpc3QoY2xz LCBleHBlY3RhdGlvbnNfc3RyaW5nLCB2YWxpZGF0b3IpOgorICAgICAgICAiIiJSZXR1cm5zIGEg bGlzdCBvZiBUZXN0RXhwZWN0YXRpb25MaW5lcywgb25lIGZvciBlYWNoIGxpbmUgaW4gZXhwZWN0 YXRpb25zX3N0cmluZy4iIiIKKyAgICAgICAgZXhwZWN0YXRpb25zID0gW10KKyAgICAgICAgbGlu ZV9udW1iZXIgPSAwCisgICAgICAgIGZvciBsaW5lIGluIGV4cGVjdGF0aW9uc19zdHJpbmcuc3Bs aXQoIlxuIik6CisgICAgICAgICAgICBleHBlY3RhdGlvbiwgZXJyb3JzID0gY2xzLnBhcnNlKGxp bmUpCisgICAgICAgICAgICBsaW5lX251bWJlciArPSAxCisgICAgICAgICAgICBleHBlY3RhdGlv bi52YWxpZCA9IHZhbGlkYXRvci52YWxpZGF0ZShsaW5lX251bWJlciwgZXhwZWN0YXRpb24sIGVy cm9ycykKKyAgICAgICAgICAgIGV4cGVjdGF0aW9ucy5hcHBlbmQoZXhwZWN0YXRpb24pCisgICAg ICAgIHJldHVybiBleHBlY3RhdGlvbnMKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBfc3Bs aXRfc3BhY2Vfc2VwYXJhdGVkKGNscywgc3BhY2Vfc2VwYXJhdGVkX3N0cmluZyk6CkBAIC0yNDQs MjUgKzI0NSw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbkxpbmU6CiAgICAgICAgIHNlbGYubWFs Zm9ybWVkID0gRmFsc2UKIAogCi1jbGFzcyBUZXN0RXhwZWN0YXRpb25zRmlsZToKLSAgICAiIiJS ZXByZXNlbnRzIGEgdGVzdCBleHBlY3RhdGlvbiBmaWxlLCB3aGljaCBpcyBhIG11dGFibGUgY29s bGVjdGlvbiBvZiBjb21tZW50cyBhbmQgdGVzdCBleHBlY3RhdGlvbnMuIiIiCi0KLSAgICBkZWYg X19pbml0X18oc2VsZik6Ci0gICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IFtdCi0KLSAgICBk ZWYgX19pdGVyX18oc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9leHBlY3RhdGlvbnMuX19p dGVyX18oKQotCi0gICAgZGVmIGFwcGVuZChzZWxmLCBleHBlY3RhdGlvbnNfc3RyaW5nLCB2YWxp ZGF0b3IpOgotICAgICAgICAiIiJBZGQgYSBUZXN0RXhwZWN0YXRpb25MaW5lIGZvciBlYWNoIGl0 ZW0gaW4gZXhwZWN0YXRpb25zX3N0cmluZy4iIiIKLSAgICAgICAgbGluZV9udW1iZXIgPSAwCi0g ICAgICAgIGZvciBsaW5lIGluIGV4cGVjdGF0aW9uc19zdHJpbmcuc3BsaXQoIlxuIik6Ci0gICAg ICAgICAgICBleHBlY3RhdGlvbiwgZXJyb3JzID0gVGVzdEV4cGVjdGF0aW9uUGFyc2VyLnBhcnNl KGxpbmUpCi0gICAgICAgICAgICBsaW5lX251bWJlciArPSAxCi0gICAgICAgICAgICBleHBlY3Rh dGlvbi52YWxpZCA9IHZhbGlkYXRvci52YWxpZGF0ZShsaW5lX251bWJlciwgZXhwZWN0YXRpb24s IGVycm9ycykKLSAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucy5hcHBlbmQoZXhwZWN0YXRp b24pCi0KLQogY2xhc3MgVGVzdEV4cGVjdGF0aW9uczoKICAgICAiIiJUZXN0IGV4cGVjdGF0aW9u cyBjb25zaXN0IG9mIGxpbmVzIHdpdGggc3BlY2lmaWNhdGlvbnMgb2Ygd2hhdAogICAgIHRvIGV4 cGVjdCBmcm9tIGxheW91dCB0ZXN0IGNhc2VzLiBUaGUgdGVzdCBjYXNlcyBjYW4gYmUgZGlyZWN0 b3JpZXMKQEAgLTQwMCw5ICszODIsOCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zOgogICAgICAg ICBzZWxmLl9yZXN1bHRfdHlwZV90b190ZXN0cyA9IHNlbGYuX2RpY3Rfb2Zfc2V0cyhzZWxmLlJF U1VMVF9UWVBFUykKIAogICAgICAgICBzZWxmLl9tYXRjaGVyID0gTW9kaWZpZXJNYXRjaGVyKHNl bGYuX3Rlc3RfY29uZmlnKQotICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0 YXRpb25zRmlsZSgpCiAgICAgICAgIHNlbGYuX292ZXJyaWRlc19hbGxvd2VkID0gRmFsc2UKLSAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLmFwcGVuZChleHBlY3RhdGlvbnMsIHNlbGYpCisgICAg ICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5wYXJzZV9saXN0 KGV4cGVjdGF0aW9ucywgc2VsZikKIAogICAgICAgICAjIExpc3Qgb2YgdGVzdHMgdGhhdCBhcmUg aW4gdGhlIG92ZXJyaWRlcyBmaWxlICh1c2VkIGZvciBjaGVja2luZyBmb3IKICAgICAgICAgIyBk dXBsaWNhdGVzIGluc2lkZSB0aGUgb3ZlcnJpZGVzIGZpbGUgaXRzZWxmKS4gTm90ZSB0aGF0IGp1 c3QgYmVjYXVzZQpAQCAtNDEzLDcgKzM5NCw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnM6CiAK ICAgICAgICAgaWYgb3ZlcnJpZGVzOgogICAgICAgICAgICAgc2VsZi5fb3ZlcnJpZGVzX2FsbG93 ZWQgPSBUcnVlCi0gICAgICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMuYXBwZW5kKHNlbGYuX292 ZXJyaWRlcywgc2VsZikKKyAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyArPSBUZXN0RXhw ZWN0YXRpb25QYXJzZXIucGFyc2VfbGlzdChzZWxmLl9vdmVycmlkZXMsIHNlbGYpCiAgICAgICAg ICAgICBzZWxmLl9vdmVycmlkZXNfYWxsb3dlZCA9IEZhbHNlCiAKICAgICAgICAgc2VsZi5faGFu ZGxlX2FueV9yZWFkX2Vycm9ycygpCkBAIC01MzAsMTEgKzUxMSwxMCBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25zOgogCiAgICAgZGVmIHJlbW92ZV9yZWJhc2VsaW5lZF90ZXN0cyhzZWxmLCB0ZXN0 cyk6CiAgICAgICAgICIiIlJldHVybnMgYSBjb3B5IG9mIHRoZSBleHBlY3RhdGlvbnMgd2l0aCB0 aGUgdGVzdHMgcmVtb3ZlZC4iIiIKLSAgICAgICAgbGluZXMgPSBbXQotICAgICAgICBmb3IgZXhw ZWN0YXRpb24gaW4gc2VsZi5fZXhwZWN0YXRpb25zOgotICAgICAgICAgICAgaWYgbm90IChleHBl Y3RhdGlvbi52YWxpZCBhbmQgZXhwZWN0YXRpb24ubmFtZSBpbiB0ZXN0cyBhbmQgInJlYmFzZWxp bmUiIGluIGV4cGVjdGF0aW9uLm1vZGlmaWVycyk6Ci0gICAgICAgICAgICAgICAgbGluZXMuYXBw ZW5kKFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIudG9fc3RyaW5nKGV4cGVjdGF0aW9uKSkKLSAg ICAgICAgcmV0dXJuICJcbiIuam9pbihsaW5lcykKKyAgICAgICAgZGVmIHdpdGhvdXRfcmViYXNl bGluZV9tb2RpZmllcihleHBlY3RhdGlvbik6CisgICAgICAgICAgICByZXR1cm4gbm90IChleHBl Y3RhdGlvbi52YWxpZCBhbmQgZXhwZWN0YXRpb24ubmFtZSBpbiB0ZXN0cyBhbmQgInJlYmFzZWxp bmUiIGluIGV4cGVjdGF0aW9uLm1vZGlmaWVycykKKworICAgICAgICByZXR1cm4gVGVzdEV4cGVj dGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhmaWx0ZXIod2l0aG91dF9yZWJhc2VsaW5l X21vZGlmaWVyLCBzZWxmLl9leHBlY3RhdGlvbnMpKQogCiAgICAgZGVmIF9hZGRfdG9fYWxsX2V4 cGVjdGF0aW9ucyhzZWxmLCB0ZXN0LCBvcHRpb25zLCBleHBlY3RhdGlvbnMpOgogICAgICAgICBp ZiBub3QgdGVzdCBpbiBzZWxmLl9hbGxfZXhwZWN0YXRpb25zOgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CmluZGV4IDI4YWQxMzFhY2M5YTU0YmE3OTU1MmEy MzljODViOTYwMWJmYmI5ZDkuLjA3YTM1ZTFlOTM1NDRjNjk5YmE1ODY3NWIxYTkxZmE3OWFlYjQw NDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKQEAg LTUzNiw2ICs1MzYsMTkgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyVGVzdHModW5pdHRl c3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi5l eHBlY3RhdGlvbnMpLCAnW1wnYmF6XCddJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4o ZXJyb3JzKSwgMCkKIAorICAgIGRlZiB0ZXN0X2xpbmVfbnVtYmVyX2luY3JlbWVudChzZWxmKToK KyAgICAgICAgdmFsaWRhdG9yID0gVGVzdFZhbGlkYXRvcigpCisgICAgICAgIGV4cGVjdGF0aW9u cyA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5wYXJzZV9saXN0KCcvLyBCYXJcbkZPTyA6IGJhciA9 IEJBWlxuXG4nLCB2YWxpZGF0b3IpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKHZhbGlk YXRvci5saW5lX251bWJlcnMpLCAnWzEsIDIsIDMsIDRdJykKKworICAgIGRlZiB0ZXN0X3ZhbGlk YXRvcl9mZWVkYmFjayhzZWxmKToKKyAgICAgICAgdmFsaWRhdG9yID0gVGVzdFZhbGlkYXRvcigp CisgICAgICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5wYXJzZV9saXN0 KCdGT08gOiBiYXIxID0gQkFaXG5GT08gOiBiYXIyID0gQkFaXG5GT08gOiBiYXIzID0gQkFaJywg dmFsaWRhdG9yKQorICAgICAgICBsaW5lX251bWJlciA9IDAKKyAgICAgICAgZm9yIGV4cGVjdGF0 aW9uIGluIGV4cGVjdGF0aW9uczoKKyAgICAgICAgICAgIGxpbmVfbnVtYmVyICs9IDEKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGluZV9udW1iZXIgJSAyID09IDAsIGV4cGVjdGF0aW9u LnZhbGlkKQorCiAKIGNsYXNzIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cyh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIGFzc2VydF9yb3VuZF90cmlwKHNlbGYsIGluX3N0cmluZywg ZXhwZWN0ZWRfc3RyaW5nPU5vbmUpOgpAQCAtNTQ0LDYgKzU1NywxMiBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25TZXJpYWxpemVyVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAg ZXhwZWN0ZWRfc3RyaW5nID0gaW5fc3RyaW5nCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhw ZWN0ZWRfc3RyaW5nLCBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLnRvX3N0cmluZyhleHBlY3Rh dGlvbikpCiAKKyAgICBkZWYgYXNzZXJ0X2xpc3Rfcm91bmRfdHJpcChzZWxmLCBpbl9zdHJpbmcs IGV4cGVjdGVkX3N0cmluZz1Ob25lKToKKyAgICAgICAgZXhwZWN0YXRpb25zID0gVGVzdEV4cGVj dGF0aW9uUGFyc2VyLnBhcnNlX2xpc3QoaW5fc3RyaW5nLCBUZXN0VmFsaWRhdG9yKCkpCisgICAg ICAgIGlmIGV4cGVjdGVkX3N0cmluZyBpcyBOb25lOgorICAgICAgICAgICAgZXhwZWN0ZWRfc3Ry aW5nID0gaW5fc3RyaW5nCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0ZWRfc3RyaW5n LCBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLmxpc3RfdG9fc3RyaW5nKGV4cGVjdGF0aW9ucykp CisKICAgICBkZWYgYXNzZXJ0X3RvX3N0cmluZyhzZWxmLCBleHBlY3RhdGlvbiwgZXhwZWN0ZWRf c3RyaW5nKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUZXN0RXhwZWN0YXRpb25TZXJpYWxp emVyLnRvX3N0cmluZyhleHBlY3RhdGlvbiksIGV4cGVjdGVkX3N0cmluZykKIApAQCAtNTg5LDYg KzYwOCwxNCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyVGVzdHModW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydF9yb3VuZF90cmlwKCcvLyBGb28gOicpCiAg ICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJy8vIEZvbyA6ID0nKQogCisgICAgZGVmIHRl c3RfbGlzdF9yb3VuZHRyaXAoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0X2xpc3Rfcm91bmRf dHJpcCgnJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9yb3VuZF90cmlwKCdcbicpCisgICAg ICAgIHNlbGYuYXNzZXJ0X2xpc3Rfcm91bmRfdHJpcCgnXG5cbicpCisgICAgICAgIHNlbGYuYXNz ZXJ0X2xpc3Rfcm91bmRfdHJpcCgnYmFyJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9yb3Vu ZF90cmlwKCdiYXJcbi8vUXV4LicpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpc3Rfcm91bmRfdHJp cCgnYmFyXG4vL1F1eC5cbicpCisKICAgICBkZWYgdGVzdF9zdHJpbmdfd2hpdGVzcGFjZV9zdHJp cHBpbmcoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJ1xuJywgJycpCiAg ICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJyAgRk9PIDogYmFyID0gQkFaJywgJ0ZPTyA6 IGJhciA9IEJBWicpCkBAIC02MDcsMzEgKzYzNCw1IEBAIGNsYXNzIFRlc3RWYWxpZGF0b3I6CiAg ICAgICAgIHNlbGYubGluZV9udW1iZXJzLmFwcGVuZChsaW5lX251bWJlcikKICAgICAgICAgcmV0 dXJuIGxpbmVfbnVtYmVyICUgMiA9PSAwCiAKLQotY2xhc3MgVGVzdEV4cGVjdGF0aW9uc0ZpbGVU ZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAgZGVmIHRlc3RfbGluZV9udW1iZXJfaW5jcmVt ZW50KHNlbGYpOgotICAgICAgICB2YWxpZGF0b3IgPSBUZXN0VmFsaWRhdG9yKCkKLSAgICAgICAg ZXhwZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0aW9uc0ZpbGUoKQotICAgICAgICBleHBlY3RhdGlv bnMuYXBwZW5kKCcvLyBCYXJcbkZPTyA6IGJhciA9IEJBWlxuXG4nLCB2YWxpZGF0b3IpCi0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKHZhbGlkYXRvci5saW5lX251bWJlcnMpLCAnWzEsIDIs IDMsIDRdJykKLQotICAgIGRlZiB0ZXN0X2l0ZXJhdG9yKHNlbGYpOgotICAgICAgICB2YWxpZGF0 b3IgPSBUZXN0VmFsaWRhdG9yKCkKLSAgICAgICAgZXhwZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0 aW9uc0ZpbGUoKQotICAgICAgICBleHBlY3RhdGlvbnMuYXBwZW5kKCdcblxuXG5cbicsIHZhbGlk YXRvcikKLSAgICAgICAgbGluZV9udW1iZXIgPSAwCi0gICAgICAgIGZvciBleHBlY3RhdGlvbiBp biBleHBlY3RhdGlvbnM6Ci0gICAgICAgICAgICBsaW5lX251bWJlciArPSAxCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobGluZV9udW1iZXIsIDUpCi0KLSAgICBkZWYgdGVzdF92YWxpZGF0b3Jf ZmVlZGJhY2soc2VsZik6Ci0gICAgICAgIHZhbGlkYXRvciA9IFRlc3RWYWxpZGF0b3IoKQotICAg ICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zRmlsZSgpCi0gICAgICAgIGV4cGVj dGF0aW9ucy5hcHBlbmQoJ0ZPTyA6IGJhcjEgPSBCQVpcbkZPTyA6IGJhcjIgPSBCQVpcbkZPTyA6 IGJhcjMgPSBCQVonLCB2YWxpZGF0b3IpCi0gICAgICAgIGxpbmVfbnVtYmVyID0gMAotICAgICAg ICBmb3IgZXhwZWN0YXRpb24gaW4gZXhwZWN0YXRpb25zOgotICAgICAgICAgICAgbGluZV9udW1i ZXIgKz0gMQotICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsaW5lX251bWJlciAlIDIgPT0g MCwgZXhwZWN0YXRpb24udmFsaWQpCi0KIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAg dW5pdHRlc3QubWFpbigpCg== 100684 2011-07-13 10:46:29 -0700 2011-07-13 12:40:15 -0700 Better? bug-64462-20110713104628.patch text/plain 4243 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5MjAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0NjQzNjQ0NTE2MGM3MTY2MThlMDllNjRjNzIzYWFkMWU4 ODIxNTBlLi5iNWQ2MWQ3NjE4MTFkODAzZTIyMGE0YmY1ZDdhZTQ1YmY1ZmExMmIxIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMDctMTMgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K IAorICAgICAgICBJbnRyb2R1Y2UgVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0 cmluZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0 NDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHk6 IEFkZGVkIGxpc3RfdG9fc3RyaW5nIGFuZCBjaGFuZ2UgdGhlIHJlbGV2YW50IGNhbGxzaXRlIHRv IHVzZSBpdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv dGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6IEFkZGVkIHRlc3RzIGZvciBpdC4KKworMjAx MS0wNy0xMyAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIENvbnNvbGlkYXRlIGV4cGVjdGF0aW9ucyBwYXJzaW5nIGNvZGUuCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDQ2MAogCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlv bnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnMucHkKaW5kZXggODZkY2JhZGE3YTJmNjRmOTRhNTVkYjc3YWRhZTRiNzRhZWFj Yjg2NC4uOTcwZGM3ZGJlYTVmNmNmNDZiY2UxMjhiYTllOGFhYjRjNTEzZDYyNCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0 YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtMTU3LDYgKzE1NywxMCBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25TZXJpYWxpemVyOgogCiAgICAgICAgIHJldHVybiAnJy5qb2luKHJlc3VsdCkKIAor ICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBsaXN0X3RvX3N0cmluZyhjbHMsIGV4cGVjdGF0aW9u cyk6CisgICAgICAgIHJldHVybiAiXG4iLmpvaW4oW1Rlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIu dG9fc3RyaW5nKGV4cGVjdGF0aW9uKSBmb3IgZXhwZWN0YXRpb24gaW4gZXhwZWN0YXRpb25zXSkK KwogCiBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXI6CiAgICAgIiIiUHJvdmlkZXMgcGFyc2lu ZyBmYWNpbGl0aWVzIGZvciBsaW5lcyBpbiB0aGUgdGVzdF9leHBlY3RhdGlvbi50eHQgZmlsZS4i IiIKQEAgLTUwNywxMSArNTExLDEwIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnM6CiAKICAgICBk ZWYgcmVtb3ZlX3JlYmFzZWxpbmVkX3Rlc3RzKHNlbGYsIHRlc3RzKToKICAgICAgICAgIiIiUmV0 dXJucyBhIGNvcHkgb2YgdGhlIGV4cGVjdGF0aW9ucyB3aXRoIHRoZSB0ZXN0cyByZW1vdmVkLiIi IgotICAgICAgICBsaW5lcyA9IFtdCi0gICAgICAgIGZvciBleHBlY3RhdGlvbiBpbiBzZWxmLl9l eHBlY3RhdGlvbnM6Ci0gICAgICAgICAgICBpZiBub3QgKGV4cGVjdGF0aW9uLnZhbGlkIGFuZCBl eHBlY3RhdGlvbi5uYW1lIGluIHRlc3RzIGFuZCAicmViYXNlbGluZSIgaW4gZXhwZWN0YXRpb24u bW9kaWZpZXJzKToKLSAgICAgICAgICAgICAgICBsaW5lcy5hcHBlbmQoVGVzdEV4cGVjdGF0aW9u U2VyaWFsaXplci50b19zdHJpbmcoZXhwZWN0YXRpb24pKQotICAgICAgICByZXR1cm4gIlxuIi5q b2luKGxpbmVzKQorICAgICAgICBkZWYgd2l0aG91dF9yZWJhc2VsaW5lX21vZGlmaWVyKGV4cGVj dGF0aW9uKToKKyAgICAgICAgICAgIHJldHVybiBub3QgKGV4cGVjdGF0aW9uLnZhbGlkIGFuZCBl eHBlY3RhdGlvbi5uYW1lIGluIHRlc3RzIGFuZCAicmViYXNlbGluZSIgaW4gZXhwZWN0YXRpb24u bW9kaWZpZXJzKQorCisgICAgICAgIHJldHVybiBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLmxp c3RfdG9fc3RyaW5nKGZpbHRlcih3aXRob3V0X3JlYmFzZWxpbmVfbW9kaWZpZXIsIHNlbGYuX2V4 cGVjdGF0aW9ucykpCiAKICAgICBkZWYgX2FkZF90b19hbGxfZXhwZWN0YXRpb25zKHNlbGYsIHRl c3QsIG9wdGlvbnMsIGV4cGVjdGF0aW9ucyk6CiAgICAgICAgIGlmIG5vdCB0ZXN0IGluIHNlbGYu X2FsbF9leHBlY3RhdGlvbnM6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5p dHRlc3QucHkKaW5kZXggNjFlYTNmMzMyZjk3MDBmZmFlOTZlOWY2MDdhMTM4YmZjMDExM2ZkYi4u MDdhMzVlMWU5MzU0NGM2OTliYTU4Njc1YjFhOTFmYTc5YWViNDA0MyAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z X3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQpAQCAtNTU3LDYgKzU1NywxMiBAQCBj bGFzcyBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAgICAgZXhwZWN0ZWRfc3RyaW5nID0gaW5fc3RyaW5nCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoZXhwZWN0ZWRfc3RyaW5nLCBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLnRvX3N0 cmluZyhleHBlY3RhdGlvbikpCiAKKyAgICBkZWYgYXNzZXJ0X2xpc3Rfcm91bmRfdHJpcChzZWxm LCBpbl9zdHJpbmcsIGV4cGVjdGVkX3N0cmluZz1Ob25lKToKKyAgICAgICAgZXhwZWN0YXRpb25z ID0gVGVzdEV4cGVjdGF0aW9uUGFyc2VyLnBhcnNlX2xpc3QoaW5fc3RyaW5nLCBUZXN0VmFsaWRh dG9yKCkpCisgICAgICAgIGlmIGV4cGVjdGVkX3N0cmluZyBpcyBOb25lOgorICAgICAgICAgICAg ZXhwZWN0ZWRfc3RyaW5nID0gaW5fc3RyaW5nCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhw ZWN0ZWRfc3RyaW5nLCBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLmxpc3RfdG9fc3RyaW5nKGV4 cGVjdGF0aW9ucykpCisKICAgICBkZWYgYXNzZXJ0X3RvX3N0cmluZyhzZWxmLCBleHBlY3RhdGlv biwgZXhwZWN0ZWRfc3RyaW5nKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUZXN0RXhwZWN0 YXRpb25TZXJpYWxpemVyLnRvX3N0cmluZyhleHBlY3RhdGlvbiksIGV4cGVjdGVkX3N0cmluZykK IApAQCAtNjAyLDYgKzYwOCwxNCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyVGVz dHModW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydF9yb3VuZF90cmlwKCcv LyBGb28gOicpCiAgICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJy8vIEZvbyA6ID0nKQog CisgICAgZGVmIHRlc3RfbGlzdF9yb3VuZHRyaXAoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0 X2xpc3Rfcm91bmRfdHJpcCgnJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbGlzdF9yb3VuZF90cmlw KCdcbicpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xpc3Rfcm91bmRfdHJpcCgnXG5cbicpCisgICAg ICAgIHNlbGYuYXNzZXJ0X2xpc3Rfcm91bmRfdHJpcCgnYmFyJykKKyAgICAgICAgc2VsZi5hc3Nl cnRfbGlzdF9yb3VuZF90cmlwKCdiYXJcbi8vUXV4LicpCisgICAgICAgIHNlbGYuYXNzZXJ0X2xp c3Rfcm91bmRfdHJpcCgnYmFyXG4vL1F1eC5cbicpCisKICAgICBkZWYgdGVzdF9zdHJpbmdfd2hp dGVzcGFjZV9zdHJpcHBpbmcoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAo J1xuJywgJycpCiAgICAgICAgIHNlbGYuYXNzZXJ0X3JvdW5kX3RyaXAoJyAgRk9PIDogYmFyID0g QkFaJywgJ0ZPTyA6IGJhciA9IEJBWicpCg==