90510 2012-07-03 17:42:33 -0700 nrwt: clean up names in worker.py 2012-07-11 18:41:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89725 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 662608 0 dpranke 2012-07-03 17:42:33 -0700 nrwt: clean up names in worker.py 662609 1 150696 dpranke 2012-07-03 17:44:09 -0700 Created attachment 150696 Patch 667186 2 dpranke 2012-07-11 16:11:26 -0700 Committed r122384: <http://trac.webkit.org/changeset/122384> 667306 3 dpranke 2012-07-11 18:41:26 -0700 *** Bug 90509 has been marked as a duplicate of this bug. *** 150696 2012-07-03 17:44:09 -0700 2012-07-03 19:14:52 -0700 Patch bug-90510-20120703174407.patch text/plain 19998 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxODE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGU4MGQzMGY3MWYyMTViYTljMjJjZmUzNTZhZWQ0YjI2 YWU4MjRlZi4uYWIxZTM0ZGU4YzkzNDEwYTkyNjAzNTE4NDdiMjZiOTU5YTFjNGYzYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU4 IEBACiAyMDEyLTA3LTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIG5hbWVzIGluIHdvcmtlci5weQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA1MTAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHRoZSBsYXN0IHBhdGNoIGlu IHRoZSBzZXJpZXMgb2YgcmVmYWN0b3Jpbmcgd29ya2VyLnB5OworICAgICAgICBhbGwgdGhpcyBk b2VzIGlzIGNoYW5nZSBzb21lIG5hbWVzIG9mIG1ldGhvZHMsIGluc3RhbmNlCisgICAgICAgIHZh cmlhYmxlcywgYW5kIG1ldGhvZCBwYXJhbWV0ZXJzIHRvIGJlIGNsZWFyZXIgKGl0IGFsc28gY2hh bmdlcworICAgICAgICBzb21lIGNvZGUgaW4gbWFuYWdlci5weSBhbmQgbWFuYWdlcl93b3JrZXIu cHkgdG8gYmUgY29uc2lzdGVudCkuCisKKyAgICAgICAgVGhlcmUgYXJlIG5vIGZ1bmN0aW9uYWwg Y2hhbmdlcyBpbiB0aGlzIHBhdGNoIGFuZCB0aGUgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMgc2hv dWxkIGNvdmVyIGV2ZXJ5dGhpbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5fX2luaXRf Xyk6CisgICAgICAgIChNYW5hZ2VyLnByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dCk6Cisg ICAgICAgIChNYW5hZ2VyLl9ydW5fdGVzdHMud29ya2VyX2ZhY3RvcnkpOgorICAgICAgICAoTWFu YWdlci5fcnVuX3Rlc3RzKToKKyAgICAgICAgKE1hbmFnZXIuX3Nob3dfcmVzdWx0c19odG1sX2Zp bGUpOgorICAgICAgICAoTWFuYWdlci5oYW5kbGVfZmluaXNoZWRfdGVzdF9saXN0KToKKyAgICAg ICAgKF9Xb3JrZXJTdGF0ZS5fX2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyLnB5OgorICAgICAg ICAoX0Jyb2tlci5wb3N0X21lc3NhZ2UpOgorICAgICAgICAoX0Jyb2tlci5fZGlzcGF0Y2hfbWVz c2FnZSk6CisgICAgICAgIChBYnN0cmFjdFdvcmtlci5fX2luaXRfXyk6CisgICAgICAgIChBYnN0 cmFjdFdvcmtlci5ydW4pOgorICAgICAgICAoQWJzdHJhY3RXb3JrZXIueWllbGRfdG9fY2FsbGVy KToKKyAgICAgICAgKEFic3RyYWN0V29ya2VyLnBvc3QpOgorICAgICAgICAoX1dvcmtlckNvbm5l Y3Rpb24uX19pbml0X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlcl91bml0dGVzdC5weToKKyAgICAgICAg KF9UZXN0V29ya2VyLl9faW5pdF9fKToKKyAgICAgICAgKF9UZXN0V29ya2VyLnN0YXJ0KToKKyAg ICAgICAgKF9UZXN0V29ya2VyLmhhbmRsZSk6CisgICAgICAgIChfVGVzdFdvcmtlci5zdG9wKToK KyAgICAgICAgKF9UZXN0c01peGluKToKKyAgICAgICAgKF9UZXN0c01peGluLnRlc3RfbmFtZSk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvd29y a2VyLnB5OgorICAgICAgICAoV29ya2VyLl9faW5pdF9fKToKKyAgICAgICAgKFdvcmtlci5fX2Rl bF9fKToKKyAgICAgICAgKFdvcmtlci5zdGFydCk6CisgICAgICAgIChXb3JrZXIuaGFuZGxlKToK KyAgICAgICAgKFdvcmtlci5fcnVuX3Rlc3QpOgorICAgICAgICAoV29ya2VyLnN0b3ApOgorICAg ICAgICAoV29ya2VyLl90aW1lb3V0KToKKyAgICAgICAgKFdvcmtlci5fa2lsbF9kcml2ZXIpOgor ICAgICAgICAoV29ya2VyLl9ydW5fdGVzdF93aXRoX3RpbWVvdXQpOgorICAgICAgICAoV29ya2Vy Ll9jbGVhbl91cF9hZnRlcl90ZXN0KToKKyAgICAgICAgKFdvcmtlci5fcnVuX3Rlc3RfaW5fYW5v dGhlcl90aHJlYWQuU2luZ2xlVGVzdFRocmVhZC5ydW4pOgorICAgICAgICAoV29ya2VyLl9ydW5f dGVzdF9pbl90aGlzX3RocmVhZCk6CisgICAgICAgIChXb3JrZXIuX3J1bl9zaW5nbGVfdGVzdCk6 CisKKzIwMTItMDctMDMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgbnJ3dDogY2xlYW4gdXAgZXhjZXB0aW9uIGhhbmRsaW5nIGFuZCBtYWtlIHN1cmUgd2Ug bG9nIHNvbWUgbW9yZSBmYWlsdXJlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTA1MDMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5kZXggZjJmZWQzZjRh NjEzY2ExMGNjYTM4Y2Q3YmU5MTg3MzAwZmM3ZTZjYy4uYTZkNmVjMjZiM2YwYTI4MjViZDFmMWE1 MzQ4M2Q3MjUzZjEwMWJkYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC0zMzMsNiArMzMzLDgg QEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIFRoaXMgbWFwcyB3b3JrZXIgbmFt ZXMgdG8gdGhlIHN0YXRlIHdlIGFyZSB0cmFja2luZyBmb3IgZWFjaCBvZiB0aGVtLgogICAgICAg ICBzZWxmLl93b3JrZXJfc3RhdGVzID0ge30KIAorICAgICAgICBzZWxmLm5hbWUgPSAnbWFuYWdl cicKKwogICAgIGRlZiBjb2xsZWN0X3Rlc3RzKHNlbGYsIGFyZ3MpOgogICAgICAgICAiIiJGaW5k IGFsbCB0aGUgZmlsZXMgdG8gdGVzdC4KIApAQCAtNDk2LDcgKzQ5OCw3IEBAIGNsYXNzIE1hbmFn ZXIob2JqZWN0KToKICAgICAgICAgZWxpZiBsZW4oc2VsZi5fdGVzdF9maWxlcykgPiAxOgogICAg ICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZCgiUnVubmluZyBhbGwgJWQgdGVz dHMuIiAlIGxlbihzZWxmLl90ZXN0X2ZpbGVzKSkKICAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoIlJ1bm5pbmcgJTEgdGVzdC4iKQorICAgICAg ICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZCgiUnVubmluZyAxIHRlc3QuIikKIAog ICAgICAgICAjIENyZWF0ZSBhIHNvcnRlZCBsaXN0IG9mIHRlc3QgZmlsZXMgc28gdGhlIHN1YnNl dCBjaHVuaywKICAgICAgICAgIyBpZiB1c2VkLCBjb250YWlucyBhbHBoYWJldGljYWxseSBjb25z ZWN1dGl2ZSB0ZXN0cy4KQEAgLTc2OSw4ICs3NzEsOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6 CiAgICAgICAgIG51bV93b3JrZXJzID0gbWluKG51bV93b3JrZXJzLCBsZW4oYWxsX3NoYXJkcykp CiAgICAgICAgIHNlbGYuX2xvZ19udW1fd29ya2VycyhudW1fd29ya2VycywgbGVuKGFsbF9zaGFy ZHMpLCBsZW4obG9ja2VkX3NoYXJkcykpCiAKLSAgICAgICAgZGVmIHdvcmtlcl9mYWN0b3J5KHdv cmtlcl9jb25uZWN0aW9uLCB3b3JrZXJfbnVtYmVyKToKLSAgICAgICAgICAgIHJldHVybiB3b3Jr ZXIuV29ya2VyKHdvcmtlcl9jb25uZWN0aW9uLCB3b3JrZXJfbnVtYmVyLCBzZWxmLnJlc3VsdHNf ZGlyZWN0b3J5KCksIHNlbGYuX29wdGlvbnMpCisgICAgICAgIGRlZiB3b3JrZXJfZmFjdG9yeSh3 b3JrZXJfY29ubmVjdGlvbik6CisgICAgICAgICAgICByZXR1cm4gd29ya2VyLldvcmtlcih3b3Jr ZXJfY29ubmVjdGlvbiwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCBzZWxmLl9vcHRpb25zKQog CiAgICAgICAgIG1hbmFnZXJfY29ubmVjdGlvbiA9IG1hbmFnZXJfd29ya2VyX2Jyb2tlci5nZXQo bnVtX3dvcmtlcnMsIHNlbGYsIHdvcmtlcl9mYWN0b3J5LCBzZWxmLl9wb3J0Lmhvc3QpCiAKQEAg LTc4MSw3ICs3ODMsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGZvciB3b3Jr ZXJfbnVtYmVyIGluIHhyYW5nZShudW1fd29ya2Vycyk6CiAgICAgICAgICAgICB3b3JrZXJfY29u bmVjdGlvbiA9IG1hbmFnZXJfY29ubmVjdGlvbi5zdGFydF93b3JrZXIod29ya2VyX251bWJlcikK ICAgICAgICAgICAgIHdvcmtlcl9zdGF0ZSA9IF9Xb3JrZXJTdGF0ZSh3b3JrZXJfbnVtYmVyLCB3 b3JrZXJfY29ubmVjdGlvbikKLSAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9zdGF0ZXNbd29ya2Vy X2Nvbm5lY3Rpb24ubmFtZSgpXSA9IHdvcmtlcl9zdGF0ZQorICAgICAgICAgICAgc2VsZi5fd29y a2VyX3N0YXRlc1t3b3JrZXJfY29ubmVjdGlvbi5uYW1lXSA9IHdvcmtlcl9zdGF0ZQogCiAgICAg ICAgICAgICB0aW1lLnNsZWVwKHNlbGYuX3BvcnQud29ya2VyX3N0YXJ0dXBfZGVsYXlfc2Vjcygp KQogCkBAIC0xNDQyLDggKzE0NDQsNiBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAg IHJlc3VsdHNfZmlsZW5hbWUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19k aXJlY3RvcnksICJyZXN1bHRzLmh0bWwiKQogICAgICAgICBzZWxmLl9wb3J0LnNob3dfcmVzdWx0 c19odG1sX2ZpbGUocmVzdWx0c19maWxlbmFtZSkKIAotICAgIGRlZiBuYW1lKHNlbGYpOgotICAg ICAgICByZXR1cm4gJ01hbmFnZXInCiAKICAgICBkZWYgaXNfZG9uZShzZWxmKToKICAgICAgICAg d29ya2VyX3N0YXRlcyA9IHNlbGYuX3dvcmtlcl9zdGF0ZXMudmFsdWVzKCkKQEAgLTE0NzcsNyAr MTQ3Nyw3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fbG9nX3dvcmtl cl9zdGFjayhzdGFjaykKICAgICAgICAgcmFpc2UgV29ya2VyRXhjZXB0aW9uKHN0cihleGNlcHRp b25fdmFsdWUpKQogCi0gICAgZGVmIGhhbmRsZV9maW5pc2hlZF9saXN0KHNlbGYsIHNvdXJjZSwg bGlzdF9uYW1lLCBudW1fdGVzdHMsIGVsYXBzZWRfdGltZSk6CisgICAgZGVmIGhhbmRsZV9maW5p c2hlZF90ZXN0X2xpc3Qoc2VsZiwgc291cmNlLCBsaXN0X25hbWUsIG51bV90ZXN0cywgZWxhcHNl ZF90aW1lKToKICAgICAgICAgc2VsZi5fZ3JvdXBfc3RhdHNbbGlzdF9uYW1lXSA9IChudW1fdGVz dHMsIGVsYXBzZWRfdGltZSkKIAogICAgICAgICBkZWYgZmluZChuYW1lLCB0ZXN0X2xpc3RzKToK QEAgLTE1NzQsNyArMTU3NCw3IEBAIGNsYXNzIF9Xb3JrZXJTdGF0ZShvYmplY3QpOgogICAgICAg ICBzZWxmLmN1cnJlbnRfdGVzdF9uYW1lID0gTm9uZQogICAgICAgICBzZWxmLm5leHRfdGltZW91 dCA9IE5vbmUKICAgICAgICAgc2VsZi5zdGF0cyA9IHt9Ci0gICAgICAgIHNlbGYuc3RhdHNbJ25h bWUnXSA9IHdvcmtlcl9jb25uZWN0aW9uLm5hbWUoKQorICAgICAgICBzZWxmLnN0YXRzWyduYW1l J10gPSB3b3JrZXJfY29ubmVjdGlvbi5uYW1lCiAgICAgICAgIHNlbGYuc3RhdHNbJ251bV90ZXN0 cyddID0gMAogICAgICAgICBzZWxmLnN0YXRzWyd0b3RhbF90aW1lJ10gPSAwCiAKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXJfd29ya2VyX2Jyb2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfd29ya2VyX2Jyb2tlci5weQppbmRleCBmN2JhY2VkMGFhM2M0 MWIzMjNmMTdjMWJiOWRlY2RiMmUzZDZlYjIxLi4yZGI5MzAxNDM5OTU3NGI2OTA3YjlhYzlhN2Qy ZmQ0NGM4NjEwMjQwIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJv a2VyLnB5CkBAIC0xNzEsNyArMTcxLDcgQEAgY2xhc3MgX0Jyb2tlcihvYmplY3QpOgogICAgICAg ICAiIiJQb3N0IGEgbWVzc2FnZSB0byB0aGUgYXBwcm9wcmlhdGUgdG9waWMgbmFtZS4KIAogICAg ICAgICBNZXNzYWdlcyBoYXZlIGEgbmFtZSBhbmQgYSB0dXBsZSBvZiBvcHRpb25hbCBhcmd1bWVu dHMuIEJvdGggbXVzdCBiZSBwaWNrbGFibGUuIiIiCi0gICAgICAgIG1lc3NhZ2UgPSBfTWVzc2Fn ZShjbGllbnQubmFtZSgpLCB0b3BpY19uYW1lLCBtZXNzYWdlX25hbWUsIG1lc3NhZ2VfYXJncykK KyAgICAgICAgbWVzc2FnZSA9IF9NZXNzYWdlKGNsaWVudC5uYW1lLCB0b3BpY19uYW1lLCBtZXNz YWdlX25hbWUsIG1lc3NhZ2VfYXJncykKICAgICAgICAgcXVldWUgPSBzZWxmLl9nZXRfcXVldWVf Zm9yX3RvcGljKHRvcGljX25hbWUpCiAgICAgICAgIHF1ZXVlLnB1dChfTWVzc2FnZS5kdW1wcyht ZXNzYWdlKSkKIApAQCAtMjAwLDcgKzIwMCw3IEBAIGNsYXNzIF9Ccm9rZXIob2JqZWN0KToKICAg ICAgICAgaWYgbm90IGhhc2F0dHIoY2xpZW50LCAnaGFuZGxlXycgKyBtZXNzYWdlLm5hbWUpOgog ICAgICAgICAgICAgcmFpc2UgVmFsdWVFcnJvcigKICAgICAgICAgICAgICAgICIlczogcmVjZWl2 ZWQgbWVzc2FnZSAnJXMnIGl0IGNvdWxkbid0IGhhbmRsZSIgJQotICAgICAgICAgICAgICAgKGNs aWVudC5uYW1lKCksIG1lc3NhZ2UubmFtZSkpCisgICAgICAgICAgICAgICAoY2xpZW50Lm5hbWUs IG1lc3NhZ2UubmFtZSkpCiAgICAgICAgIG9wdGFyZ3MgPSBtZXNzYWdlLmFyZ3MKICAgICAgICAg bWVzc2FnZV9oYW5kbGVyID0gZ2V0YXR0cihjbGllbnQsICdoYW5kbGVfJyArIG1lc3NhZ2UubmFt ZSkKICAgICAgICAgbWVzc2FnZV9oYW5kbGVyKG1lc3NhZ2Uuc3JjLCAqb3B0YXJncykKQEAgLTI2 OCwxNiArMjY4LDEzIEBAIGNsYXNzIEFic3RyYWN0V29ya2VyKEJyb2tlckNsaWVudCk6CiAgICAg ICAgIEJyb2tlckNsaWVudC5fX2luaXRfXyhzZWxmKQogICAgICAgICBzZWxmLndvcmtlciA9IE5v bmUKICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24gPSB3b3JrZXJfY29ubmVjdGlvbgot ICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVyID0gd29ya2VyX251bWJlcgotICAgICAgICBzZWxm Ll9uYW1lID0gJ3dvcmtlci8lZCcgJSB3b3JrZXJfbnVtYmVyCisgICAgICAgIHNlbGYud29ya2Vy X251bWJlciA9IHdvcmtlcl9udW1iZXIKKyAgICAgICAgc2VsZi5uYW1lID0gJ3dvcmtlci8lZCcg JSB3b3JrZXJfbnVtYmVyCiAgICAgICAgIHNlbGYuX2RvbmUgPSBGYWxzZQogICAgICAgICBzZWxm Ll9jYW5jZWxlZCA9IEZhbHNlCiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRwYXJzZS5WYWx1 ZXMoeyd2ZXJib3NlJzogRmFsc2V9KQogICAgICAgICBzZWxmLmhvc3QgPSBOb25lCiAKLSAgICBk ZWYgbmFtZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKLQogICAgIGRlZiBpc19k b25lKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fZG9uZSBvciBzZWxmLl9jYW5jZWxlZAog CkBAIC0yOTAsMTQgKzI4NywxNCBAQCBjbGFzcyBBYnN0cmFjdFdvcmtlcihCcm9rZXJDbGllbnQp OgogICAgICAgICBleGNlcHRpb25fbXNnID0gIiIKICAgICAgICAgc2VsZi5ob3N0ID0gaG9zdAog Ci0gICAgICAgIHNlbGYud29ya2VyLnNhZmVfaW5pdCgpCi0gICAgICAgIF9sb2cuZGVidWcoJyVz IHN0YXJ0aW5nJyAlIHNlbGYuX25hbWUpCisgICAgICAgIHNlbGYud29ya2VyLnN0YXJ0KCkKKyAg ICAgICAgX2xvZy5kZWJ1ZygnJXMgc3RhcnRpbmcnICUgc2VsZi5uYW1lKQogCiAgICAgICAgIHRy eToKICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnJ1bl9tZXNzYWdlX2xvb3Ao KQogICAgICAgICAgICAgaWYgbm90IHNlbGYuaXNfZG9uZSgpOgogICAgICAgICAgICAgICAgIHJh aXNlIEFzc2VydGlvbkVycm9yKCIlczogcmFuIG91dCBvZiBtZXNzYWdlcyBpbiB3b3JrZXIgcXVl dWUuIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgc2VsZi5fbmFtZSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAlIHNlbGYubmFtZSkKICAgICAg ICAgZXhjZXB0IEtleWJvYXJkSW50ZXJydXB0OgogICAgICAgICAgICAgZXhjZXB0aW9uX21zZyA9 ICIsIGludGVycnVwdGVkIgogICAgICAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucmFp c2VfZXhjZXB0aW9uKHN5cy5leGNfaW5mbygpKQpAQCAtMzA1LDkgKzMwMiw5IEBAIGNsYXNzIEFi c3RyYWN0V29ya2VyKEJyb2tlckNsaWVudCk6CiAgICAgICAgICAgICBleGNlcHRpb25fbXNnID0g IiwgZXhjZXB0aW9uIHJhaXNlZCIKICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9u LnJhaXNlX2V4Y2VwdGlvbihzeXMuZXhjX2luZm8oKSkKICAgICAgICAgZmluYWxseToKLSAgICAg ICAgICAgIF9sb2cuZGVidWcoIiVzIGRvbmUgd2l0aCBtZXNzYWdlIGxvb3AlcyIgJSAoc2VsZi5f bmFtZSwgZXhjZXB0aW9uX21zZykpCisgICAgICAgICAgICBfbG9nLmRlYnVnKCIlcyBkb25lIHdp dGggbWVzc2FnZSBsb29wJXMiICUgKHNlbGYubmFtZSwgZXhjZXB0aW9uX21zZykpCiAgICAgICAg ICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgc2VsZi53b3JrZXIuY2xlYW51cCgpCisgICAgICAg ICAgICAgICAgc2VsZi53b3JrZXIuc3RvcCgpCiAgICAgICAgICAgICBmaW5hbGx5OgogICAgICAg ICAgICAgICAgICMgTWFrZSBzdXJlIHdlIHBvc3QgYSBkb25lIHNvIHRoYXQgd2UgY2FuIGZsdXNo IHRoZSBsb2cgbWVzc2FnZXMKICAgICAgICAgICAgICAgICAjIGFuZCBjbGVhbiB1cCBwcm9wZXJs eSBldmVuIGlmIHdlIHJhaXNlIGFuIGV4Y2VwdGlvbiBpbiB3b3JrZXIuY2xlYW51cCgpLgpAQCAt MzI1LDEwICszMjIsMTAgQEAgY2xhc3MgQWJzdHJhY3RXb3JrZXIoQnJva2VyQ2xpZW50KToKICAg ICAgICAgbWV0aG9kIGJlaW5nIGNhbGxlZCwgc28gY2xpZW50cyBzaG91bGQgbm90IHJlbHkgc29s ZWx5IG9uIHRoaXMuIiIiCiAgICAgICAgIHNlbGYuX2NhbmNlbGVkID0gVHJ1ZQogCi0gICAgZGVm IHlpZWxkX3RvX2Jyb2tlcihzZWxmKToKKyAgICBkZWYgeWllbGRfdG9fY2FsbGVyKHNlbGYpOgog ICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi55aWVsZF90b19icm9rZXIoKQogCi0gICAg ZGVmIHBvc3RfbWVzc2FnZShzZWxmLCAqYXJncyk6CisgICAgZGVmIHBvc3Qoc2VsZiwgKmFyZ3Mp OgogICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoKmFyZ3MpCiAK IApAQCAtMzgyLDE3ICszNzksMTUgQEAgY2xhc3MgX1dvcmtlckNvbm5lY3Rpb24oX0Jyb2tlckNv bm5lY3Rpb24pOgogICAgICAgICAjIGFjdHVhbCBXb3JrZXIgKGNyZWF0ZWQgYnkgd29ya2VyX2Zh Y3RvcnkpIGlzIHZlcnkgY29uZnVzaW5nLCBidXQgdGhpcyBhbGwgZ2V0cyBiZXR0ZXIgd2hlbgog ICAgICAgICAjIF9Xb3JrZXJDb25uZWN0aW9uIGFuZCBBYnN0cmFjdFdvcmtlciBnZXQgbWVyZ2Vk LgogICAgICAgICBzZWxmLl9jbGllbnQgPSBBYnN0cmFjdFdvcmtlcihzZWxmLCB3b3JrZXJfbnVt YmVyKQotICAgICAgICBzZWxmLl93b3JrZXIgPSB3b3JrZXJfZmFjdG9yeShzZWxmLl9jbGllbnQs IHdvcmtlcl9udW1iZXIpCisgICAgICAgIHNlbGYuX3dvcmtlciA9IHdvcmtlcl9mYWN0b3J5KHNl bGYuX2NsaWVudCkKICAgICAgICAgc2VsZi5fY2xpZW50LndvcmtlciA9IHNlbGYuX3dvcmtlcgog ICAgICAgICBzZWxmLl9ob3N0ID0gaG9zdAogICAgICAgICBzZWxmLl9sb2dfbWVzc2FnZXMgPSBb XQogICAgICAgICBzZWxmLl9sb2dnZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX2xvZ19oYW5kbGVy ID0gTm9uZQorICAgICAgICBzZWxmLm5hbWUgPSBzZWxmLl9jbGllbnQubmFtZQogICAgICAgICBf QnJva2VyQ29ubmVjdGlvbi5fX2luaXRfXyhzZWxmLCBicm9rZXIsIHNlbGYuX2NsaWVudCwgQU5Z X1dPUktFUl9UT1BJQywgTUFOQUdFUl9UT1BJQykKIAotICAgIGRlZiBuYW1lKHNlbGYpOgotICAg ICAgICByZXR1cm4gc2VsZi5fY2xpZW50Lm5hbWUoKQotCiAgICAgZGVmIGNhbmNlbChzZWxmKToK ICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9i cm9rZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3dvcmtlcl9icm9rZXJfdW5pdHRlc3QucHkKaW5kZXggZDdjMzcx NGQ4ZGQ5MWE0MTVkNzlhNTZlNmYyNTg5OTkzODQzZjJjZS4uNDExZjQ0OTQ1MTczZWY2MzQ5NTIx Yjk4MDc0MWJjZDM2NjIwM2QzOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl93b3JrZXJfYnJva2VyX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXJfd29ya2VyX2Jyb2tlcl91bml0dGVzdC5weQpAQCAtNTUsMzMgKzU1LDI3IEBAIGRlZiBt YWtlX2Jyb2tlcihtYW5hZ2VyLCBtYXhfd29ya2Vycywgc3RhcnRfcXVldWU9Tm9uZSwgc3RvcF9x dWV1ZT1Ob25lKToKIAogCiBjbGFzcyBfVGVzdFdvcmtlcihvYmplY3QpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBjYWxsZXIsIHdvcmtlcl9udW1iZXIpOgorICAgIGRlZiBfX2luaXRfXyhzZWxm LCBjYWxsZXIpOgogICAgICAgICBzZWxmLl9jYWxsZXIgPSBjYWxsZXIKICAgICAgICAgc2VsZi5f dGhpbmdfdG9fZ3JlZXQgPSAnZXZlcnlib2R5JwogICAgICAgICBzZWxmLl9zdGFydGluZ19xdWV1 ZSA9IHN0YXJ0aW5nX3F1ZXVlCiAgICAgICAgIHNlbGYuX3N0b3BwaW5nX3F1ZXVlID0gc3RvcHBp bmdfcXVldWUKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdHBhcnNlLlZhbHVlcyh7J3ZlcmJv c2UnOiBGYWxzZX0pCiAKLSAgICBkZWYgbmFtZShzZWxmKToKLSAgICAgICAgcmV0dXJuIFdPUktF Ul9OQU1FCi0KLSAgICBkZWYgY2xlYW51cChzZWxmKToKLSAgICAgICAgcGFzcwotCi0gICAgZGVm IGhhbmRsZShzZWxmLCBtZXNzYWdlLCBzcmMsIGFuX2ludCwgYV9zdHIpOgotICAgICAgICBhc3Nl cnQgYW5faW50ID09IDEKLSAgICAgICAgYXNzZXJ0IGFfc3RyID09ICJoZWxsbywgd29ybGQiCi0g ICAgICAgIHNlbGYuX2NhbGxlci5wb3N0X21lc3NhZ2UoJ2ZpbmlzaGVkX3Rlc3QnLCAyKQotCi0g ICAgZGVmIHNhZmVfaW5pdChzZWxmKToKKyAgICBkZWYgc3RhcnQoc2VsZik6CiAgICAgICAgIGlm IHNlbGYuX3N0YXJ0aW5nX3F1ZXVlOgogICAgICAgICAgICAgc2VsZi5fc3RhcnRpbmdfcXVldWUu cHV0KCcnKQogCiAgICAgICAgIGlmIHNlbGYuX3N0b3BwaW5nX3F1ZXVlOgogICAgICAgICAgICAg c2VsZi5fc3RvcHBpbmdfcXVldWUuZ2V0KCkKIAorICAgIGRlZiBoYW5kbGUoc2VsZiwgbWVzc2Fn ZSwgc3JjLCBhbl9pbnQsIGFfc3RyKToKKyAgICAgICAgYXNzZXJ0IGFuX2ludCA9PSAxCisgICAg ICAgIGFzc2VydCBhX3N0ciA9PSAiaGVsbG8sIHdvcmxkIgorICAgICAgICBzZWxmLl9jYWxsZXIu cG9zdCgnZmluaXNoZWRfdGVzdCcsIDIpCisKICAgICBkZWYgc3RvcChzZWxmKToKLSAgICAgICAg c2VsZi5fY2FsbGVyLnBvc3RfbWVzc2FnZSgnZG9uZScpCisgICAgICAgIHBhc3MKIAogCiBjbGFz cyBGdW5jdGlvblRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToKQEAgLTk5LDggKzkzLDcgQEAgY2xh c3MgX1Rlc3RzTWl4aW4ob2JqZWN0KToKICAgICAiIiJNaXhpbiBjbGFzcyB0aGF0IGltcGxlbWVu dHMgYSBzZXJpZXMgb2YgdGVzdHMgdG8gZW5mb3JjZSB0aGUKICAgICBjb250cmFjdCBhbGwgaW1w bGVtZW50YXRpb25zIG11c3QgZm9sbG93LiIiIgogCi0gICAgZGVmIG5hbWUoc2VsZik6Ci0gICAg ICAgIHJldHVybiAnVGVzdGVyTWFuYWdlcicKKyAgICBuYW1lID0gJ1Rlc3Rlck1hbmFnZXInCiAK ICAgICBkZWYgaXNfZG9uZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2RvbmUKQEAgLTEy OCw3ICsxMjEsNyBAQCBjbGFzcyBfVGVzdHNNaXhpbihvYmplY3QpOgogICAgIGRlZiB0ZXN0X25h bWUoc2VsZik6CiAgICAgICAgIHNlbGYubWFrZV9icm9rZXIoKQogICAgICAgICB3b3JrZXIgPSBz ZWxmLl9icm9rZXIuc3RhcnRfd29ya2VyKDEpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHdv cmtlci5uYW1lKCksIFdPUktFUl9OQU1FKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyh3b3Jr ZXIubmFtZSwgV09SS0VSX05BTUUpCiAgICAgICAgIHdvcmtlci5jYW5jZWwoKQogICAgICAgICB3 b3JrZXIuam9pbigwLjEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uod29ya2VyLmlzX2FsaXZl KCkpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy93b3JrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy93b3JrZXIucHkKaW5kZXggYzY4OTE1OTE2OTliYjcyNWE1M2U3MTkxMTU3MzI1 MmUwYWNjNGExNC4uNTgxOWJmZWExN2YwMzBkYmI4YmNiOTMxMTgzODk2OThhMmM5ZTliNiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv d29ya2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL3dvcmtlci5weQpAQCAtNDEsMTQgKzQxLDE0IEBAIF9sb2cgPSBsb2dnaW5nLmdldExv Z2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBXb3JrZXIob2JqZWN0KToKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgd29ya2VyX2Nvbm5lY3Rpb24sIHdvcmtlcl9udW1iZXIsIHJlc3VsdHNfZGlyZWN0 b3J5LCBvcHRpb25zKToKLSAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24gPSB3b3JrZXJf Y29ubmVjdGlvbgotICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVyID0gd29ya2VyX251bWJlcgot ICAgICAgICBzZWxmLl9uYW1lID0gJ3dvcmtlci8lZCcgJSB3b3JrZXJfbnVtYmVyCisgICAgZGVm IF9faW5pdF9fKHNlbGYsIGNhbGxlciwgcmVzdWx0c19kaXJlY3RvcnksIG9wdGlvbnMpOgorICAg ICAgICBzZWxmLl9jYWxsZXIgPSBjYWxsZXIKKyAgICAgICAgc2VsZi5fd29ya2VyX251bWJlciA9 IGNhbGxlci53b3JrZXJfbnVtYmVyCisgICAgICAgIHNlbGYuX25hbWUgPSBjYWxsZXIubmFtZQog ICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHJlc3VsdHNfZGlyZWN0b3J5CiAgICAg ICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAKLSAgICAgICAgIyBUaGUgcmVtYWluaW5nIGZp ZWxkcyBhcmUgaW5pdGlhbGl6ZWQgaW4gc2FmZV9pbml0KCkKKyAgICAgICAgIyBUaGUgcmVtYWlu aW5nIGZpZWxkcyBhcmUgaW5pdGlhbGl6ZWQgaW4gc3RhcnQoKQogICAgICAgICBzZWxmLl9ob3N0 ID0gTm9uZQogICAgICAgICBzZWxmLl9wb3J0ID0gTm9uZQogICAgICAgICBzZWxmLl9iYXRjaF9z aXplID0gTm9uZQpAQCAtNTksMTIgKzU5LDEzIEBAIGNsYXNzIFdvcmtlcihvYmplY3QpOgogICAg ICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZW5hbWUgPSBOb25lCiAKICAgICBkZWYgX19kZWxfXyhz ZWxmKToKLSAgICAgICAgc2VsZi5jbGVhbnVwKCkKKyAgICAgICAgc2VsZi5zdG9wKCkKIAotICAg IGRlZiBzYWZlX2luaXQoc2VsZik6Ci0gICAgICAgICIiIlRoaXMgbWV0aG9kIGlzIGNhbGxlZCB3 aGVuIGl0IGlzIHNhZmUgZm9yIHRoZSBvYmplY3QgdG8gY3JlYXRlIHN0YXRlIHRoYXQKLSAgICAg ICAgZG9lcyBub3QgbmVlZCB0byBiZSBwaWNrbGVkICh1c3VhbGx5IHRoaXMgbWVhbnMgaXQgaXMg Y2FsbGVkIGluIGEgY2hpbGQgcHJvY2VzcykuIiIiCi0gICAgICAgIHNlbGYuX2hvc3QgPSBzZWxm Ll93b3JrZXJfY29ubmVjdGlvbi5ob3N0CisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICAi IiJUaGlzIG1ldGhvZCBpcyBjYWxsZWQgd2hlbiB0aGUgb2JqZWN0IGlzIHN0YXJ0aW5nIHRvIGJl IHVzZWQgYW5kIGl0IGlzIHNhZmUKKyAgICAgICAgZm9yIHRoZSBvYmplY3QgdG8gY3JlYXRlIHN0 YXRlIHRoYXQgZG9lcyBub3QgbmVlZCB0byBiZSBwaWNrbGVkICh1c3VhbGx5IHRoaXMgbWVhbnMK KyAgICAgICAgaXQgaXMgY2FsbGVkIGluIGEgY2hpbGQgcHJvY2VzcykuIiIiCisgICAgICAgIHNl bGYuX2hvc3QgPSBzZWxmLl9jYWxsZXIuaG9zdAogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0g c2VsZi5faG9zdC5maWxlc3lzdGVtCiAgICAgICAgIHNlbGYuX3BvcnQgPSBzZWxmLl9ob3N0LnBv cnRfZmFjdG9yeS5nZXQoc2VsZi5fb3B0aW9ucy5wbGF0Zm9ybSwgc2VsZi5fb3B0aW9ucykKIApA QCAtNzMsMTggKzc0LDE0IEBAIGNsYXNzIFdvcmtlcihvYmplY3QpOgogICAgICAgICB0ZXN0c19y dW5fZmlsZW5hbWUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3Rv cnksICJ0ZXN0c19ydW4lZC50eHQiICUgc2VsZi5fd29ya2VyX251bWJlcikKICAgICAgICAgc2Vs Zi5fdGVzdHNfcnVuX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLm9wZW5fdGV4dF9maWxlX2Zvcl93 cml0aW5nKHRlc3RzX3J1bl9maWxlbmFtZSkKIAotICAgIGRlZiBoYW5kbGUoc2VsZiwgbmFtZSwg c291cmNlLCBsaXN0X25hbWUsIHRlc3RfbGlzdCk6CisgICAgZGVmIGhhbmRsZShzZWxmLCBuYW1l LCBzb3VyY2UsIHRlc3RfbGlzdF9uYW1lLCB0ZXN0X2lucHV0cyk6CiAgICAgICAgIGFzc2VydCBu YW1lID09ICd0ZXN0X2xpc3QnCiAgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQotICAg ICAgICBudW1fdGVzdHMgPSAwCi0gICAgICAgIGZvciB0ZXN0X2lucHV0IGluIHRlc3RfbGlzdDoK LSAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV90ZXN0X2lucHV0KHRlc3RfaW5wdXQpCisgICAgICAg IGZvciB0ZXN0X2lucHV0IGluIHRlc3RfaW5wdXRzOgogICAgICAgICAgICAgc2VsZi5fcnVuX3Rl c3QodGVzdF9pbnB1dCkKLSAgICAgICAgICAgIG51bV90ZXN0cyArPSAxCi0gICAgICAgICAgICBz ZWxmLl93b3JrZXJfY29ubmVjdGlvbi55aWVsZF90b19icm9rZXIoKQotCisgICAgICAgICAgICBz ZWxmLl9jYWxsZXIueWllbGRfdG9fY2FsbGVyKCkKICAgICAgICAgZWxhcHNlZF90aW1lID0gdGlt ZS50aW1lKCkgLSBzdGFydF90aW1lCi0gICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBv c3RfbWVzc2FnZSgnZmluaXNoZWRfbGlzdCcsIGxpc3RfbmFtZSwgbnVtX3Rlc3RzLCBlbGFwc2Vk X3RpbWUpCisgICAgICAgIHNlbGYuX2NhbGxlci5wb3N0KCdmaW5pc2hlZF90ZXN0X2xpc3QnLCB0 ZXN0X2xpc3RfbmFtZSwgbGVuKHRlc3RfaW5wdXRzKSwgZWxhcHNlZF90aW1lKQogCiAgICAgZGVm IF91cGRhdGVfdGVzdF9pbnB1dChzZWxmLCB0ZXN0X2lucHV0KToKICAgICAgICAgdGVzdF9pbnB1 dC5yZWZlcmVuY2VfZmlsZXMgPSBzZWxmLl9wb3J0LnJlZmVyZW5jZV9maWxlcyh0ZXN0X2lucHV0 LnRlc3RfbmFtZSkKQEAgLTk5LDI1ICs5NiwyNiBAQCBjbGFzcyBXb3JrZXIob2JqZWN0KToKICAg ICAgICAgICAgIHRlc3RfaW5wdXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0ID0gRmFsc2UKIAogICAg IGRlZiBfcnVuX3Rlc3Qoc2VsZiwgdGVzdF9pbnB1dCk6Ci0gICAgICAgIHRlc3RfdGltZW91dF9z ZWMgPSBzZWxmLnRpbWVvdXQodGVzdF9pbnB1dCkKKyAgICAgICAgc2VsZi5fdXBkYXRlX3Rlc3Rf aW5wdXQodGVzdF9pbnB1dCkKKyAgICAgICAgdGVzdF90aW1lb3V0X3NlYyA9IHNlbGYuX3RpbWVv dXQodGVzdF9pbnB1dCkKICAgICAgICAgc3RhcnQgPSB0aW1lLnRpbWUoKQotICAgICAgICBzZWxm Ll93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ3N0YXJ0ZWRfdGVzdCcsIHRlc3RfaW5w dXQsIHRlc3RfdGltZW91dF9zZWMpCisgICAgICAgIHNlbGYuX2NhbGxlci5wb3N0KCdzdGFydGVk X3Rlc3QnLCB0ZXN0X2lucHV0LCB0ZXN0X3RpbWVvdXRfc2VjKQogCi0gICAgICAgIHJlc3VsdCA9 IHNlbGYucnVuX3Rlc3Rfd2l0aF90aW1lb3V0KHRlc3RfaW5wdXQsIHRlc3RfdGltZW91dF9zZWMp CisgICAgICAgIHJlc3VsdCA9IHNlbGYuX3J1bl90ZXN0X3dpdGhfdGltZW91dCh0ZXN0X2lucHV0 LCB0ZXN0X3RpbWVvdXRfc2VjKQogCiAgICAgICAgIGVsYXBzZWRfdGltZSA9IHRpbWUudGltZSgp IC0gc3RhcnQKLSAgICAgICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdm aW5pc2hlZF90ZXN0JywgcmVzdWx0LCBlbGFwc2VkX3RpbWUpCisgICAgICAgIHNlbGYuX2NhbGxl ci5wb3N0KCdmaW5pc2hlZF90ZXN0JywgcmVzdWx0LCBlbGFwc2VkX3RpbWUpCiAKLSAgICAgICAg c2VsZi5jbGVhbl91cF9hZnRlcl90ZXN0KHRlc3RfaW5wdXQsIHJlc3VsdCkKKyAgICAgICAgc2Vs Zi5fY2xlYW5fdXBfYWZ0ZXJfdGVzdCh0ZXN0X2lucHV0LCByZXN1bHQpCiAKLSAgICBkZWYgY2xl YW51cChzZWxmKToKKyAgICBkZWYgc3RvcChzZWxmKToKICAgICAgICAgX2xvZy5kZWJ1ZygiJXMg Y2xlYW5pbmcgdXAiICUgc2VsZi5fbmFtZSkKLSAgICAgICAgc2VsZi5raWxsX2RyaXZlcigpCisg ICAgICAgIHNlbGYuX2tpbGxfZHJpdmVyKCkKICAgICAgICAgaWYgc2VsZi5fdGVzdHNfcnVuX2Zp bGU6CiAgICAgICAgICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZS5jbG9zZSgpCiAgICAgICAgICAg ICBzZWxmLl90ZXN0c19ydW5fZmlsZSA9IE5vbmUKIAotICAgIGRlZiB0aW1lb3V0KHNlbGYsIHRl c3RfaW5wdXQpOgorICAgIGRlZiBfdGltZW91dChzZWxmLCB0ZXN0X2lucHV0KToKICAgICAgICAg IiIiQ29tcHV0ZSB0aGUgYXBwcm9wcmlhdGUgdGltZW91dCB2YWx1ZSBmb3IgYSB0ZXN0LiIiIgog ICAgICAgICAjIFRoZSBEdW1wUmVuZGVyVHJlZSB3YXRjaGRvZyB1c2VzIDIuNXggdGhlIHRpbWVv dXQ7IHdlIHdhbnQgdG8gYmUKICAgICAgICAgIyBsYXJnZXIgdGhhbiB0aGF0LiBXZSBhbHNvIGFk ZCBhIGxpdHRsZSBtb3JlIHBhZGRpbmcgaWYgd2UncmUKQEAgLTEzMyw3ICsxMzEsNyBAQCBjbGFz cyBXb3JrZXIob2JqZWN0KToKICAgICAgICAgdGhyZWFkX3RpbWVvdXRfc2VjID0gZHJpdmVyX3Rp bWVvdXRfc2VjICsgdGhyZWFkX3BhZGRpbmdfc2VjCiAgICAgICAgIHJldHVybiB0aHJlYWRfdGlt ZW91dF9zZWMKIAotICAgIGRlZiBraWxsX2RyaXZlcihzZWxmKToKKyAgICBkZWYgX2tpbGxfZHJp dmVyKHNlbGYpOgogICAgICAgICAjIEJlIGNhcmVmdWwgYWJvdXQgaG93IGFuZCB3aGVuIHdlIGtp bGwgdGhlIGRyaXZlcjsgaWYgZHJpdmVyLnN0b3AoKQogICAgICAgICAjIHJhaXNlcyBhbiBleGNl cHRpb24sIHRoaXMgcm91dGluZSBtYXkgZ2V0IHJlLWVudGVyZWQgdmlhIF9fZGVsX18uCiAgICAg ICAgIGRyaXZlciA9IHNlbGYuX2RyaXZlcgpAQCAtMTQyLDEyICsxNDAsMTIgQEAgY2xhc3MgV29y a2VyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmRlYnVnKCIlcyBraWxsaW5nIGRyaXZlciIg JSBzZWxmLl9uYW1lKQogICAgICAgICAgICAgZHJpdmVyLnN0b3AoKQogCi0gICAgZGVmIHJ1bl90 ZXN0X3dpdGhfdGltZW91dChzZWxmLCB0ZXN0X2lucHV0LCB0aW1lb3V0KToKKyAgICBkZWYgX3J1 bl90ZXN0X3dpdGhfdGltZW91dChzZWxmLCB0ZXN0X2lucHV0LCB0aW1lb3V0KToKICAgICAgICAg aWYgc2VsZi5fb3B0aW9ucy5ydW5fc2luZ2x5OgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3J1 bl90ZXN0X2luX2Fub3RoZXJfdGhyZWFkKHRlc3RfaW5wdXQsIHRpbWVvdXQpCiAgICAgICAgIHJl dHVybiBzZWxmLl9ydW5fdGVzdF9pbl90aGlzX3RocmVhZCh0ZXN0X2lucHV0KQogCi0gICAgZGVm IGNsZWFuX3VwX2FmdGVyX3Rlc3Qoc2VsZiwgdGVzdF9pbnB1dCwgcmVzdWx0KToKKyAgICBkZWYg X2NsZWFuX3VwX2FmdGVyX3Rlc3Qoc2VsZiwgdGVzdF9pbnB1dCwgcmVzdWx0KToKICAgICAgICAg c2VsZi5fYmF0Y2hfY291bnQgKz0gMQogICAgICAgICB0ZXN0X25hbWUgPSB0ZXN0X2lucHV0LnRl c3RfbmFtZQogICAgICAgICBzZWxmLl90ZXN0c19ydW5fZmlsZS53cml0ZSh0ZXN0X25hbWUgKyAi XG4iKQpAQCAtMTU1LDcgKzE1Myw3IEBAIGNsYXNzIFdvcmtlcihvYmplY3QpOgogICAgICAgICBp ZiByZXN1bHQuZmFpbHVyZXM6CiAgICAgICAgICAgICAjIENoZWNrIGFuZCBraWxsIER1bXBSZW5k ZXJUcmVlIGlmIHdlIG5lZWQgdG8uCiAgICAgICAgICAgICBpZiBhbnkoW2YuZHJpdmVyX25lZWRz X3Jlc3RhcnQoKSBmb3IgZiBpbiByZXN1bHQuZmFpbHVyZXNdKToKLSAgICAgICAgICAgICAgICBz ZWxmLmtpbGxfZHJpdmVyKCkKKyAgICAgICAgICAgICAgICBzZWxmLl9raWxsX2RyaXZlcigpCiAg ICAgICAgICAgICAgICAgIyBSZXNldCB0aGUgYmF0Y2ggY291bnQgc2luY2UgdGhlIHNoZWxsIGp1 c3QgYm91bmNlZC4KICAgICAgICAgICAgICAgICBzZWxmLl9iYXRjaF9jb3VudCA9IDAKIApAQCAt MTY5LDcgKzE2Nyw3IEBAIGNsYXNzIFdvcmtlcihvYmplY3QpOgogICAgICAgICAgICAgX2xvZy5k ZWJ1ZygiJXMgJXMgcGFzc2VkIiAlIChzZWxmLl9uYW1lLCB0ZXN0X25hbWUpKQogCiAgICAgICAg IGlmIHNlbGYuX2JhdGNoX3NpemUgPiAwIGFuZCBzZWxmLl9iYXRjaF9jb3VudCA+PSBzZWxmLl9i YXRjaF9zaXplOgotICAgICAgICAgICAgc2VsZi5raWxsX2RyaXZlcigpCisgICAgICAgICAgICBz ZWxmLl9raWxsX2RyaXZlcigpCiAgICAgICAgICAgICBzZWxmLl9iYXRjaF9jb3VudCA9IDAKIAog ICAgIGRlZiBfcnVuX3Rlc3RfaW5fYW5vdGhlcl90aHJlYWQoc2VsZiwgdGVzdF9pbnB1dCwgdGhy ZWFkX3RpbWVvdXRfc2VjKToKQEAgLTE5NSw3ICsxOTMsNyBAQCBjbGFzcyBXb3JrZXIob2JqZWN0 KToKICAgICAgICAgICAgICAgICBzZWxmLnJlc3VsdCA9IE5vbmUKIAogICAgICAgICAgICAgZGVm IHJ1bihzZWxmKToKLSAgICAgICAgICAgICAgICBzZWxmLnJlc3VsdCA9IHdvcmtlci5ydW5fc2lu Z2xlX3Rlc3QoZHJpdmVyLCB0ZXN0X2lucHV0KQorICAgICAgICAgICAgICAgIHNlbGYucmVzdWx0 ID0gd29ya2VyLl9ydW5fc2luZ2xlX3Rlc3QoZHJpdmVyLCB0ZXN0X2lucHV0KQogCiAgICAgICAg IHRocmVhZCA9IFNpbmdsZVRlc3RUaHJlYWQoKQogICAgICAgICB0aHJlYWQuc3RhcnQoKQpAQCAt MjI3LDExICsyMjUsMTEgQEAgY2xhc3MgV29ya2VyKG9iamVjdCk6CiAgICAgICAgIFJldHVybnM6 IGEgVGVzdFJlc3VsdCBvYmplY3QuCiAgICAgICAgICIiIgogICAgICAgICBpZiBzZWxmLl9kcml2 ZXIgYW5kIHNlbGYuX2RyaXZlci5oYXNfY3Jhc2hlZCgpOgotICAgICAgICAgICAgc2VsZi5raWxs X2RyaXZlcigpCisgICAgICAgICAgICBzZWxmLl9raWxsX2RyaXZlcigpCiAgICAgICAgIGlmIG5v dCBzZWxmLl9kcml2ZXI6CiAgICAgICAgICAgICBzZWxmLl9kcml2ZXIgPSBzZWxmLl9wb3J0LmNy ZWF0ZV9kcml2ZXIoc2VsZi5fd29ya2VyX251bWJlcikKLSAgICAgICAgcmV0dXJuIHNlbGYucnVu X3NpbmdsZV90ZXN0KHNlbGYuX2RyaXZlciwgdGVzdF9pbnB1dCkKKyAgICAgICAgcmV0dXJuIHNl bGYuX3J1bl9zaW5nbGVfdGVzdChzZWxmLl9kcml2ZXIsIHRlc3RfaW5wdXQpCiAKLSAgICBkZWYg cnVuX3NpbmdsZV90ZXN0KHNlbGYsIGRyaXZlciwgdGVzdF9pbnB1dCk6CisgICAgZGVmIF9ydW5f c2luZ2xlX3Rlc3Qoc2VsZiwgZHJpdmVyLCB0ZXN0X2lucHV0KToKICAgICAgICAgcmV0dXJuIHNp bmdsZV90ZXN0X3J1bm5lci5ydW5fc2luZ2xlX3Rlc3Qoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9u cywKICAgICAgICAgICAgIHRlc3RfaW5wdXQsIGRyaXZlciwgc2VsZi5fbmFtZSkK