62615 2011-06-13 19:14:03 -0700 nrwt: should clean up stale server processes from a previous run 2011-06-15 19:47:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 62180 59993 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 420150 0 dpranke 2011-06-13 19:14:03 -0700 nrwt: should clean up stale server processes from a previous run 420163 1 97058 dpranke 2011-06-13 19:39:32 -0700 Created attachment 97058 Patch 420508 2 97058 tony 2011-06-14 09:54:41 -0700 Comment on attachment 97058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97058&action=review > Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:181 > + port._http_server = None > + port.start_http_server() How do we verify that this worked? 420548 3 97058 dpranke 2011-06-14 10:40:10 -0700 Comment on attachment 97058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97058&action=review >> Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:181 >> + port.start_http_server() > > How do we verify that this worked? "working" here is defined as not raising an exception. If the first start() worked, there's a server running. If the second start() gets called, it'll check that it can bind to port 8000, and raise an error if it can't (see lines 170, 171, above for that test). In this case, it thinks the previous server is now stale, and kills it. If I wanted to be more thorough, I could do any of the following things: verify that the first server was in fact killed, verify that a second process was running, or verify that we can connect to the port. None of those seemed strictly necessary given the other tests which ensure that things basically work, but I can add them if you'd prefer. > Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:183 > + port.stop_websocket_server() This, on the other hand, is just a typo, and should be stop_http_server(), instead, obviously. 420570 4 97058 tony 2011-06-14 10:52:48 -0700 Comment on attachment 97058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=97058&action=review >>> Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:181 >> >> How do we verify that this worked? > > "working" here is defined as not raising an exception. If the first start() worked, there's a server running. If the second start() gets called, it'll check that it can bind to port 8000, and raise an error if it can't (see lines 170, 171, above for that test). In this case, it thinks the previous server is now stale, and kills it. > > If I wanted to be more thorough, I could do any of the following things: verify that the first server was in fact killed, verify that a second process was running, or verify that we can connect to the port. None of those seemed strictly necessary given the other tests which ensure that things basically work, but I can add them if you'd prefer. Verifying that we can connect to the port seems sufficient and not a lot of work. 420679 5 97160 dpranke 2011-06-14 13:12:27 -0700 Created attachment 97160 add better verification that stale processes are being killed per review feedback from tony 420680 6 dpranke 2011-06-14 13:13:24 -0700 (In reply to comment #4) > (From update of attachment 97058 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=97058&action=review > > >>> Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py:181 > > >> > >> How do we verify that this worked? > > > > "working" here is defined as not raising an exception. If the first start() worked, there's a server running. If the second start() gets called, it'll check that it can bind to port 8000, and raise an error if it can't (see lines 170, 171, above for that test). In this case, it thinks the previous server is now stale, and kills it. > > > > If I wanted to be more thorough, I could do any of the following things: verify that the first server was in fact killed, verify that a second process was running, or verify that we can connect to the port. None of those seemed strictly necessary given the other tests which ensure that things basically work, but I can add them if you'd prefer. > > Verifying that we can connect to the port seems sufficient and not a lot of work. Done. I added a check to make sure first process was in fact being killed, and revamped the test slightly to use two ports instead of resetting the state on the existing port. 421718 7 dpranke 2011-06-15 19:47:59 -0700 Committed r88995: <http://trac.webkit.org/changeset/88995> 97058 2011-06-13 19:39:32 -0700 2011-06-14 13:12:24 -0700 Patch bug-62615-20110613193931.patch text/plain 11583 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODg2ODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YzY5ZDI3ZWIxY2ZiMGY5YTFkZDYxN2NhNjVjZWNjOWU3 YThjNGY4Li44MWQ5ZmI2MjliMTIwYzMyZjQxYzNlYjQ1Yjg1YTA0MTRiZTRmNzUzIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTEtMDYtMTMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogc2hvdWxk IGNsZWFuIHVwIHN0YWxlIHNlcnZlciBwcm9jZXNzZXMgZnJvbSBhIHByZXZpb3VzIHJ1bgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MTUKKworICAg ICAgICBUaGlzIGNoYW5nZSBmaXhlcyBjYXNlcyB3aGVyZSBOUldUIG1pZ2h0IHN0YXJ0IGEgc2Vy dmVyIGFuZCB0aGVuCisgICAgICAgIGV4aXQsIGxlYXZpbmcgdGhlIHNlcnZlciBzdGlsbCBydW5u aW5nLiBOb3cgTlJXVCBzaG91bGQgZGV0ZWN0CisgICAgICAgIHRoaXMgY2FzZSBhbmQgY2xlYW4g dXAgb24gdGhlIG5leHQgcnVuLCB3aXRob3V0IHNodXR0aW5nIGRvd24KKyAgICAgICAgYW55IHBy b2Nlc3NlcyBpdCBkaWRuJ3Qgc3RhcnQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxzbyBmaXhl cyBhIGJ1ZyBpbiBleGVjdXRpdmUua2lsbF9wcm9jZXNzIG9uIFVOSVgKKyAgICAgICAgd2hlcmUg em9tYmllcyB3ZXJlbid0IGJlaW5nIGhhbmRsZWQgcHJvcGVybHkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXJf YmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Bv cnRfdGVzdGNhc2UucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC93ZWJzb2NrZXRfc2VydmVyLnB5OgorCisyMDExLTA2LTEzICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCiAK ICAgICAgICAgbnJ3dDogZml4IGh0dHAsIHdlYnNvY2tldCBzZXJ2ZXIgc3RhcnR1cCwgc2h1dGRv d24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZl LnB5CmluZGV4IDVhMzczMjQwY2Y2ZTQyNDA5ZWM3NjY5MThkMzg5ZmI5MjkyNjhlOGIuLmZmNzBl NTQzYjU2ZjRiZTEzZmY2MzNmMjgyYTUzMDgyMDgzMDZiN2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAtMjI3LDYgKzIyNyw3 IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgICAgIHJldHJpZXNfbGVmdCAtPSAxCiAgICAgICAgICAgICAgICAgb3Mua2lsbChwaWQsIHNp Z25hbC5TSUdLSUxMKQorICAgICAgICAgICAgICAgIF8gPSBvcy53YWl0cGlkKHBpZCwgb3MuV05P SEFORykKICAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgogICAgICAgICAgICAgICAgIGlm IGUuZXJybm8gPT0gZXJybm8uRUFHQUlOOgogICAgICAgICAgICAgICAgICAgICBpZiByZXRyaWVz X2xlZnQgPD0gMDoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggNjI4YTJhYzc0MDJi OGRlNDM2ZTg4ZTljMmY4NzkyNWVkZTE3Nzg1NS4uYzMzYWNkZjE2OTE0MDRmODM4Mzk2NTk2OTM2 ZDViMmRkMzVmNDQ4OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTU3LDE1ICs1 NywxMCBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRw U2VydmVyQmFzZSk6CiAgICAgICAgIHNlbGYuX25hbWUgPSAnYXBhY2hlJwogICAgICAgICBwb3J0 X29iai5tYXliZV9tYWtlX2RpcmVjdG9yeShvdXRwdXRfZGlyKQogCi0gICAgICAgICMgVGhlIHVw c3RyZWFtIC5jb25mIGZpbGUgYXNzdW1lZCB0aGUgZXhpc3RlbmNlIG9mIC90bXAvV2ViS2l0IGZv cgotICAgICAgICAjIHBsYWNpbmcgYXBhY2hlIGZpbGVzIGxpa2UgdGhlIGxvY2sgZmlsZSB0aGVy ZS4KLSAgICAgICAgc2VsZi5fcnVudGltZV9wYXRoID0gb3MucGF0aC5qb2luKCIvdG1wIiwgIldl YktpdCIpCi0gICAgICAgIHBvcnRfb2JqLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYuX3J1bnRp bWVfcGF0aCkKLQogICAgICAgICAjIFRoZSBQSUQgcmV0dXJuZWQgd2hlbiBBcGFjaGUgaXMgc3Rh cnRlZCBnb2VzIGF3YXkgKGR1ZSB0byBkcm9wcGluZwogICAgICAgICAjIHByaXZpbGVnZXM/KS4g VGhlIHByb3BlciBjb250cm9sbGluZyBQSUQgaXMgd3JpdHRlbiB0byBhIGZpbGUgaW4gdGhlCiAg ICAgICAgICMgYXBhY2hlIHJ1bnRpbWUgZGlyZWN0b3J5LgotICAgICAgICBzZWxmLnBpZF9maWxl ID0gb3MucGF0aC5qb2luKHNlbGYuX3J1bnRpbWVfcGF0aCwgJ2h0dHBkLnBpZCcpCisgICAgICAg IHNlbGYuX3BpZF9maWxlID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3J1bnRpbWVfcGF0 aCwgJyVzLnBpZCcgJSBzZWxmLl9uYW1lKQogCiAgICAgICAgIHRlc3RfZGlyID0gc2VsZi5fcG9y dF9vYmoubGF5b3V0X3Rlc3RzX2RpcigpCiAgICAgICAgIGpzX3Rlc3RfcmVzb3VyY2VzX2RpciA9 IHNlbGYuX2N5Z3dpbl9zYWZlX2pvaW4odGVzdF9kaXIsICJmYXN0IiwgImpzIiwKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBiZjRi ZTBjNTljOTM2Zjg0MjI4NDMxYWYxMjQ5NGIyOWFhNmRjM2JkLi4yZDk3ZjQ5ZjFjMmM1ODI2ZjY5 ZmRlYmY3OGUzZGI4NTc1ZGFkMzc1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC02NDQsMTAgKzY0NCwxMyBAQCBjbGFzcyBQb3J0 KG9iamVjdCk6CiAgICAgICAgICIiIlN0YXJ0IGEgd2ViIHNlcnZlci4gUmFpc2UgYW4gZXJyb3Ig aWYgaXQgY2FuJ3Qgc3RhcnQgb3IgaXMgYWxyZWFkeSBydW5uaW5nLgogCiAgICAgICAgIFBvcnRz IGNhbiBzdHViIHRoaXMgb3V0IGlmIHRoZXkgZG9uJ3QgbmVlZCBhIHdlYiBzZXJ2ZXIgdG8gYmUg cnVubmluZy4iIiIKKyAgICAgICAgYXNzZXJ0IG5vdCBzZWxmLl9odHRwX3NlcnZlciwgJ0FscmVh ZHkgcnVubmluZyBhbiBodHRwIHNlcnZlci4nCisKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9u KCd1c2VfYXBhY2hlJyk6CiAgICAgICAgICAgICBzZXJ2ZXIgPSBhcGFjaGVfaHR0cF9zZXJ2ZXIu TGF5b3V0VGVzdEFwYWNoZUh0dHBkKHNlbGYsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkKICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIHNlcnZlciA9IGh0dHBfc2VydmVyLkxpZ2h0dHBkKHNl bGYsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkKKwogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQog ICAgICAgICBzZWxmLl9odHRwX3NlcnZlciA9IHNlcnZlcgogCkBAIC02NTUsNiArNjU4LDggQEAg Y2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAiIiJTdGFydCBhIHdlYiBzZXJ2ZXIuIFJhaXNl IGFuIGVycm9yIGlmIGl0IGNhbid0IHN0YXJ0IG9yIGlzIGFscmVhZHkgcnVubmluZy4KIAogICAg ICAgICBQb3J0cyBjYW4gc3R1YiB0aGlzIG91dCBpZiB0aGV5IGRvbid0IG5lZWQgYSB3ZWJzb2Nr ZXQgc2VydmVyIHRvIGJlIHJ1bm5pbmcuIiIiCisgICAgICAgIGFzc2VydCBub3Qgc2VsZi5fd2Vi c29ja2V0X3NlcnZlciwgJ0FscmVhZHkgcnVubmluZyBhIHdlYnNvY2tldCBzZXJ2ZXIuJworCiAg ICAgICAgIHNlcnZlciA9IHdlYnNvY2tldF9zZXJ2ZXIuUHlXZWJTb2NrZXQoc2VsZiwgc2VsZi5y ZXN1bHRzX2RpcmVjdG9yeSgpKQogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQogICAgICAgICBzZWxm Ll93ZWJzb2NrZXRfc2VydmVyID0gc2VydmVyCkBAIC02NzMsMTEgKzY3OCwxMyBAQCBjbGFzcyBQ b3J0KG9iamVjdCk6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgaHR0cCBzZXJ2ZXIgaWYgaXQg aXMgcnVubmluZy4gRG8gbm90aGluZyBpZiBpdCBpc24ndC4iIiIKICAgICAgICAgaWYgc2VsZi5f aHR0cF9zZXJ2ZXI6CiAgICAgICAgICAgICBzZWxmLl9odHRwX3NlcnZlci5zdG9wKCkKKyAgICAg ICAgICAgIHNlbGYuX2h0dHBfc2VydmVyID0gTm9uZQogCiAgICAgZGVmIHN0b3Bfd2Vic29ja2V0 X3NlcnZlcihzZWxmKToKICAgICAgICAgIiIiU2h1dCBkb3duIHRoZSB3ZWJzb2NrZXQgc2VydmVy IGlmIGl0IGlzIHJ1bm5pbmcuIERvIG5vdGhpbmcgaWYgaXQgaXNuJ3QuIiIiCiAgICAgICAgIGlm IHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXI6CiAgICAgICAgICAgICBzZWxmLl93ZWJzb2NrZXRfc2Vy dmVyLnN0b3AoKQorICAgICAgICAgICAgc2VsZi5fd2Vic29ja2V0X3NlcnZlciA9IE5vbmUKIAog ICAgIGRlZiByZWxlYXNlX2h0dHBfbG9jayhzZWxmKToKICAgICAgICAgaWYgc2VsZi5faHR0cF9s b2NrOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvaHR0cF9zZXJ2ZXIucHkKaW5kZXggOTU5YmY5MjQ0ZGY2M2U1ZTYwMzMwNDFmNDQ0MWIxNTEz OWFiOTdjOC4uOTMxMzlhMTEyZTEzMmE2MjRlYjQwZGI0OGU5ZjY3MTMxODRmMTJlYyAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBf c2VydmVyLnB5CkBAIC01NCw2ICs1NCw4IEBAIGNsYXNzIExpZ2h0dHBkKGh0dHBfc2VydmVyX2Jh c2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICBzZWxmLl9ydW5fYmFja2dyb3VuZCA9IHJ1bl9i YWNrZ3JvdW5kCiAgICAgICAgIHNlbGYuX2xheW91dF90ZXN0c19kaXIgPSBsYXlvdXRfdGVzdHNf ZGlyCiAKKyAgICAgICAgc2VsZi5fcGlkX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2Vs Zi5fcnVudGltZV9wYXRoLCAnJXMucGlkJyAlIHNlbGYuX25hbWUpCisKICAgICAgICAgaWYgc2Vs Zi5fcG9ydDoKICAgICAgICAgICAgIHNlbGYuX3BvcnQgPSBpbnQoc2VsZi5fcG9ydCkKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3Nl cnZlcl9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9o dHRwX3NlcnZlcl9iYXNlLnB5CmluZGV4IDY3OGNkNGYyOWQ1OWRkZTdmNzBmYzIzNmMxMjYxZDdh NDhiMWQyY2UuLjFlM2ZmZjEyNzYyMWYxMjhkMDM5MjUzNDE1OTIwOTc2MDUzN2JlZmYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2 ZXJfYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2h0dHBfc2VydmVyX2Jhc2UucHkKQEAgLTMyLDYgKzMyLDggQEAKIGltcG9ydCBlcnJubwogaW1w b3J0IGxvZ2dpbmcKIGltcG9ydCBzb2NrZXQKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQog aW1wb3J0IHRpbWUKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRf dGVzdHMucG9ydC5odHRwX3NlcnZlcl9iYXNlIikKQEAgLTUzLDExICs1NSwyMiBAQCBjbGFzcyBI dHRwU2VydmVyQmFzZShvYmplY3QpOgogICAgICAgICBzZWxmLl9wb3J0X29iaiA9IHBvcnRfb2Jq CiAgICAgICAgIHNlbGYuX3Byb2Nlc3MgPSBOb25lCiAKKyAgICAgICAgIyBXZSBuZWVkIGEgbm9u LWNoZWNrb3V0LWRlcGVuZGVudCBwbGFjZSB0byBwdXQgbG9jayBmaWxlcywgZXRjLiBXZQorICAg ICAgICAjIGRvbid0IHVzZSB0aGUgUHl0aG9uIGRlZmF1bHQgb24gdGhlIE1hYyBiZWNhdXNlIGl0 IGRlZmF1bHRzIHRvIGEKKyAgICAgICAgIyByYW5kb21seS1nZW5lcmF0ZWQgZGlyZWN0b3J5IHVu ZGVyIC92YXIvZm9sZGVycyBhbmQgbm8gb25lIHdvdWxkIGV2ZXIKKyAgICAgICAgIyBsb29rIHRo ZXJlLgorICAgICAgICB0bXBkaXIgPSB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkKKyAgICAgICAgaWYg c3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOgorICAgICAgICAgICAgdG1wZGlyID0gJy90bXAnCisK KyAgICAgICAgc2VsZi5fcnVudGltZV9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHRtcGRp ciwgIldlYktpdCIpCisgICAgICAgIHBvcnRfb2JqLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYu X3J1bnRpbWVfcGF0aCkKKwogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgIiIiU3RhcnRz IHRoZSBzZXJ2ZXIuIiIiCi0gICAgICAgIGlmIHNlbGYuX3Byb2Nlc3M6Ci0gICAgICAgICAgICBy YWlzZSBTZXJ2ZXJFcnJvcignJXMgYWxyZWFkeSBydW5uaW5nJyAlIHNlbGYuX25hbWUpCisgICAg ICAgIGFzc2VydCBub3Qgc2VsZi5fcHJvY2VzcywgJyVzIHNlcnZlciBpcyBhbHJlYWR5IHJ1bm5p bmcuJwogCisgICAgICAgIHNlbGYuX3JlbW92ZV9zdGFsZV9wcm9jZXNzZXMoKQogICAgICAgICBz ZWxmLl9yZW1vdmVfc3RhbGVfbG9ncygpCiAgICAgICAgIHNlbGYuX3ByZXBhcmVfY29uZmlnKCkK ICAgICAgICAgc2VsZi5fY2hlY2tfdGhhdF9hbGxfcG9ydHNfYXJlX2F2YWlsYWJsZSgpCkBAIC05 OSw2ICsxMTIsMTkgQEAgY2xhc3MgSHR0cFNlcnZlckJhc2Uob2JqZWN0KToKICAgICAgICAgb2Yg aW5pdGlhbGl6YXRpb24gcmVxdWlyZWQgcHJpb3IgdG8gc3RhcnRpbmcgdGhlIHNlcnZlciB0aGF0 IG1heSBmYWlsLiIiIgogICAgICAgICBwYXNzCiAKKyAgICBkZWYgX3JlbW92ZV9zdGFsZV9wcm9j ZXNzZXMoc2VsZik6CisgICAgICAgICIiIlJlbW92ZSBhbnkgaW5zdGFuY2VzIG9mIHRoZSBzZXJ2 ZXIgbGVmdCBvdmVyIGZyb20gYSBwcmV2aW91cyBydW4uCisgICAgICAgIFRoZXJlIHNob3VsZCBi ZSBhdCBtb3N0IG9uZSBvZiB0aGVzZSBiZWNhdXNlIG9mIHRoZSBnbG9iYWwgaHR0cCBsb2NrLiIi IgorICAgICAgICBkZWYga2lsbF9hbmRfY2hlY2sobmFtZSwgcGlkKToKKyAgICAgICAgICAgIF9s b2cud2FybmluZygnUHJldmlvdXNseSBzdGFydGVkICVzIGlzIHN0aWxsIHJ1bm5pbmcgYXMgcGlk ICVkLCB0cnlpbmcgdG8ga2lsbCBpdC4nICUgKG5hbWUsIHBpZCkpCisgICAgICAgICAgICBzZWxm Ll9leGVjdXRpdmUua2lsbF9wcm9jZXNzKHBpZCkKKyAgICAgICAgICAgIHJldHVybiBub3Qgc2Vs Zi5fZXhlY3V0aXZlLmNoZWNrX3J1bm5pbmdfcGlkKHBpZCkKKworICAgICAgICBpZiBzZWxmLl9w aWRfZmlsZSBhbmQgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fcGlkX2ZpbGUpOgorICAg ICAgICAgICAgcGlkID0gaW50KHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoc2VsZi5f cGlkX2ZpbGUpKQorICAgICAgICAgICAgaWYgbm90IHNlbGYuX2V4ZWN1dGl2ZS5jaGVja19ydW5u aW5nX3BpZChwaWQpIG9yIHNlbGYuX3dhaXRfZm9yX2FjdGlvbihsYW1iZGE6IGtpbGxfYW5kX2No ZWNrKHNlbGYuX25hbWUsIHBpZCkpOgorICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0u cmVtb3ZlKHNlbGYuX3BpZF9maWxlKQorCiAgICAgZGVmIF9yZW1vdmVfc3RhbGVfbG9ncyhzZWxm KToKICAgICAgICAgIiIiVGhpcyByb3V0aW5lIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBieSBzdWJj bGFzc2VzIHRvIHRyeSBhbmQgcmVtb3ZlIGxvZ3MKICAgICAgICAgbGVmdCBvdmVyIGZyb20gYSBw cmlvciBydW4uIFRoaXMgcm91dGluZSBzaG91bGQgbG9nIHdhcm5pbmdzIGlmIHRoZQpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3Rj YXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rl c3RjYXNlLnB5CmluZGV4IDMzMjQwY2Q3N2U3MTlhMDZmNGVhZGRlYzEzMjgzOWRlMTVkYjg4MDMu LjAzYzgwZDM5YmE1YTQwZmUxNzkwNzI4MDg2NWY5ODM2YzVkNGI3MmMgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNh c2UucHkKQEAgLTE2OCwxNCArMTY4LDIwIEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RhcnQoKSB0d2ljZSBmYWls cy4KICAgICAgICAgdHJ5OgogICAgICAgICAgICAgcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0g ICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgcG9ydC5zdGFydF9odHRwX3NlcnZlcigp Ci0gICAgICAgICAgICAgICAgc2VsZi5mYWlsKCdjYWxsaW5nIHBvcnQuc3RhcnRfaHR0cF9zZXJ2 ZXIoKSB0d2ljZSB3b3JrZWQnKQotICAgICAgICAgICAgZXhjZXB0IGh0dHBfc2VydmVyX2Jhc2Uu U2VydmVyRXJyb3IsIGU6Ci0gICAgICAgICAgICAgICAgcGFzcworICAgICAgICAgICAgc2VsZi5h c3NlcnRSYWlzZXMoQXNzZXJ0aW9uRXJyb3IsIHBvcnQuc3RhcnRfaHR0cF9zZXJ2ZXIpCiAgICAg ICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBwb3J0LnN0b3BfaHR0cF9zZXJ2ZXIoKQogCisgICAg ICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RhcnQoKSBvbmNlLCB0aGVuIHJlc2V0dGluZyB0aGUg cG9ydCBzdGF0ZSwgdGhlbgorICAgICAgICAjIGNhbGxpbmcgc3RhcnQoKSBhZ2FpbiBzbyB0aGF0 IHRoZXJlIGlzIGEgZGFuZ2xpbmcgcHJvY2VzcyB0aGF0IGlzCisgICAgICAgICMgY2xlYW5lZCB1 cCB3b3Jrcy4KKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcG9ydC5zdGFydF9odHRwX3NlcnZl cigpCisgICAgICAgICAgICBwb3J0Ll9odHRwX3NlcnZlciA9IE5vbmUKKyAgICAgICAgICAgIHBv cnQuc3RhcnRfaHR0cF9zZXJ2ZXIoKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgcG9y dC5zdG9wX3dlYnNvY2tldF9zZXJ2ZXIoKQorCiAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcg c3RvcCgpIHR3aWNlIGlzIGhhcm1sZXNzLgogICAgICAgICBwb3J0LnN0b3BfaHR0cF9zZXJ2ZXIo KQogCkBAIC0yNzIsMTEgKzI3OCwxNyBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICAjIFRlc3QgdGhhdCBjYWxsaW5nIHN0YXJ0KCkgdHdpY2UgZmFpbHMu CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHBvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZlcigp Ci0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgcG9ydC5zdGFydF93ZWJzb2NrZXRf c2VydmVyKCkKLSAgICAgICAgICAgICAgICBzZWxmLmZhaWwoJ2NhbGxpbmcgcG9ydC5zdGFydF93 ZWJzb2NrZXRfc2VydmVyKCkgdHdpY2Ugd29ya2VkJykKLSAgICAgICAgICAgIGV4Y2VwdCBodHRw X3NlcnZlcl9iYXNlLlNlcnZlckVycm9yLCBlOgotICAgICAgICAgICAgICAgIHBhc3MKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBwb3J0LnN0YXJ0X3dlYnNv Y2tldF9zZXJ2ZXIpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBwb3J0LnN0b3Bfd2Vi c29ja2V0X3NlcnZlcigpCisKKyAgICAgICAgIyBUZXN0IHRoYXQgY2FsbGluZyBzdGFydCgpIG9u Y2UsIHRoZW4gcmVzZXR0aW5nIHRoZSBwb3J0IHN0YXRlLCB0aGVuCisgICAgICAgICMgY2FsbGlu ZyBzdGFydCgpIGFnYWluIHNvIHRoYXQgdGhlcmUgaXMgYSBkYW5nbGluZyBwcm9jZXNzIHRoYXQg aXMKKyAgICAgICAgIyBjbGVhbmVkIHVwIHdvcmtzLgorICAgICAgICB0cnk6CisgICAgICAgICAg ICBwb3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQorICAgICAgICAgICAgcG9ydC5fd2Vic29j a2V0X3NlcnZlciA9IE5vbmUKKyAgICAgICAgICAgIHBvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZl cigpCiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBwb3J0LnN0b3Bfd2Vic29ja2V0X3Nl cnZlcigpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2Vic29ja2V0X3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2Vic29ja2V0X3NlcnZlci5weQppbmRleCBlNTgwMmM3ZDNmN2NiZGU2OTll MjE4NDA5NjE0MWY2MTU3Y2I3YWU5Li42OTdiNWM5ZWEwNzEzYTlhMjZkMDkyZjcxZWY0YzAzMWY4 NjU5NzBiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dlYnNvY2tldF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC93ZWJzb2NrZXRfc2VydmVyLnB5CkBAIC03Niw2ICs3Niw5IEBAIGNsYXNz IFB5V2ViU29ja2V0KGh0dHBfc2VydmVyLkxpZ2h0dHBkKToKICAgICAgICAgc2VsZi5fd3NvdXQg PSBOb25lCiAgICAgICAgIHNlbGYuX21hcHBpbmdzID0gW3sncG9ydCc6IHNlbGYuX3BvcnR9XQog CisgICAgICAgIGlmIG5vdCBzZWxmLl9waWRfZmlsZToKKyAgICAgICAgICAgIHNlbGYuX3BpZF9m aWxlID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3J1bnRpbWVfcGF0aCwgJyVzLnBpZCcg JSBzZWxmLl9uYW1lKQorCiAgICAgICAgICMgV2Via2l0IHRlc3RzCiAgICAgICAgIGlmIHNlbGYu X3Jvb3Q6CiAgICAgICAgICAgICBzZWxmLl9sYXlvdXRfdGVzdHMgPSBvcy5wYXRoLmFic3BhdGgo c2VsZi5fcm9vdCkK 97160 2011-06-14 13:12:27 -0700 2011-06-14 13:20:08 -0700 add better verification that stale processes are being killed per review feedback from tony bug-62615-20110614131226.patch text/plain 13638 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogODg2ODUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2YzY5ZDI3ZWIxY2ZiMGY5YTFkZDYxN2NhNjVjZWNjOWU3 YThjNGY4Li44MWQ5ZmI2MjliMTIwYzMyZjQxYzNlYjQ1Yjg1YTA0MTRiZTRmNzUzIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjgg QEAKIDIwMTEtMDYtMTMgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dDogc2hvdWxk IGNsZWFuIHVwIHN0YWxlIHNlcnZlciBwcm9jZXNzZXMgZnJvbSBhIHByZXZpb3VzIHJ1bgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MTUKKworICAg ICAgICBUaGlzIGNoYW5nZSBmaXhlcyBjYXNlcyB3aGVyZSBOUldUIG1pZ2h0IHN0YXJ0IGEgc2Vy dmVyIGFuZCB0aGVuCisgICAgICAgIGV4aXQsIGxlYXZpbmcgdGhlIHNlcnZlciBzdGlsbCBydW5u aW5nLiBOb3cgTlJXVCBzaG91bGQgZGV0ZWN0CisgICAgICAgIHRoaXMgY2FzZSBhbmQgY2xlYW4g dXAgb24gdGhlIG5leHQgcnVuLCB3aXRob3V0IHNodXR0aW5nIGRvd24KKyAgICAgICAgYW55IHBy b2Nlc3NlcyBpdCBkaWRuJ3Qgc3RhcnQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWxzbyBmaXhl cyBhIGJ1ZyBpbiBleGVjdXRpdmUua2lsbF9wcm9jZXNzIG9uIFVOSVgKKyAgICAgICAgd2hlcmUg em9tYmllcyB3ZXJlbid0IGJlaW5nIGhhbmRsZWQgcHJvcGVybHkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBfc2VydmVyLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2ZXJf YmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Bv cnRfdGVzdGNhc2UucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC93ZWJzb2NrZXRfc2VydmVyLnB5OgorCisyMDExLTA2LTEzICBEaXJrIFByYW5rZSAgPGRw cmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCiAK ICAgICAgICAgbnJ3dDogZml4IGh0dHAsIHdlYnNvY2tldCBzZXJ2ZXIgc3RhcnR1cCwgc2h1dGRv d24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVj dXRpdmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZl LnB5CmluZGV4IDVhMzczMjQwY2Y2ZTQyNDA5ZWM3NjY5MThkMzg5ZmI5MjkyNjhlOGIuLmZmNzBl NTQzYjU2ZjRiZTEzZmY2MzNmMjgyYTUzMDgyMDgzMDZiN2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAtMjI3LDYgKzIyNyw3 IEBAIGNsYXNzIEV4ZWN1dGl2ZShvYmplY3QpOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgICAgIHJldHJpZXNfbGVmdCAtPSAxCiAgICAgICAgICAgICAgICAgb3Mua2lsbChwaWQsIHNp Z25hbC5TSUdLSUxMKQorICAgICAgICAgICAgICAgIF8gPSBvcy53YWl0cGlkKHBpZCwgb3MuV05P SEFORykKICAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgogICAgICAgICAgICAgICAgIGlm IGUuZXJybm8gPT0gZXJybm8uRUFHQUlOOgogICAgICAgICAgICAgICAgICAgICBpZiByZXRyaWVz X2xlZnQgPD0gMDoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYXBhY2hlX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKaW5kZXggNjI4YTJhYzc0MDJi OGRlNDM2ZTg4ZTljMmY4NzkyNWVkZTE3Nzg1NS4uYzMzYWNkZjE2OTE0MDRmODM4Mzk2NTk2OTM2 ZDViMmRkMzVmNDQ4OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTU3LDE1ICs1 NywxMCBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQoaHR0cF9zZXJ2ZXJfYmFzZS5IdHRw U2VydmVyQmFzZSk6CiAgICAgICAgIHNlbGYuX25hbWUgPSAnYXBhY2hlJwogICAgICAgICBwb3J0 X29iai5tYXliZV9tYWtlX2RpcmVjdG9yeShvdXRwdXRfZGlyKQogCi0gICAgICAgICMgVGhlIHVw c3RyZWFtIC5jb25mIGZpbGUgYXNzdW1lZCB0aGUgZXhpc3RlbmNlIG9mIC90bXAvV2ViS2l0IGZv cgotICAgICAgICAjIHBsYWNpbmcgYXBhY2hlIGZpbGVzIGxpa2UgdGhlIGxvY2sgZmlsZSB0aGVy ZS4KLSAgICAgICAgc2VsZi5fcnVudGltZV9wYXRoID0gb3MucGF0aC5qb2luKCIvdG1wIiwgIldl YktpdCIpCi0gICAgICAgIHBvcnRfb2JqLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYuX3J1bnRp bWVfcGF0aCkKLQogICAgICAgICAjIFRoZSBQSUQgcmV0dXJuZWQgd2hlbiBBcGFjaGUgaXMgc3Rh cnRlZCBnb2VzIGF3YXkgKGR1ZSB0byBkcm9wcGluZwogICAgICAgICAjIHByaXZpbGVnZXM/KS4g VGhlIHByb3BlciBjb250cm9sbGluZyBQSUQgaXMgd3JpdHRlbiB0byBhIGZpbGUgaW4gdGhlCiAg ICAgICAgICMgYXBhY2hlIHJ1bnRpbWUgZGlyZWN0b3J5LgotICAgICAgICBzZWxmLnBpZF9maWxl ID0gb3MucGF0aC5qb2luKHNlbGYuX3J1bnRpbWVfcGF0aCwgJ2h0dHBkLnBpZCcpCisgICAgICAg IHNlbGYuX3BpZF9maWxlID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3J1bnRpbWVfcGF0 aCwgJyVzLnBpZCcgJSBzZWxmLl9uYW1lKQogCiAgICAgICAgIHRlc3RfZGlyID0gc2VsZi5fcG9y dF9vYmoubGF5b3V0X3Rlc3RzX2RpcigpCiAgICAgICAgIGpzX3Rlc3RfcmVzb3VyY2VzX2RpciA9 IHNlbGYuX2N5Z3dpbl9zYWZlX2pvaW4odGVzdF9kaXIsICJmYXN0IiwgImpzIiwKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBiZjRi ZTBjNTljOTM2Zjg0MjI4NDMxYWYxMjQ5NGIyOWFhNmRjM2JkLi4yZDk3ZjQ5ZjFjMmM1ODI2ZjY5 ZmRlYmY3OGUzZGI4NTc1ZGFkMzc1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBAIC02NDQsMTAgKzY0NCwxMyBAQCBjbGFzcyBQb3J0 KG9iamVjdCk6CiAgICAgICAgICIiIlN0YXJ0IGEgd2ViIHNlcnZlci4gUmFpc2UgYW4gZXJyb3Ig aWYgaXQgY2FuJ3Qgc3RhcnQgb3IgaXMgYWxyZWFkeSBydW5uaW5nLgogCiAgICAgICAgIFBvcnRz IGNhbiBzdHViIHRoaXMgb3V0IGlmIHRoZXkgZG9uJ3QgbmVlZCBhIHdlYiBzZXJ2ZXIgdG8gYmUg cnVubmluZy4iIiIKKyAgICAgICAgYXNzZXJ0IG5vdCBzZWxmLl9odHRwX3NlcnZlciwgJ0FscmVh ZHkgcnVubmluZyBhbiBodHRwIHNlcnZlci4nCisKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9u KCd1c2VfYXBhY2hlJyk6CiAgICAgICAgICAgICBzZXJ2ZXIgPSBhcGFjaGVfaHR0cF9zZXJ2ZXIu TGF5b3V0VGVzdEFwYWNoZUh0dHBkKHNlbGYsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkKICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIHNlcnZlciA9IGh0dHBfc2VydmVyLkxpZ2h0dHBkKHNl bGYsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkKKwogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQog ICAgICAgICBzZWxmLl9odHRwX3NlcnZlciA9IHNlcnZlcgogCkBAIC02NTUsNiArNjU4LDggQEAg Y2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICAiIiJTdGFydCBhIHdlYiBzZXJ2ZXIuIFJhaXNl IGFuIGVycm9yIGlmIGl0IGNhbid0IHN0YXJ0IG9yIGlzIGFscmVhZHkgcnVubmluZy4KIAogICAg ICAgICBQb3J0cyBjYW4gc3R1YiB0aGlzIG91dCBpZiB0aGV5IGRvbid0IG5lZWQgYSB3ZWJzb2Nr ZXQgc2VydmVyIHRvIGJlIHJ1bm5pbmcuIiIiCisgICAgICAgIGFzc2VydCBub3Qgc2VsZi5fd2Vi c29ja2V0X3NlcnZlciwgJ0FscmVhZHkgcnVubmluZyBhIHdlYnNvY2tldCBzZXJ2ZXIuJworCiAg ICAgICAgIHNlcnZlciA9IHdlYnNvY2tldF9zZXJ2ZXIuUHlXZWJTb2NrZXQoc2VsZiwgc2VsZi5y ZXN1bHRzX2RpcmVjdG9yeSgpKQogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQogICAgICAgICBzZWxm Ll93ZWJzb2NrZXRfc2VydmVyID0gc2VydmVyCkBAIC02NzMsMTEgKzY3OCwxMyBAQCBjbGFzcyBQ b3J0KG9iamVjdCk6CiAgICAgICAgICIiIlNodXQgZG93biB0aGUgaHR0cCBzZXJ2ZXIgaWYgaXQg aXMgcnVubmluZy4gRG8gbm90aGluZyBpZiBpdCBpc24ndC4iIiIKICAgICAgICAgaWYgc2VsZi5f aHR0cF9zZXJ2ZXI6CiAgICAgICAgICAgICBzZWxmLl9odHRwX3NlcnZlci5zdG9wKCkKKyAgICAg ICAgICAgIHNlbGYuX2h0dHBfc2VydmVyID0gTm9uZQogCiAgICAgZGVmIHN0b3Bfd2Vic29ja2V0 X3NlcnZlcihzZWxmKToKICAgICAgICAgIiIiU2h1dCBkb3duIHRoZSB3ZWJzb2NrZXQgc2VydmVy IGlmIGl0IGlzIHJ1bm5pbmcuIERvIG5vdGhpbmcgaWYgaXQgaXNuJ3QuIiIiCiAgICAgICAgIGlm IHNlbGYuX3dlYnNvY2tldF9zZXJ2ZXI6CiAgICAgICAgICAgICBzZWxmLl93ZWJzb2NrZXRfc2Vy dmVyLnN0b3AoKQorICAgICAgICAgICAgc2VsZi5fd2Vic29ja2V0X3NlcnZlciA9IE5vbmUKIAog ICAgIGRlZiByZWxlYXNlX2h0dHBfbG9jayhzZWxmKToKICAgICAgICAgaWYgc2VsZi5faHR0cF9s b2NrOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvaHR0cF9zZXJ2ZXIucHkKaW5kZXggOTU5YmY5MjQ0ZGY2M2U1ZTYwMzMwNDFmNDQ0MWIxNTEz OWFiOTdjOC4uOTMxMzlhMTEyZTEzMmE2MjRlYjQwZGI0OGU5ZjY3MTMxODRmMTJlYyAxMDA3NTUK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3NlcnZl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2h0dHBf c2VydmVyLnB5CkBAIC01NCw2ICs1NCw4IEBAIGNsYXNzIExpZ2h0dHBkKGh0dHBfc2VydmVyX2Jh c2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICBzZWxmLl9ydW5fYmFja2dyb3VuZCA9IHJ1bl9i YWNrZ3JvdW5kCiAgICAgICAgIHNlbGYuX2xheW91dF90ZXN0c19kaXIgPSBsYXlvdXRfdGVzdHNf ZGlyCiAKKyAgICAgICAgc2VsZi5fcGlkX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2Vs Zi5fcnVudGltZV9wYXRoLCAnJXMucGlkJyAlIHNlbGYuX25hbWUpCisKICAgICAgICAgaWYgc2Vs Zi5fcG9ydDoKICAgICAgICAgICAgIHNlbGYuX3BvcnQgPSBpbnQoc2VsZi5fcG9ydCkKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9odHRwX3Nl cnZlcl9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9o dHRwX3NlcnZlcl9iYXNlLnB5CmluZGV4IDY3OGNkNGYyOWQ1OWRkZTdmNzBmYzIzNmMxMjYxZDdh NDhiMWQyY2UuLjM2ZGY2MGQwMmEzNjE5ZDc3NmE5MTJiNjliYzJkNDdiYTVmZDQ1MzYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvaHR0cF9zZXJ2 ZXJfYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2h0dHBfc2VydmVyX2Jhc2UucHkKQEAgLTMyLDYgKzMyLDggQEAKIGltcG9ydCBlcnJubwogaW1w b3J0IGxvZ2dpbmcKIGltcG9ydCBzb2NrZXQKK2ltcG9ydCBzeXMKK2ltcG9ydCB0ZW1wZmlsZQog aW1wb3J0IHRpbWUKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRf dGVzdHMucG9ydC5odHRwX3NlcnZlcl9iYXNlIikKQEAgLTUzLDExICs1NSwyMiBAQCBjbGFzcyBI dHRwU2VydmVyQmFzZShvYmplY3QpOgogICAgICAgICBzZWxmLl9wb3J0X29iaiA9IHBvcnRfb2Jq CiAgICAgICAgIHNlbGYuX3Byb2Nlc3MgPSBOb25lCiAKKyAgICAgICAgIyBXZSBuZWVkIGEgbm9u LWNoZWNrb3V0LWRlcGVuZGVudCBwbGFjZSB0byBwdXQgbG9jayBmaWxlcywgZXRjLiBXZQorICAg ICAgICAjIGRvbid0IHVzZSB0aGUgUHl0aG9uIGRlZmF1bHQgb24gdGhlIE1hYyBiZWNhdXNlIGl0 IGRlZmF1bHRzIHRvIGEKKyAgICAgICAgIyByYW5kb21seS1nZW5lcmF0ZWQgZGlyZWN0b3J5IHVu ZGVyIC92YXIvZm9sZGVycyBhbmQgbm8gb25lIHdvdWxkIGV2ZXIKKyAgICAgICAgIyBsb29rIHRo ZXJlLgorICAgICAgICB0bXBkaXIgPSB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkKKyAgICAgICAgaWYg c3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOgorICAgICAgICAgICAgdG1wZGlyID0gJy90bXAnCisK KyAgICAgICAgc2VsZi5fcnVudGltZV9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHRtcGRp ciwgIldlYktpdCIpCisgICAgICAgIHBvcnRfb2JqLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYu X3J1bnRpbWVfcGF0aCkKKwogICAgIGRlZiBzdGFydChzZWxmKToKICAgICAgICAgIiIiU3RhcnRz IHRoZSBzZXJ2ZXIuIiIiCi0gICAgICAgIGlmIHNlbGYuX3Byb2Nlc3M6Ci0gICAgICAgICAgICBy YWlzZSBTZXJ2ZXJFcnJvcignJXMgYWxyZWFkeSBydW5uaW5nJyAlIHNlbGYuX25hbWUpCisgICAg ICAgIGFzc2VydCBub3Qgc2VsZi5fcHJvY2VzcywgJyVzIHNlcnZlciBpcyBhbHJlYWR5IHJ1bm5p bmcuJwogCisgICAgICAgIHNlbGYuX3JlbW92ZV9zdGFsZV9wcm9jZXNzZXMoKQogICAgICAgICBz ZWxmLl9yZW1vdmVfc3RhbGVfbG9ncygpCiAgICAgICAgIHNlbGYuX3ByZXBhcmVfY29uZmlnKCkK ICAgICAgICAgc2VsZi5fY2hlY2tfdGhhdF9hbGxfcG9ydHNfYXJlX2F2YWlsYWJsZSgpCkBAIC03 OSwxNSArOTIsMTggQEAgY2xhc3MgSHR0cFNlcnZlckJhc2Uob2JqZWN0KToKICAgICAgICAgICAg IHBpZCA9IHNlbGYuX3Byb2Nlc3MucGlkCiAgICAgICAgIGVsaWYgc2VsZi5fcGlkX2ZpbGUgYW5k IHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX3BpZF9maWxlKToKICAgICAgICAgICAgIHBp ZCA9IGludChzZWxmLl9maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHNlbGYuX3BpZF9maWxlKSkK LQotICAgICAgICBpZiBub3QgcGlkOgorICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmV0dXJu CiAKICAgICAgICAgc2VsZi5fcG9ydF9vYmouX2V4ZWN1dGl2ZS5raWxsX3Byb2Nlc3MocGlkKQog ICAgICAgICBpZiBzZWxmLl9wcm9jZXNzOgogICAgICAgICAgICAgIyB3YWl0KCkgaXMgbm90IHRo cmVhZHNhZmUgYW5kIGNhbiB0aHJvdyBPU0Vycm9yIGR1ZSB0bzoKICAgICAgICAgICAgICMgaHR0 cDovL2J1Z3MucHl0aG9uLm9yZy9pc3N1ZTE3MzE3MTcKLSAgICAgICAgICAgIHNlbGYuX3Byb2Nl c3Mud2FpdCgpCisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgc2VsZi5fcHJvY2Vz cy53YWl0KCkKKyAgICAgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgICAgICAgICAg IGlmIGUuZXJybm8gIT0gZXJybm8uRUNISUxEOgorICAgICAgICAgICAgICAgICAgICByYWlzZQog ICAgICAgICAgICAgc2VsZi5fcHJvY2VzcyA9IE5vbmUKICAgICAgICAgaWYgc2VsZi5fcGlkX2Zp bGUgYW5kIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX3BpZF9maWxlKToKICAgICAgICAg ICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucmVtb3ZlKHNlbGYuX3BpZF9maWxlKQpAQCAtOTksNiArMTE1 LDE5IEBAIGNsYXNzIEh0dHBTZXJ2ZXJCYXNlKG9iamVjdCk6CiAgICAgICAgIG9mIGluaXRpYWxp emF0aW9uIHJlcXVpcmVkIHByaW9yIHRvIHN0YXJ0aW5nIHRoZSBzZXJ2ZXIgdGhhdCBtYXkgZmFp bC4iIiIKICAgICAgICAgcGFzcwogCisgICAgZGVmIF9yZW1vdmVfc3RhbGVfcHJvY2Vzc2VzKHNl bGYpOgorICAgICAgICAiIiJSZW1vdmUgYW55IGluc3RhbmNlcyBvZiB0aGUgc2VydmVyIGxlZnQg b3ZlciBmcm9tIGEgcHJldmlvdXMgcnVuLgorICAgICAgICBUaGVyZSBzaG91bGQgYmUgYXQgbW9z dCBvbmUgb2YgdGhlc2UgYmVjYXVzZSBvZiB0aGUgZ2xvYmFsIGh0dHAgbG9jay4iIiIKKyAgICAg ICAgZGVmIGtpbGxfYW5kX2NoZWNrKG5hbWUsIHBpZCk6CisgICAgICAgICAgICBfbG9nLndhcm5p bmcoJ1ByZXZpb3VzbHkgc3RhcnRlZCAlcyBpcyBzdGlsbCBydW5uaW5nIGFzIHBpZCAlZCwgdHJ5 aW5nIHRvIGtpbGwgaXQuJyAlIChuYW1lLCBwaWQpKQorICAgICAgICAgICAgc2VsZi5fZXhlY3V0 aXZlLmtpbGxfcHJvY2VzcyhwaWQpCisgICAgICAgICAgICByZXR1cm4gbm90IHNlbGYuX2V4ZWN1 dGl2ZS5jaGVja19ydW5uaW5nX3BpZChwaWQpCisKKyAgICAgICAgaWYgc2VsZi5fcGlkX2ZpbGUg YW5kIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX3BpZF9maWxlKToKKyAgICAgICAgICAg IHBpZCA9IGludChzZWxmLl9maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHNlbGYuX3BpZF9maWxl KSkKKyAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9leGVjdXRpdmUuY2hlY2tfcnVubmluZ19waWQo cGlkKSBvciBzZWxmLl93YWl0X2Zvcl9hY3Rpb24obGFtYmRhOiBraWxsX2FuZF9jaGVjayhzZWxm Ll9uYW1lLCBwaWQpKToKKyAgICAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLnJlbW92ZShz ZWxmLl9waWRfZmlsZSkKKwogICAgIGRlZiBfcmVtb3ZlX3N0YWxlX2xvZ3Moc2VsZik6CiAgICAg ICAgICIiIlRoaXMgcm91dGluZSBzaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyB0 byB0cnkgYW5kIHJlbW92ZSBsb2dzCiAgICAgICAgIGxlZnQgb3ZlciBmcm9tIGEgcHJpb3IgcnVu LiBUaGlzIHJvdXRpbmUgc2hvdWxkIGxvZyB3YXJuaW5ncyBpZiB0aGUKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvcG9ydF90ZXN0Y2FzZS5w eQppbmRleCAzMzI0MGNkNzdlNzE5YTA2ZjRlYWRkZWMxMzI4MzlkZTE1ZGI4ODAzLi5mZDdiMWUy MmJmNTEyZjk0NzQyMWI0ZTM0M2FkZjUzNDJjMmY4NzIyIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3BvcnRfdGVzdGNhc2UucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CkBA IC0xNjgsMTYgKzE2OCwzMSBAQCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAjIFRlc3QgdGhhdCBjYWxsaW5nIHN0YXJ0KCkgdHdpY2UgZmFpbHMuCiAgICAg ICAgIHRyeToKICAgICAgICAgICAgIHBvcnQuc3RhcnRfaHR0cF9zZXJ2ZXIoKQotICAgICAgICAg ICAgdHJ5OgotICAgICAgICAgICAgICAgIHBvcnQuc3RhcnRfaHR0cF9zZXJ2ZXIoKQotICAgICAg ICAgICAgICAgIHNlbGYuZmFpbCgnY2FsbGluZyBwb3J0LnN0YXJ0X2h0dHBfc2VydmVyKCkgdHdp Y2Ugd29ya2VkJykKLSAgICAgICAgICAgIGV4Y2VwdCBodHRwX3NlcnZlcl9iYXNlLlNlcnZlckVy cm9yLCBlOgotICAgICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0UmFp c2VzKEFzc2VydGlvbkVycm9yLCBwb3J0LnN0YXJ0X2h0dHBfc2VydmVyKQogICAgICAgICBmaW5h bGx5OgogICAgICAgICAgICAgcG9ydC5zdG9wX2h0dHBfc2VydmVyKCkKIAotICAgICAgICAjIFRl c3QgdGhhdCBjYWxsaW5nIHN0b3AoKSB0d2ljZSBpcyBoYXJtbGVzcy4KLSAgICAgICAgcG9ydC5z dG9wX2h0dHBfc2VydmVyKCkKKyAgICAgICAgIyBUZXN0IHRoYXQgY2FsbGluZyBzdGFydCgpIG9u IHR3byBkaWZmZXJlbnQgcG9ydHMgY2F1c2VzIHRoZQorICAgICAgICAjIGZpcnN0IHBvcnQgdG8g YmUgdHJlYXRlZCBhcyBzdGFsZSBhbmQga2lsbGVkLgorICAgICAgICBwb3J0LnN0YXJ0X2h0dHBf c2VydmVyKCkKKyAgICAgICAgbmV3X3BvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHRy eToKKyAgICAgICAgICAgIG5ld19wb3J0LnN0YXJ0X2h0dHBfc2VydmVyKCkKKworICAgICAgICAg ICAgIyBDaGVjayB0aGF0IHRoZSBmaXJzdCBzZXJ2ZXIgd2FzIGtpbGxlZC4KKyAgICAgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2UocG9ydC5fZXhlY3V0aXZlLmNoZWNrX3J1bm5pbmdfcGlkKHBvcnQu X2h0dHBfc2VydmVyLl9wcm9jZXNzLnBpZCkpCisKKyAgICAgICAgICAgICMgQ2hlY2sgdGhhdCB0 aGVyZSBpcyBzb21ldGhpbmcgcnVubmluZy4KKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0X3NlcnZl cnNfYXJlX3VwKCdsb2NhbGhvc3QnLCBzZWxmLkhUVFBfUE9SVFMpCisKKyAgICAgICAgICAgICMg VGVzdCB0aGF0IGNhbGxpbmcgc3RvcCgpIG9uIGEga2lsbGVkIHNlcnZlciBpcyBoYXJtbGVzcy4K KyAgICAgICAgICAgIHBvcnQuc3RvcF9odHRwX3NlcnZlcigpCisgICAgICAgIGZpbmFsbHk6Cisg ICAgICAgICAgICBwb3J0LnN0b3BfaHR0cF9zZXJ2ZXIoKQorICAgICAgICAgICAgbmV3X3BvcnQu c3RvcF9odHRwX3NlcnZlcigpCisKKyAgICAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3Rv cCgpIHR3aWNlIGlzIGhhcm1sZXNzLgorICAgICAgICAgICAgbmV3X3BvcnQuc3RvcF9odHRwX3Nl cnZlcigpCiAKICAgICBkZWYgaW50ZWdyYXRpb25fdGVzdF9pbWFnZV9kaWZmKHNlbGYpOgogICAg ICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQpAQCAtMjcyLDE2ICsyODcsMzEgQEAgY2xhc3Mg UG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBUZXN0IHRoYXQgY2Fs bGluZyBzdGFydCgpIHR3aWNlIGZhaWxzLgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBwb3J0 LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIoKQotICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAg ICAgIHBvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZlcigpCi0gICAgICAgICAgICAgICAgc2VsZi5m YWlsKCdjYWxsaW5nIHBvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZlcigpIHR3aWNlIHdvcmtlZCcp Ci0gICAgICAgICAgICBleGNlcHQgaHR0cF9zZXJ2ZXJfYmFzZS5TZXJ2ZXJFcnJvciwgZToKLSAg ICAgICAgICAgICAgICBwYXNzCisgICAgICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhBc3NlcnRp b25FcnJvciwgcG9ydC5zdGFydF93ZWJzb2NrZXRfc2VydmVyKQogICAgICAgICBmaW5hbGx5Ogog ICAgICAgICAgICAgcG9ydC5zdG9wX3dlYnNvY2tldF9zZXJ2ZXIoKQogCi0gICAgICAgICMgVGVz dCB0aGF0IGNhbGxpbmcgc3RvcCgpIHR3aWNlIGlzIGhhcm1sZXNzLgotICAgICAgICBwb3J0LnN0 b3Bfd2Vic29ja2V0X3NlcnZlcigpCisgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RhcnQo KSBvbiB0d28gZGlmZmVyZW50IHBvcnRzIGNhdXNlcyB0aGUKKyAgICAgICAgIyBmaXJzdCBwb3J0 IHRvIGJlIHRyZWF0ZWQgYXMgc3RhbGUgYW5kIGtpbGxlZC4KKyAgICAgICAgcG9ydC5zdGFydF93 ZWJzb2NrZXRfc2VydmVyKCkKKyAgICAgICAgbmV3X3BvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisg ICAgICAgIHRyeToKKyAgICAgICAgICAgIG5ld19wb3J0LnN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIo KQorCisgICAgICAgICAgICAjIENoZWNrIHRoYXQgdGhlIGZpcnN0IHNlcnZlciB3YXMga2lsbGVk LgorICAgICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0Ll9leGVjdXRpdmUuY2hlY2tfcnVu bmluZ19waWQocG9ydC5fd2Vic29ja2V0X3NlcnZlci5fcHJvY2Vzcy5waWQpKQorCisgICAgICAg ICAgICAjIENoZWNrIHRoYXQgdGhlcmUgaXMgc29tZXRoaW5nIHJ1bm5pbmcuCisgICAgICAgICAg ICBzZWxmLmFzc2VydF9zZXJ2ZXJzX2FyZV91cCgnbG9jYWxob3N0Jywgc2VsZi5XRUJTT0NLRVRf UE9SVFMpCisKKyAgICAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RvcCgpIG9uIGEga2ls bGVkIHNlcnZlciBpcyBoYXJtbGVzcy4KKyAgICAgICAgICAgIHBvcnQuc3RvcF93ZWJzb2NrZXRf c2VydmVyKCkKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIHBvcnQuc3RvcF93ZWJzb2Nr ZXRfc2VydmVyKCkKKyAgICAgICAgICAgIG5ld19wb3J0LnN0b3Bfd2Vic29ja2V0X3NlcnZlcigp CisKKyAgICAgICAgICAgICMgVGVzdCB0aGF0IGNhbGxpbmcgc3RvcCgpIHR3aWNlIGlzIGhhcm1s ZXNzLgorICAgICAgICAgICAgbmV3X3BvcnQuc3RvcF93ZWJzb2NrZXRfc2VydmVyKCkKIAogICAg IGRlZiB0ZXN0X3Rlc3RfY29uZmlndXJhdGlvbihzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Vic29ja2V0X3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Vic29ja2V0X3NlcnZlci5weQppbmRleCBlNTgwMmM3ZDNmN2NiZGU2 OTllMjE4NDA5NjE0MWY2MTU3Y2I3YWU5Li42OTdiNWM5ZWEwNzEzYTlhMjZkMDkyZjcxZWY0YzAz MWY4NjU5NzBiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3dlYnNvY2tldF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC93ZWJzb2NrZXRfc2VydmVyLnB5CkBAIC03Niw2ICs3Niw5IEBAIGNs YXNzIFB5V2ViU29ja2V0KGh0dHBfc2VydmVyLkxpZ2h0dHBkKToKICAgICAgICAgc2VsZi5fd3Nv dXQgPSBOb25lCiAgICAgICAgIHNlbGYuX21hcHBpbmdzID0gW3sncG9ydCc6IHNlbGYuX3BvcnR9 XQogCisgICAgICAgIGlmIG5vdCBzZWxmLl9waWRfZmlsZToKKyAgICAgICAgICAgIHNlbGYuX3Bp ZF9maWxlID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3J1bnRpbWVfcGF0aCwgJyVzLnBp ZCcgJSBzZWxmLl9uYW1lKQorCiAgICAgICAgICMgV2Via2l0IHRlc3RzCiAgICAgICAgIGlmIHNl bGYuX3Jvb3Q6CiAgICAgICAgICAgICBzZWxmLl9sYXlvdXRfdGVzdHMgPSBvcy5wYXRoLmFic3Bh dGgoc2VsZi5fcm9vdCkK