63956 2011-07-05 15:11:33 -0700 new-run-webkit-tests fails to start http server if one is already running 2011-07-05 16:00:02 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 34984 1 eric eric abarth aroben oldest_to_newest 432424 0 eric 2011-07-05 15:11:33 -0700 new-run-webkit-tests fails to start http server if one is already running It turns out old-run-webkit-tests seems to be really bad about shutting down httpd if it's interrupted/killed (as can commonly happen on the buildbots if someone cancels a build). We already seem to have a Tools/BuildSlaveSupport/kill-old-processes script to help with this. However that script doesn't know how to kill httpd on Mac. Trying to switch the bots to NRWT we're commonly encountering an error where NRWT refuses to start because there is already something bound to the 8080 port (so far it's always been an httpd server from a previous ORWT run). So I propose we add "httpd" to kill-old-processes and then buildbot will automatically clean these up before calling run-webkit-tests. 432432 1 aroben 2011-07-05 15:18:12 -0700 Why not make NRWT automatically kill old httpd processes, like old-run-webkit-tests does? That would help regular folks, too, not just the bots. 432445 2 eric 2011-07-05 15:34:56 -0700 ORWT only will kill old httpds if they're using the webkit pid file: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/httpd.pm#L168 NRWT does the same: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py#L75 Looks like the assumed pid file names are different though: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitperl/httpd.pm#L68 Looks like it produces /tmp/WebKit/httpd.pid http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py#L62 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py#L51 http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py#L59 Looks like it produces: /tmp/WebKit/apache.pid (at least on Mac) I could easily change NRWT to look at httpd.pid instead, maybe that's the better fix? Why does windows kill-old-processes kill httpd? 432446 3 99756 eric 2011-07-05 15:42:31 -0700 Created attachment 99756 Patch 432448 4 eric 2011-07-05 15:48:40 -0700 Thanks for your prod, aroben. After my investigation realizing that the pid file paths were different, this fix is much cleaner. Because I had already cleaned up kill-old-processes, I added that to the patch (even though there are no functional changes, just removing the ^M line endings. 432454 5 eric 2011-07-05 16:00:02 -0700 Committed r90412: <http://trac.webkit.org/changeset/90412> 99756 2011-07-05 15:42:31 -0700 2011-07-05 15:51:43 -0700 Patch bug-63956-20110705154229.patch text/plain 8007 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTA0MDQKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2tpbGwtb2xkLXByb2Nlc3NlcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2tpbGwt b2xkLXByb2Nlc3NlcwppbmRleCBmNDJmYmZjNmZkNTM2YWRjYjNjZmQ3OTY0NTIzNzYwZTg1NGJi NmIyLi5mY2JlMDBlMDRiZDYzOTRlMjI1ZTU3YTM4ZDVhNWMwNjgzYWY3NDk4IDEwMDc1NQotLS0g YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMKKysrIGIvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQva2lsbC1vbGQtcHJvY2Vzc2VzCkBAIC0xLDgyICsxLDg4IEBACi0j IS91c3IvYmluL3B5dGhvbg0KLQ0KLSMgQ29weXJpZ2h0IChDKSAyMDEwIEFwcGxlIEluYy4gIEFs bCByaWdodHMgcmVzZXJ2ZWQuDQotIw0KLSMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0DQotIyBtb2RpZmljYXRpb24sIGFy ZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMNCi0jIGFy ZSBtZXQ6DQotIw0KLSMgMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJl dGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0DQotIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLiANCi0jIDIuICBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodA0K LSMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUNCi0jICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLiANCi0jDQotIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJUyIgQU5E IEFOWQ0KLSMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5P VCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRA0KLSMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJ VFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQ0KLSMgRElTQ0xBSU1F RC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWQ0KLSMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMNCi0jIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsNCi0j IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORA0KLSMgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQNCi0jIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRg0KLSMgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4NCi0NCi1pbXBvcnQgb3MsIHN5cw0KLQ0KLWRlZiBtYWluKCk6DQot DQotICAgIHRhc2tzVG9LaWxsV2luID0gWyAiY2wuZXhlIiwgDQotCQkJCQkiZGV2ZW52LmNvbSIs IA0KLQkJCQkJImRldmVudi5leGUiLCANCi0JCQkJCSJEdW1wUmVuZGVyVHJlZS5leGUiLCANCi0J CQkJCSJEdW1wUmVuZGVyVHJlZV9kZWJ1Zy5leGUiLA0KLQkJCQkJImh0dHBkLmV4ZSIsIA0KLQkJ CQkJImltYWdlZGlmZi5leGUiLCANCi0JCQkJCSJpbWFnZWRpZmZfZGVidWcuZXhlIiwgDQotCQkJ CQkianNjLmV4ZSIsIA0KLQkJCQkJImpzY19kZWJ1Zy5leGUiLA0KLQkJCQkJIkxpZ2h0VFBELmV4 ZSIsIA0KLQkJCQkJImxpbmsuZXhlIiwgDQotCQkJCQkibWlkbC5leGUiLCANCi0JCQkJCSJwZXJs LmV4ZSIsIA0KLQkJCQkJIlNhZmFyaS5leGUiLCANCi0JCQkJCSJzdm4uZXhlIiwgDQotCQkJCQki dGVzdGFwaS5leGUiLCANCi0JCQkJCSJ0ZXN0YXBpX2RlYnVnLmV4ZSIsIA0KLQkJCQkJIlZjQnVp bGRIZWxwZXIuZXhlIiwgDQotCQkJCQkid2RpZmYuZXhlIiwgDQotCQkJCQkiV2ViS2l0MldlYlBy b2Nlc3MuZXhlIiwgDQotCQkJCQkiV2ViS2l0MldlYlByb2Nlc3NfZGVidWcuZXhlIiwgDQotCQkJ CQkiV2ViS2l0VGVzdFJ1bm5lci5leGUiLCANCi0JCQkJCSJXZWJLaXRUZXN0UnVubmVyX2RlYnVn LmV4ZSIgXQ0KLQ0KLSAgICB0YXNrc1RvS2lsbE1hYyA9IFsgIkR1bXBSZW5kZXJUcmVlIiwgDQot CQkJCQkibWFrZSIsDQotCQkJCQkicGVybCIsIA0KLQkJCQkJInBlcjUuMTIiLA0KLQkJCQkJInJ1 YnkiLA0KLQkJCQkJIlNhZmFyaSIsIA0KLQkJCQkJIlNhZmFyaSBXZWIgQ29udGVudCIsDQotCQkJ CQkiV2ViUHJvY2VzcyINCi0JCQkJCSJzdm4iLCANCi0JCQkJCSJXZWJLaXRUZXN0UnVubmVyIiwN Ci0JCQkJCSJXZWJLaXRUZXN0UnVubmVyIFdlYiBDb250ZW50IiwNCi0JCQkJCSJUZXN0V2ViS2l0 QVBJIiwNCi0JCQkJCSJUZXN0V2ViS2l0QVBJIFdlYiBDb250ZW50IiwNCi0JCQkJCSJqc2MiLA0K LQkJCQkJIlByb2JsZW0gUmVwb3J0ZXIiLA0KLQkJCQkJIldlYktpdFBsdWdpbkFnZW4iIF0NCi0N Ci0gICAgaWYgc3lzLnBsYXRmb3JtID09ICdkYXJ3aW4nOg0KLSAgICAgICAgZm9yIHRhc2sgaW4g dGFza3NUb0tpbGxNYWM6DQotICAgICAgICAgICAgb3Muc3lzdGVtKCJraWxsYWxsIC05IC12IC1t ICIgKyB0YXNrKQ0KLSAgICBlbGlmIHN5cy5wbGF0Zm9ybSA9PSAnY3lnd2luJyBvciBzeXMucGxh dGZvcm0gPT0gJ3dpbjMyJzoNCi0gICAgICAgIGZvciB0YXNrIGluIHRhc2tzVG9LaWxsV2luOg0K LSAgICAgICAgICAgIG9zLnN5c3RlbSgidGFza2tpbGwgL3QgL2YgL2ltICIgKyB0YXNrKQ0KLSAg ICBlbHNlOg0KLSAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCJIYXZlIG5vdCBpbXBsZW1lbnRlZCBr aWxsLW9sZC1wcm9jZXNzZXMgZm9yIHRoaXMgcGxhdGZvcm0iKSAgDQotDQotaWYgX19uYW1lX18g PT0gJ19fbWFpbl9fJzoNCi0gICAgc3lzLmV4aXQobWFpbigpKQ0KKyMhL3Vzci9iaW4vcHl0aG9u CisjIENvcHlyaWdodCAoQykgMjAxMCBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgor IyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisj CisjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyMgYXJlIG1ldDoKKyMKKyMgMS4gIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisj ICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIuCisjIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorIyAgICAgZG9jdW1l bnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1 dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENP TlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyMgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5U SUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBP U0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyMgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRB TCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOworIyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQKKyMgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQK KyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GCisjIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBvcywgc3lzCisKKworZGVm IG1haW4oKToKKyAgICB0YXNrc1RvS2lsbFdpbiA9IFsKKyAgICAgICAgImNsLmV4ZSIsCisJCSJk ZXZlbnYuY29tIiwKKwkJImRldmVudi5leGUiLAorCQkiRHVtcFJlbmRlclRyZWUuZXhlIiwKKwkJ IkR1bXBSZW5kZXJUcmVlX2RlYnVnLmV4ZSIsCisJCSJodHRwZC5leGUiLAorCQkiaW1hZ2VkaWZm LmV4ZSIsCisJCSJpbWFnZWRpZmZfZGVidWcuZXhlIiwKKwkJImpzYy5leGUiLAorCQkianNjX2Rl YnVnLmV4ZSIsCisJCSJMaWdodFRQRC5leGUiLAorCQkibGluay5leGUiLAorCQkibWlkbC5leGUi LAorCQkicGVybC5leGUiLAorCQkiU2FmYXJpLmV4ZSIsCisJCSJzdm4uZXhlIiwKKwkJInRlc3Rh cGkuZXhlIiwKKwkJInRlc3RhcGlfZGVidWcuZXhlIiwKKwkJIlZjQnVpbGRIZWxwZXIuZXhlIiwK KwkJIndkaWZmLmV4ZSIsCisJCSJXZWJLaXQyV2ViUHJvY2Vzcy5leGUiLAorCQkiV2ViS2l0Mldl YlByb2Nlc3NfZGVidWcuZXhlIiwKKwkJIldlYktpdFRlc3RSdW5uZXIuZXhlIiwKKwkJIldlYktp dFRlc3RSdW5uZXJfZGVidWcuZXhlIiwKKwldCisKKyAgICB0YXNrc1RvS2lsbE1hYyA9IFsKKwkJ ImpzYyIsCisJCSJtYWtlIiwKKwkJInBlcjUuMTIiLAorCQkicGVybCIsCisJCSJQcm9ibGVtIFJl cG9ydGVyIiwKKwkJInJ1YnkiLAorCQkiU2FmYXJpIFdlYiBDb250ZW50IiwKKwkJIlNhZmFyaSIs CisJCSJzdm4iLAorCQkiRHVtcFJlbmRlclRyZWUiLAorCQkiVGVzdFdlYktpdEFQSSBXZWIgQ29u dGVudCIsCisJCSJUZXN0V2ViS2l0QVBJIiwKKwkJIldlYktpdFBsdWdpbkFnZW4iLCAjIFdoeSBu byAndCc/CisJCSJXZWJLaXRUZXN0UnVubmVyIFdlYiBDb250ZW50IiwKKwkJIldlYktpdFRlc3RS dW5uZXIiLAorCQkiV2ViUHJvY2VzcyIsCisJXQorCisgICAgaWYgc3lzLnBsYXRmb3JtID09ICdk YXJ3aW4nOgorICAgICAgICBmb3IgdGFzayBpbiB0YXNrc1RvS2lsbE1hYzoKKyAgICAgICAgICAg IG9zLnN5c3RlbSgia2lsbGFsbCAtOSAtdiAtbSAiICsgdGFzaykKKyAgICBlbGlmIHN5cy5wbGF0 Zm9ybSA9PSAnY3lnd2luJyBvciBzeXMucGxhdGZvcm0gPT0gJ3dpbjMyJzoKKyAgICAgICAgZm9y IHRhc2sgaW4gdGFza3NUb0tpbGxXaW46CisgICAgICAgICAgICBvcy5zeXN0ZW0oInRhc2traWxs IC90IC9mIC9pbSAiICsgdGFzaykKKyAgICBlbHNlOgorICAgICAgICByYWlzZSBFeGNlcHRpb24o IkhhdmUgbm90IGltcGxlbWVudGVkIGtpbGwtb2xkLXByb2Nlc3NlcyBmb3IgdGhpcyBwbGF0Zm9y bSIpCisgICAgIyBGSVhNRTogU2hvdWxkIHdlIHJldHVybiBhbiBleGl0IGNvZGUgYmFzZWQgb24g aG93IHRoZSBraWxscyB3ZW50PworCisKK2lmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CisgICAg c3lzLmV4aXQobWFpbigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IGViYzhmYzg4YWRjNjM3NTZlZTg1Y2NkOTQwZTc3NDZmZDQyMTc1YzIuLmY1 MTA2ODQ2YjZiNzBhMjhlNjc3ZGNjYzI2ODdhNTE4MjI4YTU1NzcgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0w Ny0wNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgbmV3LXJ1bi13 ZWJraXQtdGVzdHMgZmFpbHMgdG8gc3RhcnQgaHR0cCBzZXJ2ZXIgaWYgb25lIGlzIGFscmVhZHkg cnVubmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjM5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2tpbGwtb2xkLXByb2Nlc3NlczoKKyAgICAgICAgIC0gUmVtb3Zl ZCBeTSBsaW5lIGVuZGluZ3MgYW5kIHNvcnRlZCB0aGUgcHJvY2VzcyBuYW1lcy4KKyAgICAgICAg IC0gVGhlcmUgYXJlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcyB0byB0aGlzIGZpbGUuCisgICAgICAg ICAgIChleGNlcHQgdGhhdCBub3cgdGhhdCBpdHMgdXNpbmcgdW5peCBsaW5lIGVuZGluZ3MgaXQg Y2FuIGJlIGV4ZWN1dGVkIGRpcmVjdGx5ISkKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weToKKyAgICAgICAgIC0gQ2hh bmdlIHRoZSBuYW1lIHRvICdodHRwZCcgdG8gbWF0Y2ggb2xkLXJ1bi13ZWJraXQtdGVzdCBwYXRo cy4KKwogMjAxMS0wNy0wNCAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVf aHR0cF9zZXJ2ZXIucHkKaW5kZXggNDRlYTFhOWUxOTFlNzllMzIzOGVlNWRjZTE3NTMxOGEyYTBm MDk5YS4uMDg4N2M2NDI0OTM1MWY2YzVmZThhYjFjZTM4NDhhOTU4NGIzMTJjNiAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0 cF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2Vy dmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKQEAgLTQ4LDcgKzQ4LDkgQEAgY2xhc3MgTGF5b3V0 VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAg ICAgIG91dHB1dF9kaXI6IHRoZSBhYnNvbHV0ZSBwYXRoIHRvIHRoZSBsYXlvdXQgdGVzdCByZXN1 bHQgZGlyZWN0b3J5CiAgICAgICAgICIiIgogICAgICAgICBodHRwX3NlcnZlcl9iYXNlLkh0dHBT ZXJ2ZXJCYXNlLl9faW5pdF9fKHNlbGYsIHBvcnRfb2JqKQotICAgICAgICBzZWxmLl9uYW1lID0g J2FwYWNoZScKKyAgICAgICAgIyBXZSB1c2UgdGhlIG5hbWUgImh0dHBkIiBpbnN0ZWFkIG9mICJh cGFjaGUiIHRvIG1ha2Ugb3VyIHBhdGhzIChlLmcuIHRoZSBwaWQgZmlsZTogL3RtcC9XZWJLaXQv aHR0cGQucGlkKQorICAgICAgICAjIG1hdGNoIG9sZC1ydW4td2Via2l0LXRlc3RzOiBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM5NTYKKyAgICAgICAgc2VsZi5fbmFt ZSA9ICdodHRwZCcKICAgICAgICAgc2VsZi5fbWFwcGluZ3MgPSBbeydwb3J0JzogODAwMH0sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgIHsncG9ydCc6IDgwODB9LAogICAgICAgICAgICAgICAg ICAgICAgICAgICB7J3BvcnQnOiA4MDgxfSwK