64489 2011-07-13 15:50:47 -0700 NRWT spins up and down the WebSocket server when running a single HTTP test from the command line 2012-06-19 21:09:26 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 64491 1 webkit.review.bot dpranke abarth dpranke eric ojan tony oldest_to_newest 436721 0 webkit.review.bot 2011-07-13 15:50:47 -0700 NRWT spins up and down the WebSocket server when running a single HTTP test from the command line Requested by abarth on #webkit. 651974 1 148228 dpranke 2012-06-18 19:39:28 -0700 Created attachment 148228 Patch 652507 2 148228 eric 2012-06-19 09:06:17 -0700 Comment on attachment 148228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148228&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:974 > self._printer.print_update('Starting HTTP server ...') > self._port.start_http_server() So we start the http server unconditionatlly? Or do we somewhere check _http_tests before staring that? I'm confused why the if checks aren't right next to each other? (or is it that websocket tests are a subset of http tests and the http if check is outsidde this function? 652513 3 dpranke 2012-06-19 09:12:33 -0700 (In reply to comment #2) > (From update of attachment 148228 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=148228&action=review > > > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:974 > > self._printer.print_update('Starting HTTP server ...') > > self._port.start_http_server() > > So we start the http server unconditionatlly? Or do we somewhere check _http_tests before staring that? I'm confused why the if checks aren't right next to each other? (or is it that websocket tests are a subset of http tests and the http if check is outsidde this function? Good question. Historically, since the websocket tests also require http, if a test required a lock it had to mean that http was needed (so the check was outside the function). However, we now run perf tests under the lock as well, and so this doesn't have to be true, i.e., it's a bug. I'll add a check. 652600 4 148359 dpranke 2012-06-19 10:54:52 -0700 Created attachment 148359 do not start http server unless necessary, either 652910 5 148359 tony 2012-06-19 15:56:00 -0700 Comment on attachment 148359 do not start http server unless necessary, either In manager.py, around line 763, we call start_servers_with_lock() if we have locked_shareds. Should we change that condition? E.g., if I run only perf tests, we still acquire the http lock (although after this change, we will no longer start up the http servers). 652936 6 dpranke 2012-06-19 16:20:23 -0700 (In reply to comment #5) > (From update of attachment 148359 [details]) > In manager.py, around line 763, we call start_servers_with_lock() if we have locked_shareds. Should we change that condition? E.g., if I run only perf tests, we still acquire the http lock (although after this change, we will no longer start up the http servers). Good point. I will update accordingly. 653162 7 dpranke 2012-06-19 21:09:26 -0700 Committed r120795: <http://trac.webkit.org/changeset/120795> 148228 2012-06-18 19:39:28 -0700 2012-06-19 10:54:47 -0700 Patch bug-64489-20120618193927.patch text/plain 5382 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWI3MjI2YjZkYzhiYzMzNjIzNjViNjRmN2ViYTMxN2M0 YTM0ZDM0ZS4uNjk0Y2E3YTU2NzFmYTU1OTRhYTAzY2FiY2FiZmRlODBlNWNkZjI3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA2LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIE5SV1Qgc3BpbnMgdXAgYW5kIGRvd24gdGhlIFdlYlNvY2tldCBzZXJ2ZXIgd2hlbiBy dW5uaW5nIGEgc2luZ2xlIEhUVFAgdGVzdCBmcm9tIHRoZSBjb21tYW5kIGxpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDg5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgY2hhbmdl cyBOUldUIHNvIHRoYXQgd2UgZG9uJ3Qgc3RhcnQgdGhlIFdlYnNvY2tldAorICAgICAgICBzZXJ2 ZXIgaWYgd2UgYXJlbid0IHJ1bm5pbmcgd2Vic29ja2V0IHRlc3RzLgorICAgICAgICAKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 OgorICAgICAgICAoTWFuYWdlci5fd2Vic29ja2V0X3Rlc3RzKToKKyAgICAgICAgKE1hbmFnZXIu c3RhcnRfc2VydmVyc193aXRoX2xvY2spOgorICAgICAgICAoTWFuYWdlci5zdG9wX3NlcnZlcnNf d2l0aF9sb2NrKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QudGVzdF9z ZXJ2ZXJzX3N0YXJ0ZWQpOgorCiAyMDEyLTA2LTE4ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMTAwNTU4KTogTlJXVCBzaG91bGQg d29yayB3aXRob3V0IFNWTiBvciBHSVQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IDIyMzdjZTc3 YTEzZTRkNjdhNTY2ZGIxODBmZmE2NTlmZjdjMjZjN2MuLjA4NWVhNTNkNTIyMzM2NDYwYWM5Mzli ZTMyYTkzM2MzMWNjMmE2NWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtMzYzLDYgKzM2Myw5 IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICBkZWYgX2h0dHBfdGVzdHMoc2VsZik6CiAg ICAgICAgIHJldHVybiBzZXQodGVzdCBmb3IgdGVzdCBpbiBzZWxmLl90ZXN0X2ZpbGVzIGlmIHNl bGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSkKIAorICAgIGRlZiBfd2Vic29ja2V0X3Rlc3RzKHNlbGYp OgorICAgICAgICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3QgaW4gc2VsZi5fdGVzdF9maWxlcyBp ZiBzZWxmLldFQlNPQ0tFVF9TVUJESVIgaW4gdGVzdCkKKwogICAgIGRlZiBfaXNfcGVyZl90ZXN0 KHNlbGYsIHRlc3QpOgogICAgICAgICByZXR1cm4gc2VsZi5QRVJGX1NVQkRJUiA9PSB0ZXN0IG9y IChzZWxmLlBFUkZfU1VCRElSICsgc2VsZi5fcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SKSBpbiB0 ZXN0CiAKQEAgLTk2OSwxNiArOTcyLDE5IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAg ICAgc2VsZi5fcG9ydC5hY3F1aXJlX2h0dHBfbG9jaygpCiAgICAgICAgIHNlbGYuX3ByaW50ZXIu cHJpbnRfdXBkYXRlKCdTdGFydGluZyBIVFRQIHNlcnZlciAuLi4nKQogICAgICAgICBzZWxmLl9w b3J0LnN0YXJ0X2h0dHBfc2VydmVyKCkKLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF91cGRh dGUoJ1N0YXJ0aW5nIFdlYlNvY2tldCBzZXJ2ZXIgLi4uJykKLSAgICAgICAgc2VsZi5fcG9ydC5z dGFydF93ZWJzb2NrZXRfc2VydmVyKCkKKworICAgICAgICBpZiBzZWxmLl93ZWJzb2NrZXRfdGVz dHMoKToKKyAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCdTdGFydGluZyBX ZWJTb2NrZXQgc2VydmVyIC4uLicpCisgICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X3dlYnNv Y2tldF9zZXJ2ZXIoKQogICAgICAgICBzZWxmLl9oYXNfaHR0cF9sb2NrID0gVHJ1ZQogCiAgICAg ZGVmIHN0b3Bfc2VydmVyc193aXRoX2xvY2soc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX2hhc19o dHRwX2xvY2s6CiAgICAgICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgnU3RvcHBp bmcgSFRUUCBzZXJ2ZXIgLi4uJykKICAgICAgICAgICAgIHNlbGYuX3BvcnQuc3RvcF9odHRwX3Nl cnZlcigpCi0gICAgICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgnU3RvcHBpbmcg V2ViU29ja2V0IHNlcnZlciAuLi4nKQotICAgICAgICAgICAgc2VsZi5fcG9ydC5zdG9wX3dlYnNv Y2tldF9zZXJ2ZXIoKQorICAgICAgICAgICAgaWYgc2VsZi5fd2Vic29ja2V0X3Rlc3RzKCk6Cisg ICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF91cGRhdGUoJ1N0b3BwaW5nIFdlYlNv Y2tldCBzZXJ2ZXIgLi4uJykKKyAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3Bfd2Vic29j a2V0X3NlcnZlcigpCiAgICAgICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgnUmVs ZWFzaW5nIHNlcnZlciBsb2NrIC4uLicpCiAgICAgICAgICAgICBzZWxmLl9wb3J0LnJlbGVhc2Vf aHR0cF9sb2NrKCkKICAgICAgICAgICAgIHNlbGYuX2hhc19odHRwX2xvY2sgPSBGYWxzZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKaW5kZXggNzY3MjM3Njc4MTUzNTk2MWIx OTA1ZjAxMmZjZjg2NWRmMzgxZjU1ZC4uYjdhNGUwNTg3NDg2N2QxOGM5YzJiNzkyZmZjODA2ZWU1 MzBjODhiYyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CkBAIC0zNDIs NiArMzQyLDQ4IEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgbWFuYWdlciA9IGdldF9tYW5hZ2VyX3dpdGhfdGVzdHModGVzdHMpCiAgICAgICAgIG1hbmFn ZXIuX2xvb2tfZm9yX25ld19jcmFzaF9sb2dzKHJzLCB0aW1lLnRpbWUoKSkKIAorICAgIGRlZiB0 ZXN0X3NlcnZlcnNfc3RhcnRlZChzZWxmKToKKworICAgICAgICBkZWYgc3RhcnRfaHR0cF9zZXJ2 ZXIoKToKKyAgICAgICAgICAgIHNlbGYuaHR0cF9zdGFydGVkID0gVHJ1ZQorCisgICAgICAgIGRl ZiBzdGFydF93ZWJzb2NrZXRfc2VydmVyKCk6CisgICAgICAgICAgICBzZWxmLndlYnNvY2tldF9z dGFydGVkID0gVHJ1ZQorCisgICAgICAgIGRlZiBzdG9wX2h0dHBfc2VydmVyKCk6CisgICAgICAg ICAgICBzZWxmLmh0dHBfc3RvcHBlZCA9IFRydWUKKworICAgICAgICBkZWYgc3RvcF93ZWJzb2Nr ZXRfc2VydmVyKCk6CisgICAgICAgICAgICBzZWxmLndlYnNvY2tldF9zdG9wcGVkID0gVHJ1ZQor CisgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCisgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFj dG9yeS5nZXQoJ3Rlc3QtbWFjLWxlb3BhcmQnKQorICAgICAgICBwb3J0LnN0YXJ0X2h0dHBfc2Vy dmVyID0gc3RhcnRfaHR0cF9zZXJ2ZXIKKyAgICAgICAgcG9ydC5zdGFydF93ZWJzb2NrZXRfc2Vy dmVyID0gc3RhcnRfd2Vic29ja2V0X3NlcnZlcgorICAgICAgICBwb3J0LnN0b3BfaHR0cF9zZXJ2 ZXIgPSBzdG9wX2h0dHBfc2VydmVyCisgICAgICAgIHBvcnQuc3RvcF93ZWJzb2NrZXRfc2VydmVy ID0gc3RvcF93ZWJzb2NrZXRfc2VydmVyCisKKyAgICAgICAgc2VsZi5odHRwX3N0YXJ0ZWQgPSBz ZWxmLmh0dHBfc3RvcHBlZCA9IHNlbGYud2Vic29ja2V0X3N0YXJ0ZWQgPSBzZWxmLndlYnNvY2tl dF9zdG9wcGVkID0gRmFsc2UKKyAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydD1wb3J0LCBv cHRpb25zPU1vY2tPcHRpb25zKGh0dHA9VHJ1ZSksIHByaW50ZXI9TW9jaygpKQorICAgICAgICBt YW5hZ2VyLl90ZXN0X2ZpbGVzID0gWydodHRwL3Rlc3RzL3Bhc3MudHh0J10KKyAgICAgICAgbWFu YWdlci5zdGFydF9zZXJ2ZXJzX3dpdGhfbG9jaygpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHNlbGYuaHR0cF9zdGFydGVkLCBUcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxm LndlYnNvY2tldF9zdGFydGVkLCBGYWxzZSkKKyAgICAgICAgbWFuYWdlci5zdG9wX3NlcnZlcnNf d2l0aF9sb2NrKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0b3BwZWQs IFRydWUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYud2Vic29ja2V0X3N0b3BwZWQs IEZhbHNlKQorCisgICAgICAgIHNlbGYuaHR0cF9zdGFydGVkID0gc2VsZi5odHRwX3N0b3BwZWQg PSBzZWxmLndlYnNvY2tldF9zdGFydGVkID0gc2VsZi53ZWJzb2NrZXRfc3RvcHBlZCA9IEZhbHNl CisgICAgICAgIG1hbmFnZXIgPSBNYW5hZ2VyKHBvcnQ9cG9ydCwgb3B0aW9ucz1Nb2NrT3B0aW9u cyhodHRwPVRydWUpLCBwcmludGVyPU1vY2soKSkKKyAgICAgICAgbWFuYWdlci5fdGVzdF9maWxl cyA9IFsnd2Vic29ja2V0L3Bhc3MudHh0J10KKyAgICAgICAgbWFuYWdlci5zdGFydF9zZXJ2ZXJz X3dpdGhfbG9jaygpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYuaHR0cF9zdGFydGVk LCBUcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLndlYnNvY2tldF9zdGFydGVk LCBUcnVlKQorICAgICAgICBtYW5hZ2VyLnN0b3Bfc2VydmVyc193aXRoX2xvY2soKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLmh0dHBfc3RvcHBlZCwgVHJ1ZSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoc2VsZi53ZWJzb2NrZXRfc3RvcHBlZCwgVHJ1ZSkKKworCiAKIGNsYXNz IE5hdHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIGFzc2VydF9j bXAoc2VsZiwgeCwgeSwgcmVzdWx0KToK 148359 2012-06-19 10:54:52 -0700 2012-06-19 15:55:59 -0700 do not start http server unless necessary, either bug-64489-20120619105451.patch text/plain 6405 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNjQ2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWI3MjI2YjZkYzhiYzMzNjIzNjViNjRmN2ViYTMxN2M0 YTM0ZDM0ZS4uZTJhYjgwYmE1MDQ5ODJmNDM3NmM0YjlmOGE4NzIzODkzYmNiNDkyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA2LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIE5SV1Qgc3BpbnMgdXAgYW5kIGRvd24gdGhlIFdlYlNvY2tldCBzZXJ2ZXIgd2hlbiBy dW5uaW5nIGEgc2luZ2xlIEhUVFAgdGVzdCBmcm9tIHRoZSBjb21tYW5kIGxpbmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDg5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgY2hhbmdl cyBOUldUIHNvIHRoYXQgd2UgZG9uJ3Qgc3RhcnQgdGhlIHdlYnNvY2tldAorICAgICAgICBzZXJ2 ZXIgaWYgd2UgYXJlbid0IHJ1bm5pbmcgd2Vic29ja2V0IHRlc3RzIGFuZCBkb24ndCBzdGFydCB0 aGUKKyAgICAgICAgSFRUUCBzZXJ2ZXIgaWYgd2UgYXJlbid0IHJ1bm5pbmcgaHR0cCB0ZXN0cy4K KyAgICAgICAgCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX3dlYnNvY2tldF90ZXN0cyk6Cisg ICAgICAgIChNYW5hZ2VyLnN0YXJ0X3NlcnZlcnNfd2l0aF9sb2NrKToKKyAgICAgICAgKE1hbmFn ZXIuc3RvcF9zZXJ2ZXJzX3dpdGhfbG9jayk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAgKE1h bmFnZXJUZXN0LnRlc3Rfc2VydmVyc19zdGFydGVkKToKKwogMjAxMi0wNi0xOCAgQ3NhYmEgT3N6 dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEwMDU1 OCk6IE5SV1Qgc2hvdWxkIHdvcmsgd2l0aG91dCBTVk4gb3IgR0lUCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eQppbmRleCAyMjM3Y2U3N2ExM2U0ZDY3YTU2NmRiMTgwZmZhNjU5ZmY3YzI2YzdjLi4xNjZiMGE4 MzYyODMxOGE5YTQyZDA5MDlhNTM1OWY2MzFjYTk3YTNjIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkK QEAgLTM2Myw2ICszNjMsOSBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgZGVmIF9odHRw X3Rlc3RzKHNlbGYpOgogICAgICAgICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3QgaW4gc2VsZi5f dGVzdF9maWxlcyBpZiBzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkpCiAKKyAgICBkZWYgX3dlYnNv Y2tldF90ZXN0cyhzZWxmKToKKyAgICAgICAgcmV0dXJuIHNldCh0ZXN0IGZvciB0ZXN0IGluIHNl bGYuX3Rlc3RfZmlsZXMgaWYgc2VsZi5XRUJTT0NLRVRfU1VCRElSIGluIHRlc3QpCisKICAgICBk ZWYgX2lzX3BlcmZfdGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuUEVSRl9T VUJESVIgPT0gdGVzdCBvciAoc2VsZi5QRVJGX1NVQkRJUiArIHNlbGYuX3BvcnQuVEVTVF9QQVRI X1NFUEFSQVRPUikgaW4gdGVzdAogCkBAIC05NjcsMTggKzk3MCwyMiBAQCBjbGFzcyBNYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgIGFzc2VydChzZWxmLl9vcHRpb25zLmh0dHApCiAgICAgICAgIHNl bGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCdBY3F1aXJpbmcgaHR0cCBsb2NrIC4uLicpCiAgICAg ICAgIHNlbGYuX3BvcnQuYWNxdWlyZV9odHRwX2xvY2soKQotICAgICAgICBzZWxmLl9wcmludGVy LnByaW50X3VwZGF0ZSgnU3RhcnRpbmcgSFRUUCBzZXJ2ZXIgLi4uJykKLSAgICAgICAgc2VsZi5f cG9ydC5zdGFydF9odHRwX3NlcnZlcigpCi0gICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdXBk YXRlKCdTdGFydGluZyBXZWJTb2NrZXQgc2VydmVyIC4uLicpCi0gICAgICAgIHNlbGYuX3BvcnQu c3RhcnRfd2Vic29ja2V0X3NlcnZlcigpCisgICAgICAgIGlmIHNlbGYuX2h0dHBfdGVzdHMoKToK KyAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCdTdGFydGluZyBIVFRQIHNl cnZlciAuLi4nKQorICAgICAgICAgICAgc2VsZi5fcG9ydC5zdGFydF9odHRwX3NlcnZlcigpCisg ICAgICAgIGlmIHNlbGYuX3dlYnNvY2tldF90ZXN0cygpOgorICAgICAgICAgICAgc2VsZi5fcHJp bnRlci5wcmludF91cGRhdGUoJ1N0YXJ0aW5nIFdlYlNvY2tldCBzZXJ2ZXIgLi4uJykKKyAgICAg ICAgICAgIHNlbGYuX3BvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZlcigpCiAgICAgICAgIHNlbGYu X2hhc19odHRwX2xvY2sgPSBUcnVlCiAKICAgICBkZWYgc3RvcF9zZXJ2ZXJzX3dpdGhfbG9jayhz ZWxmKToKICAgICAgICAgaWYgc2VsZi5faGFzX2h0dHBfbG9jazoKLSAgICAgICAgICAgIHNlbGYu X3ByaW50ZXIucHJpbnRfdXBkYXRlKCdTdG9wcGluZyBIVFRQIHNlcnZlciAuLi4nKQotICAgICAg ICAgICAgc2VsZi5fcG9ydC5zdG9wX2h0dHBfc2VydmVyKCkKLSAgICAgICAgICAgIHNlbGYuX3By aW50ZXIucHJpbnRfdXBkYXRlKCdTdG9wcGluZyBXZWJTb2NrZXQgc2VydmVyIC4uLicpCi0gICAg ICAgICAgICBzZWxmLl9wb3J0LnN0b3Bfd2Vic29ja2V0X3NlcnZlcigpCisgICAgICAgICAgICBp ZiBzZWxmLl9odHRwX3Rlc3RzKCk6CisgICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF91cGRhdGUoJ1N0b3BwaW5nIEhUVFAgc2VydmVyIC4uLicpCisgICAgICAgICAgICAgICAgc2Vs Zi5fcG9ydC5zdG9wX2h0dHBfc2VydmVyKCkKKyAgICAgICAgICAgIGlmIHNlbGYuX3dlYnNvY2tl dF90ZXN0cygpOgorICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCdT dG9wcGluZyBXZWJTb2NrZXQgc2VydmVyIC4uLicpCisgICAgICAgICAgICAgICAgc2VsZi5fcG9y dC5zdG9wX3dlYnNvY2tldF9zZXJ2ZXIoKQogICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF91cGRhdGUoJ1JlbGVhc2luZyBzZXJ2ZXIgbG9jayAuLi4nKQogICAgICAgICAgICAgc2VsZi5f cG9ydC5yZWxlYXNlX2h0dHBfbG9jaygpCiAgICAgICAgICAgICBzZWxmLl9oYXNfaHR0cF9sb2Nr ID0gRmFsc2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CmluZGV4IDc2NzIz NzY3ODE1MzU5NjFiMTkwNWYwMTJmY2Y4NjVkZjM4MWY1NWQuLjEzMDExODgzZmJiNmQzZTM1MGIy NzU2YzQwNjQ1MDFiMmE5ZmMxOGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVz dC5weQpAQCAtMzQyLDYgKzM0Miw1OCBAQCBjbGFzcyBNYW5hZ2VyVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKHRlc3RzKQog ICAgICAgICBtYW5hZ2VyLl9sb29rX2Zvcl9uZXdfY3Jhc2hfbG9ncyhycywgdGltZS50aW1lKCkp CiAKKyAgICBkZWYgdGVzdF9zZXJ2ZXJzX3N0YXJ0ZWQoc2VsZik6CisKKyAgICAgICAgZGVmIHN0 YXJ0X2h0dHBfc2VydmVyKCk6CisgICAgICAgICAgICBzZWxmLmh0dHBfc3RhcnRlZCA9IFRydWUK KworICAgICAgICBkZWYgc3RhcnRfd2Vic29ja2V0X3NlcnZlcigpOgorICAgICAgICAgICAgc2Vs Zi53ZWJzb2NrZXRfc3RhcnRlZCA9IFRydWUKKworICAgICAgICBkZWYgc3RvcF9odHRwX3NlcnZl cigpOgorICAgICAgICAgICAgc2VsZi5odHRwX3N0b3BwZWQgPSBUcnVlCisKKyAgICAgICAgZGVm IHN0b3Bfd2Vic29ja2V0X3NlcnZlcigpOgorICAgICAgICAgICAgc2VsZi53ZWJzb2NrZXRfc3Rv cHBlZCA9IFRydWUKKworICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQorICAgICAgICBwb3J0ID0g aG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJkJykKKyAgICAgICAgcG9ydC5z dGFydF9odHRwX3NlcnZlciA9IHN0YXJ0X2h0dHBfc2VydmVyCisgICAgICAgIHBvcnQuc3RhcnRf d2Vic29ja2V0X3NlcnZlciA9IHN0YXJ0X3dlYnNvY2tldF9zZXJ2ZXIKKyAgICAgICAgcG9ydC5z dG9wX2h0dHBfc2VydmVyID0gc3RvcF9odHRwX3NlcnZlcgorICAgICAgICBwb3J0LnN0b3Bfd2Vi c29ja2V0X3NlcnZlciA9IHN0b3Bfd2Vic29ja2V0X3NlcnZlcgorCisgICAgICAgIHNlbGYuaHR0 cF9zdGFydGVkID0gc2VsZi5odHRwX3N0b3BwZWQgPSBzZWxmLndlYnNvY2tldF9zdGFydGVkID0g c2VsZi53ZWJzb2NrZXRfc3RvcHBlZCA9IEZhbHNlCisgICAgICAgIG1hbmFnZXIgPSBNYW5hZ2Vy KHBvcnQ9cG9ydCwgb3B0aW9ucz1Nb2NrT3B0aW9ucyhodHRwPVRydWUpLCBwcmludGVyPU1vY2so KSkKKyAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlcyA9IFsnaHR0cC90ZXN0cy9wYXNzLnR4dCdd CisgICAgICAgIG1hbmFnZXIuc3RhcnRfc2VydmVyc193aXRoX2xvY2soKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFscyhzZWxmLmh0dHBfc3RhcnRlZCwgVHJ1ZSkKKyAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbHMoc2VsZi53ZWJzb2NrZXRfc3RhcnRlZCwgRmFsc2UpCisgICAgICAgIG1hbmFnZXIu c3RvcF9zZXJ2ZXJzX3dpdGhfbG9jaygpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYu aHR0cF9zdG9wcGVkLCBUcnVlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLndlYnNv Y2tldF9zdG9wcGVkLCBGYWxzZSkKKworICAgICAgICBzZWxmLmh0dHBfc3RhcnRlZCA9IHNlbGYu aHR0cF9zdG9wcGVkID0gc2VsZi53ZWJzb2NrZXRfc3RhcnRlZCA9IHNlbGYud2Vic29ja2V0X3N0 b3BwZWQgPSBGYWxzZQorICAgICAgICBtYW5hZ2VyID0gTWFuYWdlcihwb3J0PXBvcnQsIG9wdGlv bnM9TW9ja09wdGlvbnMoaHR0cD1UcnVlKSwgcHJpbnRlcj1Nb2NrKCkpCisgICAgICAgIG1hbmFn ZXIuX3Rlc3RfZmlsZXMgPSBbJ3dlYnNvY2tldC9wYXNzLnR4dCddCisgICAgICAgIG1hbmFnZXIu c3RhcnRfc2VydmVyc193aXRoX2xvY2soKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxm Lmh0dHBfc3RhcnRlZCwgVHJ1ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi53ZWJz b2NrZXRfc3RhcnRlZCwgVHJ1ZSkKKyAgICAgICAgbWFuYWdlci5zdG9wX3NlcnZlcnNfd2l0aF9s b2NrKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0b3BwZWQsIFRydWUp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYud2Vic29ja2V0X3N0b3BwZWQsIFRydWUp CisKKyAgICAgICAgc2VsZi5odHRwX3N0YXJ0ZWQgPSBzZWxmLmh0dHBfc3RvcHBlZCA9IHNlbGYu d2Vic29ja2V0X3N0YXJ0ZWQgPSBzZWxmLndlYnNvY2tldF9zdG9wcGVkID0gRmFsc2UKKyAgICAg ICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydD1wb3J0LCBvcHRpb25zPU1vY2tPcHRpb25zKGh0dHA9 VHJ1ZSksIHByaW50ZXI9TW9jaygpKQorICAgICAgICBtYW5hZ2VyLl90ZXN0X2ZpbGVzID0gWydw ZXJmL2Zvby90ZXN0Lmh0bWwnXQorICAgICAgICBtYW5hZ2VyLnN0YXJ0X3NlcnZlcnNfd2l0aF9s b2NrKCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0YXJ0ZWQsIEZhbHNl KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLndlYnNvY2tldF9zdGFydGVkLCBGYWxz ZSkKKyAgICAgICAgbWFuYWdlci5zdG9wX3NlcnZlcnNfd2l0aF9sb2NrKCkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0b3BwZWQsIEZhbHNlKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhzZWxmLndlYnNvY2tldF9zdG9wcGVkLCBGYWxzZSkKKworCiAKIGNsYXNzIE5h dHVyYWxDb21wYXJlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIGFzc2VydF9jbXAo c2VsZiwgeCwgeSwgcmVzdWx0KToK