62614 2011-06-13 17:36:11 -0700 rwt: handle worker exceptions cleanly 2011-06-14 13:37:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 420099 0 dpranke 2011-06-13 17:36:11 -0700 rwt: handle worker exceptions cleanly 420112 1 97049 dpranke 2011-06-13 17:53:09 -0700 Created attachment 97049 Patch 420119 2 webkit.review.bot 2011-06-13 17:56:19 -0700 Attachment 97049 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:1323: deprecated form of raising exception [pep8/W602] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 420120 3 97049 dpranke 2011-06-13 17:58:48 -0700 Comment on attachment 97049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97049&action=review >> Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:1323 >> + raise exception_type, exception_value > > deprecated form of raising exception [pep8/W602] [5] The code is correct, and I don't know if there's a way to suppress this warning given whatever lint tool we're using, or if there's another way to re-raise this error, but otherwise this warning can be ignored, I think. 420497 4 97049 tony 2011-06-14 09:40:28 -0700 Comment on attachment 97049 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97049&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:695 > + except WorkerException, e: Nit: e looks unused, maybe remove it or re-raise it? > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:702 > raise Should we re-raise the exception here too? >>> Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:1323 >>> + raise exception_type, exception_value >> >> deprecated form of raising exception [pep8/W602] [5] > > The code is correct, and I don't know if there's a way to suppress this warning given whatever lint tool we're using, or if there's another way to re-raise this error, but otherwise this warning can be ignored, I think. Can you do raise exception_type(exception_value) or does that not always work? > Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py:108 > _log.debug("%s done with message loop%s" % (self._name, exception_msg)) Nit: Should the prefix ", " be moved into this log message and removed from exception_msg? 420685 5 dpranke 2011-06-14 13:19:29 -0700 (In reply to comment #4) > (From update of attachment 97049 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97049&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:695 > > + except WorkerException, e: > > Nit: e looks unused, maybe remove it or re-raise it? > I've removed the "e". > > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:702 > > raise > > Should we re-raise the exception here too? > I'm confused, what do you mean. Doesn't "raise" by itself re-raise the exception? > >>> Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:1323 > >>> + raise exception_type, exception_value > >> > >> deprecated form of raising exception [pep8/W602] [5] > > > > The code is correct, and I don't know if there's a way to suppress this warning given whatever lint tool we're using, or if there's another way to re-raise this error, but otherwise this warning can be ignored, I think. > > Can you do raise exception_type(exception_value) or does that not always work? That seems to work, and doesn't get a complaint from lint. Fortunately, there's no traceback. > > > Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py:108 > > _log.debug("%s done with message loop%s" % (self._name, exception_msg)) > > Nit: Should the prefix ", " be moved into this log message and removed from exception_msg? No, because exception_msg is empty if there's no exception, and we would be left with a comma but nothing following it. 420686 6 97161 dpranke 2011-06-14 13:20:33 -0700 Created attachment 97161 update w/ review feedback from tony 420692 7 97161 tony 2011-06-14 13:30:04 -0700 Comment on attachment 97161 update w/ review feedback from tony View in context: https://bugs.webkit.org/attachment.cgi?id=97161&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py:702 > raise Yes, you're right, this gives the right behavior. I was confused. If you were to raise e, the caught exception, it would lose the stack. 420700 8 dpranke 2011-06-14 13:37:08 -0700 Committed r88848: <http://trac.webkit.org/changeset/88848> 97049 2011-06-13 17:53:09 -0700 2011-06-14 13:20:30 -0700 Patch bug-62614-20110613175308.patch text/plain 8667 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODg2ODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4OTJlM2YxMjI5ODA5MDQzYjIwNGNmZGYwYzI1YjRiMTA0 NmZjYjgyLi4xYjA1OGFmMDAxZjg1YmE0ZjZjNjE5YmJkNDcyOWQzZWM5MzFhZDFlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDYtMTMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogaGFuZGxl IHdvcmtlciBleGNlcHRpb25zIGNsZWFubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYyNjE0CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgbW9kaWZpZXJz IG5ldy1ydW4td2Via2l0LXRlc3RzIHRvIGhhbmRsZSBleGNlcHRpb25zCisgICAgICAgIHJhaXNl ZCBieSB3b3JrZXIgdGhyZWFkcyBiZXR0ZXIsIGJ5OgorICAgICAgICAtIGNhcHR1cmluZyB0aGUg d29ya2VyJ3Mgc3RhY2sgYW5kIGxvZ2dpbmcgaXQgaW4gdGhlIG1hbmFnZXIKKyAgICAgICAgLSBw cm9wYWdhdGluZyB0aGUgd29ya2VyJ3MgZXhjZXB0aW9uIGluIHRoZSBjYWxsZXIgY29ycmVjdGx5 CisgICAgICAgIC0gYXR0ZW1wdGluZyB0byBjYW5jZWwgdGhlIHdvcmtlcnMgYW5kIGNsZWFuIHVw IGV2ZW4gd2hlbgorICAgICAgICAgIHdlIGdldCBhbiB1bmV4cGVjdGVkIGV4Y2VwdGlvbgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFu YWdlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS93b3JrZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weToKKwogMjAxMS0wNi0x MyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg4NjcxLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIucHkK aW5kZXggYmM5ZWFmMmMzOGM0ZjZjN2UwOTdhOGRmMmZkYjAzYTQ5MzMyNWUzNi4uYWE2NTNhM2Fh OTY5ZDRkNjQ2NGE1YjE4ZDUzOTBjOTMwZWM5ZGQxYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5hZ2Vy LnB5CkBAIC0yMjksNiArMjI5LDExIEBAIGNsYXNzIFRlc3RSdW5JbnRlcnJ1cHRlZEV4Y2VwdGlv bihFeGNlcHRpb24pOgogICAgICAgICByZXR1cm4gc2VsZi5fX2NsYXNzX18sIChzZWxmLnJlYXNv biwpCiAKIAorY2xhc3MgV29ya2VyRXhjZXB0aW9uKEV4Y2VwdGlvbik6CisgICAgIiIiUmFpc2Vk IHdoZW4gd2UgcmVjZWl2ZSBhbiB1bmV4cGVjdGVkL3Vua25vd24gZXhjZXB0aW9uIGZyb20gYSB3 b3JrZXIuIiIiCisgICAgcGFzcworCisKIGNsYXNzIE1hbmFnZXI6CiAgICAgIiIiQSBjbGFzcyBm b3IgbWFuYWdpbmcgcnVubmluZyBhIHNlcmllcyBvZiB0ZXN0cyBvbiBhIHNlcmllcyBvZiBsYXlv dXQKICAgICB0ZXN0IGZpbGVzLiIiIgpAQCAtNjg3LDkgKzY5MiwxMyBAQCBjbGFzcyBNYW5hZ2Vy OgogICAgICAgICAgICAgX2xvZy5pbmZvKGUucmVhc29uKQogICAgICAgICAgICAgc2VsZi5jYW5j ZWxfd29ya2VycygpCiAgICAgICAgICAgICBpbnRlcnJ1cHRlZCA9IFRydWUKKyAgICAgICAgZXhj ZXB0IFdvcmtlckV4Y2VwdGlvbiwgZToKKyAgICAgICAgICAgIHNlbGYuY2FuY2VsX3dvcmtlcnMo KQorICAgICAgICAgICAgcmFpc2UKICAgICAgICAgZXhjZXB0OgogICAgICAgICAgICAgIyBVbmV4 cGVjdGVkIGV4Y2VwdGlvbjsgZG9uJ3QgdHJ5IHRvIGNsZWFuIHVwIHdvcmtlcnMuCi0gICAgICAg ICAgICBfbG9nLmluZm8oIkV4Y2VwdGlvbiByYWlzZWQsIGV4aXRpbmciKQorICAgICAgICAgICAg X2xvZy5lcnJvcigiRXhjZXB0aW9uIHJhaXNlZCwgZXhpdGluZyIpCisgICAgICAgICAgICBzZWxm LmNhbmNlbF93b3JrZXJzKCkKICAgICAgICAgICAgIHJhaXNlCiAKICAgICAgICAgdGhyZWFkX3Rp bWluZ3MgPSBbd29ya2VyX3N0YXRlLnN0YXRzIGZvciB3b3JrZXJfc3RhdGUgaW4gc2VsZi5fd29y a2VyX3N0YXRlcy52YWx1ZXMoKV0KQEAgLTEzMDksOSArMTMxOCwxNSBAQCBjbGFzcyBNYW5hZ2Vy OgogICAgICAgICB3b3JrZXJfc3RhdGUgPSBzZWxmLl93b3JrZXJfc3RhdGVzW3NvdXJjZV0KICAg ICAgICAgd29ya2VyX3N0YXRlLmRvbmUgPSBUcnVlCiAKLSAgICBkZWYgaGFuZGxlX2V4Y2VwdGlv bihzZWxmLCBzb3VyY2UsIGV4Y2VwdGlvbl9pbmZvKToKLSAgICAgICAgZXhjZXB0aW9uX3R5cGUs IGV4Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9IGV4Y2VwdGlvbl9pbmZvCi0g ICAgICAgIHJhaXNlIGV4Y2VwdGlvbl90eXBlLCBleGNlcHRpb25fdmFsdWUsIGV4Y2VwdGlvbl90 cmFjZWJhY2sKKyAgICBkZWYgaGFuZGxlX2V4Y2VwdGlvbihzZWxmLCBzb3VyY2UsIGV4Y2VwdGlv bl90eXBlLCBleGNlcHRpb25fdmFsdWUsIHN0YWNrKToKKyAgICAgICAgaWYgZXhjZXB0aW9uX3R5 cGUgaW4gKEtleWJvYXJkSW50ZXJydXB0LCBUZXN0UnVuSW50ZXJydXB0ZWRFeGNlcHRpb24pOgor ICAgICAgICAgICAgcmFpc2UgZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZQorICAgICAg ICBfbG9nLmVycm9yKCIlcyByYWlzZWQgJXMoJyVzJyk6IiAlICgKKyAgICAgICAgICAgICAgICAg ICBzb3VyY2UsCisgICAgICAgICAgICAgICAgICAgZXhjZXB0aW9uX3ZhbHVlLl9fY2xhc3NfXy5f X25hbWVfXywKKyAgICAgICAgICAgICAgICAgICBzdHIoZXhjZXB0aW9uX3ZhbHVlKSkpCisgICAg ICAgIHNlbGYuX2xvZ193b3JrZXJfc3RhY2soc3RhY2spCisgICAgICAgIHJhaXNlIFdvcmtlckV4 Y2VwdGlvbihzdHIoZXhjZXB0aW9uX3ZhbHVlKSkKIAogICAgIGRlZiBoYW5kbGVfZmluaXNoZWRf bGlzdChzZWxmLCBzb3VyY2UsIGxpc3RfbmFtZSwgbnVtX3Rlc3RzLCBlbGFwc2VkX3RpbWUpOgog ICAgICAgICBzZWxmLl9ncm91cF9zdGF0c1tsaXN0X25hbWVdID0gKG51bV90ZXN0cywgZWxhcHNl ZF90aW1lKQpAQCAtMTMzMCw2ICsxMzQ1LDEzIEBAIGNsYXNzIE1hbmFnZXI6CiAgICAgICAgIHNl bGYuX2FsbF9yZXN1bHRzLmFwcGVuZChyZXN1bHQpCiAgICAgICAgIHNlbGYuX3VwZGF0ZV9zdW1t YXJ5X3dpdGhfcmVzdWx0KHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnksIHJlc3VsdCkKIAor ICAgIGRlZiBfbG9nX3dvcmtlcl9zdGFjayhzZWxmLCBzdGFjayk6CisgICAgICAgIHdlYmtpdHB5 ZGlyID0gc2VsZi5fcG9ydC5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1Rvb2xzJywgJ1NjcmlwdHMn LCAnd2Via2l0cHknKSArIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0uc2VwCisgICAgICAgIGZvciBm aWxlbmFtZSwgbGluZV9udW1iZXIsIGZ1bmN0aW9uX25hbWUsIHRleHQgaW4gc3RhY2s6CisgICAg ICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHdlYmtpdHB5ZGlyKToKKyAgICAgICAgICAg ICAgICBmaWxlbmFtZSA9IGZpbGVuYW1lLnJlcGxhY2Uod2Via2l0cHlkaXIsICcnKQorICAgICAg ICAgICAgX2xvZy5lcnJvcignICAlczoldSAoaW4gJXMpJyAlIChmaWxlbmFtZSwgbGluZV9udW1i ZXIsIGZ1bmN0aW9uX25hbWUpKQorICAgICAgICAgICAgX2xvZy5lcnJvcignICAgICVzJyAlIHRl eHQpCiAKIGRlZiByZWFkX3Rlc3RfZmlsZXMoZnMsIGZpbGVzKToKICAgICB0ZXN0cyA9IFtdCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS93b3JrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS93b3JrZXIucHkKaW5kZXggYWI1ZDc2ZmFhZGNmYzE4NzE3ZWM0MGMyYWI4YWYw NTc3OTA1MmZmMy4uYzhmNjRhY2UzNDA4Yzg4YmYxYzdhYjJmM2M4MDI2NmM3ZmU3MzU1MiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2th Z2Uvd29ya2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL3dvcmtlci5weQpAQCAtMzIsNiArMzIsNyBAQCBpbXBvcnQgbG9nZ2luZwog aW1wb3J0IHN5cwogaW1wb3J0IHRocmVhZGluZwogaW1wb3J0IHRpbWUKK2ltcG9ydCB0cmFjZWJh Y2sKIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBzdGFja191dGlscwogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1wb3J0IG1hbmFnZXJfd29y a2VyX2Jyb2tlcgpAQCAtOTksMjAgKzEwMCwyMyBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3Jr ZXJfYnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAlIHNlbGYuX25hbWUpCiAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoK ICAgICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBpbnRlcnJ1cHRlZCIKKyAgICAgICAgICAg IHNlbGYucG9zdF9leGNlcHRpb24oKQogICAgICAgICBleGNlcHQ6CiAgICAgICAgICAgICBleGNl cHRpb25fbXNnID0gIiwgZXhjZXB0aW9uIHJhaXNlZCIKKyAgICAgICAgICAgIHNlbGYucG9zdF9l eGNlcHRpb24oKQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMg ZG9uZSB3aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25fbXNnKSkK LSAgICAgICAgICAgIGlmIGV4Y2VwdGlvbl9tc2c6Ci0gICAgICAgICAgICAgICAgZXhjZXB0aW9u X3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9IHN5cy5leGNfaW5m bygpCi0gICAgICAgICAgICAgICAgc3RhY2tfdXRpbHMubG9nX3RyYWNlYmFjayhfbG9nLmRlYnVn LCBleGNlcHRpb25fdHJhY2ViYWNrKQotICAgICAgICAgICAgICAgICMgRklYTUU6IEZpZ3VyZSBv dXQgaG93IHRvIHNlbmQgYSBtZXNzYWdlIHdpdGggYSB0cmFjZWJhY2suCi0gICAgICAgICAgICAg ICAgc2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdleGNlcHRpb24nLAotICAg ICAgICAgICAgICAgICAgICAoZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgTm9uZSkp CiAgICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUn KQogICAgICAgICAgICAgc2VsZi5jbGVhbnVwKCkKICAgICAgICAgICAgIF9sb2cuZGVidWcoIiVz IGV4aXRpbmciICUgc2VsZi5fbmFtZSkKIAorICAgIGRlZiBwb3N0X2V4Y2VwdGlvbihzZWxmKToK KyAgICAgICAgIyBTaW5jZSB0cmFjZWJhY2tzIGFyZW4ndCBwaWNrbGFibGUsIHNlbmQgdGhlIGV4 dHJhY3RlZCBzdGFjayBpbnN0ZWFkLgorICAgICAgICBleGNlcHRpb25fdHlwZSwgZXhjZXB0aW9u X3ZhbHVlLCBleGNlcHRpb25fdHJhY2ViYWNrID0gc3lzLmV4Y19pbmZvKCkKKyAgICAgICAgc3Rh Y2tfdXRpbHMubG9nX3RyYWNlYmFjayhfbG9nLmRlYnVnLCBleGNlcHRpb25fdHJhY2ViYWNrKQor ICAgICAgICBzdGFjayA9IHRyYWNlYmFjay5leHRyYWN0X3RiKGV4Y2VwdGlvbl90cmFjZWJhY2sp CisgICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZXhjZXB0aW9u JywgZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgc3RhY2spCisKICAgICBkZWYgaGFu ZGxlX3Rlc3RfbGlzdChzZWxmLCBzcmMsIGxpc3RfbmFtZSwgdGVzdF9saXN0KToKICAgICAgICAg aWYgbGlzdF9uYW1lID09ICJ0ZXN0c190b19odHRwX2xvY2siOgogICAgICAgICAgICAgc2VsZi5z dGFydF9zZXJ2ZXJzX3dpdGhfbG9jaygpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAwNDNjNDYxNjI2Y2I2 ZjE3YzAzY2RmMTI4OGE4MmNlM2JkNTJiZmQ0Li41NTk4NzA4NDFhNGY2MjNhNTJmZmQzOWU2OTc5 Yjg1MzQyNmNmN2I0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTUyLDYgKzUyLDggQEAgaW1wb3J0IHBv cnQKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCitXb3JrZXJFeGNlcHRp b24gPSBtYW5hZ2VyLldvcmtlckV4Y2VwdGlvbgorCiBkZWYgcnVuKHBvcnQsIG9wdGlvbnMsIGFy Z3MsIHJlZ3VsYXJfb3V0cHV0PXN5cy5zdGRlcnIsCiAgICAgICAgIGJ1aWxkYm90X291dHB1dD1z eXMuc3Rkb3V0KToKICAgICAiIiJSdW4gdGhlIHRlc3RzLgpAQCAtNDU5LDUgKzQ2MSwxMSBAQCBp ZiAnX19tYWluX18nID09IF9fbmFtZV9fOgogICAgIHRyeToKICAgICAgICAgc3lzLmV4aXQobWFp bigpKQogICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKLSAgICAgICAgIyB0aGlzIG1pcnJv cnMgd2hhdCB0aGUgc2hlbGwgbm9ybWFsbHkgZG9lcwotICAgICAgICBzeXMuZXhpdChzaWduYWwu U0lHSU5UICsgMTI4KQorICAgICAgICAjIFRoaXMgbWlycm9ycyB3aGF0IHRoZSBzaGVsbCBub3Jt YWxseSBkb2VzLgorICAgICAgICBJTlRFUlJVUFRFRF9FWElUX1NUQVRVUyA9IHNpZ25hbC5TSUdJ TlQgKyAxMjgKKyAgICAgICAgc3lzLmV4aXQoSU5URVJSVVBURURfRVhJVF9TVEFUVVMpCisgICAg ZXhjZXB0IFdvcmtlckV4Y2VwdGlvbiwgZToKKyAgICAgICAgIyBUaGlzIGlzIGEgcmFuZG9tbHkg Y2hvc2VuIGV4aXQgY29kZSB0aGF0IGNhbiBiZSB0ZXN0ZWQgYWdhaW5zdCB0bworICAgICAgICAj IGluZGljYXRlIHRoYXQgYW4gdW5leHBlY3RlZCBleGNlcHRpb24gb2NjdXJyZWQuCisgICAgICAg IEVYQ0VQVElPTkFMX0VYSVRfU1RBVFVTID0gMjU0CisgICAgICAgIHN5cy5leGl0KEVYQ0VQVElP TkFMX0VYSVRfU1RBVFVTKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVz dC5weQppbmRleCBmMjMyY2EyOTFkMWFhNmJhZmQ2ODJlOGZmMTJlYTEzYTVlMzZlM2Q0Li5iMDdi NDUxOGI1MmRhNjUzZThlYmU2Mjk5MDI0MDVlMzc4OWI1NmU3IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9u dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQpAQCAtMjIwLDcgKzIyMCw3IEBAIGNsYXNzIE1h aW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChiYXRj aF90ZXN0c19ydW4sIFtdKQogCiAgICAgZGVmIHRlc3RfZXhjZXB0aW9uX3JhaXNlZChzZWxmKToK LSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgbG9nZ2luZ19ydW4sCisgICAg ICAgIHNlbGYuYXNzZXJ0UmFpc2VzKHJ1bl93ZWJraXRfdGVzdHMuV29ya2VyRXhjZXB0aW9uLCBs b2dnaW5nX3J1biwKICAgICAgICAgICAgIFsnZmFpbHVyZXMvZXhwZWN0ZWQvZXhjZXB0aW9uLmh0 bWwnXSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKIAogICAgIGRlZiB0ZXN0X2Z1bGxfcmVzdWx0c19o dG1sKHNlbGYpOgpAQCAtMzE5LDcgKzMxOSw3IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICBkZWYgdGVzdF9ydW5fZm9yY2Uoc2VsZik6CiAgICAgICAgICMgVGhpcyBy YWlzZXMgYW4gZXhjZXB0aW9uIGJlY2F1c2Ugd2UgcnVuCiAgICAgICAgICMgZmFpbHVyZXMvZXhw ZWN0ZWQvZXhjZXB0aW9uLmh0bWwsIHdoaWNoIGlzIG5vcm1hbGx5IFNLSVBwZWQuCi0gICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzKFZhbHVlRXJyb3IsIGxvZ2dpbmdfcnVuLCBbJy0tZm9yY2UnXSkK KyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMocnVuX3dlYmtpdF90ZXN0cy5Xb3JrZXJFeGNlcHRp b24sIGxvZ2dpbmdfcnVuLCBbJy0tZm9yY2UnXSkKIAogICAgIGRlZiB0ZXN0X3J1bl9wYXJ0KHNl bGYpOgogICAgICAgICAjIFRlc3QgdGhhdCB3ZSBhY3R1YWxseSBzZWxlY3QgdGhlIHJpZ2h0IHBh cnQK 97161 2011-06-14 13:20:33 -0700 2011-06-14 13:30:03 -0700 update w/ review feedback from tony bug-62614-20110614132032.patch text/plain 8664 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODg2ODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4OTJlM2YxMjI5ODA5MDQzYjIwNGNmZGYwYzI1YjRiMTA0 NmZjYjgyLi4xYjA1OGFmMDAxZjg1YmE0ZjZjNjE5YmJkNDcyOWQzZWM5MzFhZDFlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDYtMTMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogaGFuZGxl IHdvcmtlciBleGNlcHRpb25zIGNsZWFubHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYyNjE0CisKKyAgICAgICAgVGhpcyBjaGFuZ2UgbW9kaWZpZXJz IG5ldy1ydW4td2Via2l0LXRlc3RzIHRvIGhhbmRsZSBleGNlcHRpb25zCisgICAgICAgIHJhaXNl ZCBieSB3b3JrZXIgdGhyZWFkcyBiZXR0ZXIsIGJ5OgorICAgICAgICAtIGNhcHR1cmluZyB0aGUg d29ya2VyJ3Mgc3RhY2sgYW5kIGxvZ2dpbmcgaXQgaW4gdGhlIG1hbmFnZXIKKyAgICAgICAgLSBw cm9wYWdhdGluZyB0aGUgd29ya2VyJ3MgZXhjZXB0aW9uIGluIHRoZSBjYWxsZXIgY29ycmVjdGx5 CisgICAgICAgIC0gYXR0ZW1wdGluZyB0byBjYW5jZWwgdGhlIHdvcmtlcnMgYW5kIGNsZWFuIHVw IGV2ZW4gd2hlbgorICAgICAgICAgIHdlIGdldCBhbiB1bmV4cGVjdGVkIGV4Y2VwdGlvbgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFu YWdlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS93b3JrZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weToKKwogMjAxMS0wNi0x MyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg4NjcxLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXIucHkK aW5kZXggYmM5ZWFmMmMzOGM0ZjZjN2UwOTdhOGRmMmZkYjAzYTQ5MzMyNWUzNi4uYjU4YTNiZTNm MzU0YWEyMTg1ZWIwOTU0NzAwZGNmZTM4YWY1NGM2MiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tYW5hZ2Vy LnB5CkBAIC0yMjksNiArMjI5LDExIEBAIGNsYXNzIFRlc3RSdW5JbnRlcnJ1cHRlZEV4Y2VwdGlv bihFeGNlcHRpb24pOgogICAgICAgICByZXR1cm4gc2VsZi5fX2NsYXNzX18sIChzZWxmLnJlYXNv biwpCiAKIAorY2xhc3MgV29ya2VyRXhjZXB0aW9uKEV4Y2VwdGlvbik6CisgICAgIiIiUmFpc2Vk IHdoZW4gd2UgcmVjZWl2ZSBhbiB1bmV4cGVjdGVkL3Vua25vd24gZXhjZXB0aW9uIGZyb20gYSB3 b3JrZXIuIiIiCisgICAgcGFzcworCisKIGNsYXNzIE1hbmFnZXI6CiAgICAgIiIiQSBjbGFzcyBm b3IgbWFuYWdpbmcgcnVubmluZyBhIHNlcmllcyBvZiB0ZXN0cyBvbiBhIHNlcmllcyBvZiBsYXlv dXQKICAgICB0ZXN0IGZpbGVzLiIiIgpAQCAtNjg3LDkgKzY5MiwxMyBAQCBjbGFzcyBNYW5hZ2Vy OgogICAgICAgICAgICAgX2xvZy5pbmZvKGUucmVhc29uKQogICAgICAgICAgICAgc2VsZi5jYW5j ZWxfd29ya2VycygpCiAgICAgICAgICAgICBpbnRlcnJ1cHRlZCA9IFRydWUKKyAgICAgICAgZXhj ZXB0IFdvcmtlckV4Y2VwdGlvbjoKKyAgICAgICAgICAgIHNlbGYuY2FuY2VsX3dvcmtlcnMoKQor ICAgICAgICAgICAgcmFpc2UKICAgICAgICAgZXhjZXB0OgogICAgICAgICAgICAgIyBVbmV4cGVj dGVkIGV4Y2VwdGlvbjsgZG9uJ3QgdHJ5IHRvIGNsZWFuIHVwIHdvcmtlcnMuCi0gICAgICAgICAg ICBfbG9nLmluZm8oIkV4Y2VwdGlvbiByYWlzZWQsIGV4aXRpbmciKQorICAgICAgICAgICAgX2xv Zy5lcnJvcigiRXhjZXB0aW9uIHJhaXNlZCwgZXhpdGluZyIpCisgICAgICAgICAgICBzZWxmLmNh bmNlbF93b3JrZXJzKCkKICAgICAgICAgICAgIHJhaXNlCiAKICAgICAgICAgdGhyZWFkX3RpbWlu Z3MgPSBbd29ya2VyX3N0YXRlLnN0YXRzIGZvciB3b3JrZXJfc3RhdGUgaW4gc2VsZi5fd29ya2Vy X3N0YXRlcy52YWx1ZXMoKV0KQEAgLTEzMDksOSArMTMxOCwxNSBAQCBjbGFzcyBNYW5hZ2VyOgog ICAgICAgICB3b3JrZXJfc3RhdGUgPSBzZWxmLl93b3JrZXJfc3RhdGVzW3NvdXJjZV0KICAgICAg ICAgd29ya2VyX3N0YXRlLmRvbmUgPSBUcnVlCiAKLSAgICBkZWYgaGFuZGxlX2V4Y2VwdGlvbihz ZWxmLCBzb3VyY2UsIGV4Y2VwdGlvbl9pbmZvKToKLSAgICAgICAgZXhjZXB0aW9uX3R5cGUsIGV4 Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9IGV4Y2VwdGlvbl9pbmZvCi0gICAg ICAgIHJhaXNlIGV4Y2VwdGlvbl90eXBlLCBleGNlcHRpb25fdmFsdWUsIGV4Y2VwdGlvbl90cmFj ZWJhY2sKKyAgICBkZWYgaGFuZGxlX2V4Y2VwdGlvbihzZWxmLCBzb3VyY2UsIGV4Y2VwdGlvbl90 eXBlLCBleGNlcHRpb25fdmFsdWUsIHN0YWNrKToKKyAgICAgICAgaWYgZXhjZXB0aW9uX3R5cGUg aW4gKEtleWJvYXJkSW50ZXJydXB0LCBUZXN0UnVuSW50ZXJydXB0ZWRFeGNlcHRpb24pOgorICAg ICAgICAgICAgcmFpc2UgZXhjZXB0aW9uX3R5cGUoZXhjZXB0aW9uX3ZhbHVlKQorICAgICAgICBf bG9nLmVycm9yKCIlcyByYWlzZWQgJXMoJyVzJyk6IiAlICgKKyAgICAgICAgICAgICAgICAgICBz b3VyY2UsCisgICAgICAgICAgICAgICAgICAgZXhjZXB0aW9uX3ZhbHVlLl9fY2xhc3NfXy5fX25h bWVfXywKKyAgICAgICAgICAgICAgICAgICBzdHIoZXhjZXB0aW9uX3ZhbHVlKSkpCisgICAgICAg IHNlbGYuX2xvZ193b3JrZXJfc3RhY2soc3RhY2spCisgICAgICAgIHJhaXNlIFdvcmtlckV4Y2Vw dGlvbihzdHIoZXhjZXB0aW9uX3ZhbHVlKSkKIAogICAgIGRlZiBoYW5kbGVfZmluaXNoZWRfbGlz dChzZWxmLCBzb3VyY2UsIGxpc3RfbmFtZSwgbnVtX3Rlc3RzLCBlbGFwc2VkX3RpbWUpOgogICAg ICAgICBzZWxmLl9ncm91cF9zdGF0c1tsaXN0X25hbWVdID0gKG51bV90ZXN0cywgZWxhcHNlZF90 aW1lKQpAQCAtMTMzMCw2ICsxMzQ1LDEzIEBAIGNsYXNzIE1hbmFnZXI6CiAgICAgICAgIHNlbGYu X2FsbF9yZXN1bHRzLmFwcGVuZChyZXN1bHQpCiAgICAgICAgIHNlbGYuX3VwZGF0ZV9zdW1tYXJ5 X3dpdGhfcmVzdWx0KHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnksIHJlc3VsdCkKIAorICAg IGRlZiBfbG9nX3dvcmtlcl9zdGFjayhzZWxmLCBzdGFjayk6CisgICAgICAgIHdlYmtpdHB5ZGly ID0gc2VsZi5fcG9ydC5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1Rvb2xzJywgJ1NjcmlwdHMnLCAn d2Via2l0cHknKSArIHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0uc2VwCisgICAgICAgIGZvciBmaWxl bmFtZSwgbGluZV9udW1iZXIsIGZ1bmN0aW9uX25hbWUsIHRleHQgaW4gc3RhY2s6CisgICAgICAg ICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHdlYmtpdHB5ZGlyKToKKyAgICAgICAgICAgICAg ICBmaWxlbmFtZSA9IGZpbGVuYW1lLnJlcGxhY2Uod2Via2l0cHlkaXIsICcnKQorICAgICAgICAg ICAgX2xvZy5lcnJvcignICAlczoldSAoaW4gJXMpJyAlIChmaWxlbmFtZSwgbGluZV9udW1iZXIs IGZ1bmN0aW9uX25hbWUpKQorICAgICAgICAgICAgX2xvZy5lcnJvcignICAgICVzJyAlIHRleHQp CiAKIGRlZiByZWFkX3Rlc3RfZmlsZXMoZnMsIGZpbGVzKToKICAgICB0ZXN0cyA9IFtdCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS93b3JrZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS93b3JrZXIucHkKaW5kZXggYWI1ZDc2ZmFhZGNmYzE4NzE3ZWM0MGMyYWI4YWYwNTc3 OTA1MmZmMy4uYzhmNjRhY2UzNDA4Yzg4YmYxYzdhYjJmM2M4MDI2NmM3ZmU3MzU1MiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uv d29ya2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91 dF9wYWNrYWdlL3dvcmtlci5weQpAQCAtMzIsNiArMzIsNyBAQCBpbXBvcnQgbG9nZ2luZwogaW1w b3J0IHN5cwogaW1wb3J0IHRocmVhZGluZwogaW1wb3J0IHRpbWUKK2ltcG9ydCB0cmFjZWJhY2sK IAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBzdGFja191dGlscwogZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1wb3J0IG1hbmFnZXJfd29ya2Vy X2Jyb2tlcgpAQCAtOTksMjAgKzEwMCwyMyBAQCBjbGFzcyBXb3JrZXIobWFuYWdlcl93b3JrZXJf YnJva2VyLkFic3RyYWN0V29ya2VyKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAlIHNlbGYuX25hbWUpCiAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAg ICAgICAgICAgIGV4Y2VwdGlvbl9tc2cgPSAiLCBpbnRlcnJ1cHRlZCIKKyAgICAgICAgICAgIHNl bGYucG9zdF9leGNlcHRpb24oKQogICAgICAgICBleGNlcHQ6CiAgICAgICAgICAgICBleGNlcHRp b25fbXNnID0gIiwgZXhjZXB0aW9uIHJhaXNlZCIKKyAgICAgICAgICAgIHNlbGYucG9zdF9leGNl cHRpb24oKQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgZG9u ZSB3aXRoIG1lc3NhZ2UgbG9vcCVzIiAlIChzZWxmLl9uYW1lLCBleGNlcHRpb25fbXNnKSkKLSAg ICAgICAgICAgIGlmIGV4Y2VwdGlvbl9tc2c6Ci0gICAgICAgICAgICAgICAgZXhjZXB0aW9uX3R5 cGUsIGV4Y2VwdGlvbl92YWx1ZSwgZXhjZXB0aW9uX3RyYWNlYmFjayA9IHN5cy5leGNfaW5mbygp Ci0gICAgICAgICAgICAgICAgc3RhY2tfdXRpbHMubG9nX3RyYWNlYmFjayhfbG9nLmRlYnVnLCBl eGNlcHRpb25fdHJhY2ViYWNrKQotICAgICAgICAgICAgICAgICMgRklYTUU6IEZpZ3VyZSBvdXQg aG93IHRvIHNlbmQgYSBtZXNzYWdlIHdpdGggYSB0cmFjZWJhY2suCi0gICAgICAgICAgICAgICAg c2VsZi5fd29ya2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdleGNlcHRpb24nLAotICAgICAg ICAgICAgICAgICAgICAoZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgTm9uZSkpCiAg ICAgICAgICAgICBzZWxmLl93b3JrZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUnKQog ICAgICAgICAgICAgc2VsZi5jbGVhbnVwKCkKICAgICAgICAgICAgIF9sb2cuZGVidWcoIiVzIGV4 aXRpbmciICUgc2VsZi5fbmFtZSkKIAorICAgIGRlZiBwb3N0X2V4Y2VwdGlvbihzZWxmKToKKyAg ICAgICAgIyBTaW5jZSB0cmFjZWJhY2tzIGFyZW4ndCBwaWNrbGFibGUsIHNlbmQgdGhlIGV4dHJh Y3RlZCBzdGFjayBpbnN0ZWFkLgorICAgICAgICBleGNlcHRpb25fdHlwZSwgZXhjZXB0aW9uX3Zh bHVlLCBleGNlcHRpb25fdHJhY2ViYWNrID0gc3lzLmV4Y19pbmZvKCkKKyAgICAgICAgc3RhY2tf dXRpbHMubG9nX3RyYWNlYmFjayhfbG9nLmRlYnVnLCBleGNlcHRpb25fdHJhY2ViYWNrKQorICAg ICAgICBzdGFjayA9IHRyYWNlYmFjay5leHRyYWN0X3RiKGV4Y2VwdGlvbl90cmFjZWJhY2spCisg ICAgICAgIHNlbGYuX3dvcmtlcl9jb25uZWN0aW9uLnBvc3RfbWVzc2FnZSgnZXhjZXB0aW9uJywg ZXhjZXB0aW9uX3R5cGUsIGV4Y2VwdGlvbl92YWx1ZSwgc3RhY2spCisKICAgICBkZWYgaGFuZGxl X3Rlc3RfbGlzdChzZWxmLCBzcmMsIGxpc3RfbmFtZSwgdGVzdF9saXN0KToKICAgICAgICAgaWYg bGlzdF9uYW1lID09ICJ0ZXN0c190b19odHRwX2xvY2siOgogICAgICAgICAgICAgc2VsZi5zdGFy dF9zZXJ2ZXJzX3dpdGhfbG9jaygpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAwNDNjNDYxNjI2Y2I2ZjE3 YzAzY2RmMTI4OGE4MmNlM2JkNTJiZmQ0Li41NTk4NzA4NDFhNGY2MjNhNTJmZmQzOWU2OTc5Yjg1 MzQyNmNmN2I0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTUyLDYgKzUyLDggQEAgaW1wb3J0IHBvcnQK IF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCitXb3JrZXJFeGNlcHRpb24g PSBtYW5hZ2VyLldvcmtlckV4Y2VwdGlvbgorCiBkZWYgcnVuKHBvcnQsIG9wdGlvbnMsIGFyZ3Ms IHJlZ3VsYXJfb3V0cHV0PXN5cy5zdGRlcnIsCiAgICAgICAgIGJ1aWxkYm90X291dHB1dD1zeXMu c3Rkb3V0KToKICAgICAiIiJSdW4gdGhlIHRlc3RzLgpAQCAtNDU5LDUgKzQ2MSwxMSBAQCBpZiAn X19tYWluX18nID09IF9fbmFtZV9fOgogICAgIHRyeToKICAgICAgICAgc3lzLmV4aXQobWFpbigp KQogICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKLSAgICAgICAgIyB0aGlzIG1pcnJvcnMg d2hhdCB0aGUgc2hlbGwgbm9ybWFsbHkgZG9lcwotICAgICAgICBzeXMuZXhpdChzaWduYWwuU0lH SU5UICsgMTI4KQorICAgICAgICAjIFRoaXMgbWlycm9ycyB3aGF0IHRoZSBzaGVsbCBub3JtYWxs eSBkb2VzLgorICAgICAgICBJTlRFUlJVUFRFRF9FWElUX1NUQVRVUyA9IHNpZ25hbC5TSUdJTlQg KyAxMjgKKyAgICAgICAgc3lzLmV4aXQoSU5URVJSVVBURURfRVhJVF9TVEFUVVMpCisgICAgZXhj ZXB0IFdvcmtlckV4Y2VwdGlvbiwgZToKKyAgICAgICAgIyBUaGlzIGlzIGEgcmFuZG9tbHkgY2hv c2VuIGV4aXQgY29kZSB0aGF0IGNhbiBiZSB0ZXN0ZWQgYWdhaW5zdCB0bworICAgICAgICAjIGlu ZGljYXRlIHRoYXQgYW4gdW5leHBlY3RlZCBleGNlcHRpb24gb2NjdXJyZWQuCisgICAgICAgIEVY Q0VQVElPTkFMX0VYSVRfU1RBVFVTID0gMjU0CisgICAgICAgIHN5cy5leGl0KEVYQ0VQVElPTkFM X0VYSVRfU1RBVFVTKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5w eQppbmRleCBmMjMyY2EyOTFkMWFhNmJhZmQ2ODJlOGZmMTJlYTEzYTVlMzZlM2Q0Li5iMDdiNDUx OGI1MmRhNjUzZThlYmU2Mjk5MDI0MDVlMzc4OWI1NmU3IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQpAQCAtMjIwLDcgKzIyMCw3IEBAIGNsYXNzIE1haW5U ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChiYXRjaF90 ZXN0c19ydW4sIFtdKQogCiAgICAgZGVmIHRlc3RfZXhjZXB0aW9uX3JhaXNlZChzZWxmKToKLSAg ICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgbG9nZ2luZ19ydW4sCisgICAgICAg IHNlbGYuYXNzZXJ0UmFpc2VzKHJ1bl93ZWJraXRfdGVzdHMuV29ya2VyRXhjZXB0aW9uLCBsb2dn aW5nX3J1biwKICAgICAgICAgICAgIFsnZmFpbHVyZXMvZXhwZWN0ZWQvZXhjZXB0aW9uLmh0bWwn XSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKIAogICAgIGRlZiB0ZXN0X2Z1bGxfcmVzdWx0c19odG1s KHNlbGYpOgpAQCAtMzE5LDcgKzMxOSw3IEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICBkZWYgdGVzdF9ydW5fZm9yY2Uoc2VsZik6CiAgICAgICAgICMgVGhpcyByYWlz ZXMgYW4gZXhjZXB0aW9uIGJlY2F1c2Ugd2UgcnVuCiAgICAgICAgICMgZmFpbHVyZXMvZXhwZWN0 ZWQvZXhjZXB0aW9uLmh0bWwsIHdoaWNoIGlzIG5vcm1hbGx5IFNLSVBwZWQuCi0gICAgICAgIHNl bGYuYXNzZXJ0UmFpc2VzKFZhbHVlRXJyb3IsIGxvZ2dpbmdfcnVuLCBbJy0tZm9yY2UnXSkKKyAg ICAgICAgc2VsZi5hc3NlcnRSYWlzZXMocnVuX3dlYmtpdF90ZXN0cy5Xb3JrZXJFeGNlcHRpb24s IGxvZ2dpbmdfcnVuLCBbJy0tZm9yY2UnXSkKIAogICAgIGRlZiB0ZXN0X3J1bl9wYXJ0KHNlbGYp OgogICAgICAgICAjIFRlc3QgdGhhdCB3ZSBhY3R1YWxseSBzZWxlY3QgdGhlIHJpZ2h0IHBhcnQK