85516 2012-05-03 11:05:49 -0700 webkitpy: Use PlatformInfo whenever possible in server_process.py. 2012-05-03 12:58:47 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rakuco rakuco abarth dpranke eric ojan tony webkit.review.bot oldest_to_newest 615416 0 rakuco 2012-05-03 11:05:49 -0700 webkitpy: Use PlatformInfo whenever possible in server_process.py. 615419 1 140051 rakuco 2012-05-03 11:08:13 -0700 Created attachment 140051 Patch 615421 2 140051 eric 2012-05-03 11:09:29 -0700 Comment on attachment 140051 Patch It seems callers should pass ServerProcess a host (or at least have that option) instead of it creating a new one. This makes it unmockable. Was no one using the executive parameter? Did you run test-webkitpy? 615424 3 rakuco 2012-05-03 11:12:15 -0700 (In reply to comment #2) > (From update of attachment 140051 [details]) > It seems callers should pass ServerProcess a host (or at least have that option) instead of it creating a new one. This makes it unmockable. Was no one using the executive parameter? Did you run test-webkitpy? That was my first thought too, but since one was using the executive parameter I didn't see much value in adding it. And yes, I always run test-webkitpy before sending webkitpy patches :-) 615436 4 eric 2012-05-03 11:21:45 -0700 Then we must not have any testing of ServerProcess? Otherwise whatever testing we would have would be dependent on the real system? 615442 5 rakuco 2012-05-03 11:32:59 -0700 (In reply to comment #4) > Then we must not have any testing of ServerProcess? Otherwise whatever testing we would have would be dependent on the real system? We do have server_process_unittest.py. These lines the patches replace were indeed depending on the real system, as they were accessing sys.platform directly. What could still be done to improve things further is get the Host object from port_obj in ServerProcess' constructor (it would require some work in the unit tests, though). Would you prefer it that way? 615461 6 dpranke 2012-05-03 11:54:03 -0700 (In reply to comment #5) > (In reply to comment #4) > > Then we must not have any testing of ServerProcess? Otherwise whatever testing we would have would be dependent on the real system? > > We do have server_process_unittest.py. These lines the patches replace were indeed depending on the real system, as they were accessing sys.platform directly. What could still be done to improve things further is get the Host object from port_obj in ServerProcess' constructor (it would require some work in the unit tests, though). Would you prefer it that way? We should just get the host from port_obj and fix the tests :) I had noticed yesterday that it looked like the Executive wasn't being used, but I hadn't gotten around to doing the cleanup you're doing, so thanks! 615491 7 140067 rakuco 2012-05-03 12:26:56 -0700 Created attachment 140067 Patch 615492 8 rakuco 2012-05-03 12:28:05 -0700 (In reply to comment #7) > Created an attachment (id=140067) [details] > Patch This new version gets a SystemHost from the Port object passed to ServerProcess' constructor. The tests have been adjusted -- even though they currently don't really call the methods in ServerProcess which depend on the platform, the infrastructure is now there. 615512 9 140067 eric 2012-05-03 12:55:41 -0700 Comment on attachment 140067 Patch LGTM. 615515 10 rakuco 2012-05-03 12:58:47 -0700 Committed r115999: <http://trac.webkit.org/changeset/115999> 140051 2012-05-03 11:08:13 -0700 2012-05-03 12:26:48 -0700 Patch bug-85516-20120503150812.patch text/plain 3731 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTdlYmY3ODU0OWI1MDc0MzM4ZDRhM2M2ZGM2MjA4Y2I0 NGFjYmQxZi4uYzU0MGYzY2ZiYWJhNDY1NGQwMDc0NzJhMTg3MjA2M2MwM2NmYzQwMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA1LTAzICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9y Zz4KKworICAgICAgICB3ZWJraXRweTogVXNlIFBsYXRmb3JtSW5mbyB3aGVuZXZlciBwb3NzaWJs ZSBpbiBzZXJ2ZXJfcHJvY2Vzcy5weS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1NTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRWxpbWluYXRlIGRpcmVjdCBhY2Nlc3MgdG8gc3lzLnBsYXRmb3JtIHdo ZXJldmVyIHBvc3NpYmxlIGJ5IHVzaW5nCisgICAgICAgIFBsYXRmb3JtSW5mby5pc193aW4oKSBp bnN0ZWFkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9z ZXJ2ZXJfcHJvY2Vzcy5weToKKyAgICAgICAgKFNlcnZlclByb2Nlc3MuX19pbml0X18pOiBSZW1v dmUgdGhlIGV4ZWN1dGl2ZSBwYXJhbWV0ZXIgYXMgaXQgd2FzCisgICAgICAgIG5vdCBwYXNzZWQg YnkgYW55IGNhbGxlciwgY3JlYXRlIGEgU3lzdGVtSG9zdCBvYmplY3QgaW5zdGVhZC4KKyAgICAg ICAgKFNlcnZlclByb2Nlc3MuX3N0YXJ0KToKKyAgICAgICAgKFNlcnZlclByb2Nlc3Muc3RvcCk6 CisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLmtpbGwpOgorCiAyMDEyLTA1LTAzICBUaGlhZ28gTWFy Y29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgogCiAgICAgICAgIHdlYmtp dHB5OiBTdHlsZSBjaGVja2VyIGJyb2tlbiB3aGVuIGNvbW1pdHRpbmcgYSBQTkcKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nl c3MucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9w cm9jZXNzLnB5CmluZGV4IGM0NjczODBhOTljNTI3YmEyN2FkNDNjOGRlN2IxMmU2ZDVkZjY3MWYu Ljc2YTNmMzRjM2E2MWVjMjgzYjkyYzQ5YmM3MmU2MGI3NTg5ZWIxMDAgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3MucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJv Y2Vzcy5weQpAQCAtNDgsNyArNDgsOCBAQCBlbHNlOgogICAgIGltcG9ydCBvcwogICAgIGltcG9y dCBzZWxlY3QKIAotZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQg RXhlY3V0aXZlLCBTY3JpcHRFcnJvcgorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1 dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5zeXN0 ZW1ob3N0IGltcG9ydCBTeXN0ZW1Ib3N0CiAKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9f bmFtZV9fKQpAQCAtNjEsMTMgKzYyLDEzIEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToK ICAgICBpbmRlZmluaXRlbHkuIFRoZSBjbGFzcyBhbHNvIGhhbmRsZXMgdHJhbnNwYXJlbnRseSBy ZXN0YXJ0aW5nIHByb2Nlc3NlcwogICAgIGFzIG5lY2Vzc2FyeSB0byBrZWVwIGlzc3VpbmcgY29t bWFuZHMuIiIiCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydF9vYmosIG5hbWUsIGNtZCwg ZW52PU5vbmUsIGV4ZWN1dGl2ZT1FeGVjdXRpdmUoKSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYs IHBvcnRfb2JqLCBuYW1lLCBjbWQsIGVudj1Ob25lKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBv cnRfb2JqCiAgICAgICAgIHNlbGYuX25hbWUgPSBuYW1lICAjIFNob3VsZCBiZSB0aGUgY29tbWFu ZCBuYW1lIChlLmcuIER1bXBSZW5kZXJUcmVlLCBJbWFnZURpZmYpCiAgICAgICAgIHNlbGYuX2Nt ZCA9IGNtZAogICAgICAgICBzZWxmLl9lbnYgPSBlbnYKICAgICAgICAgc2VsZi5fcmVzZXQoKQot ICAgICAgICBzZWxmLl9leGVjdXRpdmUgPSBleGVjdXRpdmUKKyAgICAgICAgc2VsZi5faG9zdCA9 IFN5c3RlbUhvc3QoKQogCiAgICAgICAgICMgU2VlIGNvbW1lbnQgaW4gaW1wb3J0cyBmb3Igd2h5 IHdlIG5lZWQgdGhlIHdpbjMyIEFQSXMgYW5kIGNhbid0IGp1c3QgdXNlIHNlbGVjdC4KICAgICAg ICAgIyBGSVhNRTogdGhlcmUgc2hvdWxkIGJlIGEgd2F5IHRvIGdldCB3aW4zMiB2cy4gY3lnd2lu IGZyb20gcGxhdGZvcm1pbmZvLgpAQCAtOTQsNyArOTUsNyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNz KG9iamVjdCk6CiAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCIlcyBhbHJlYWR5IHJ1bm5p bmciICUgc2VsZi5fbmFtZSkKICAgICAgICAgc2VsZi5fcmVzZXQoKQogICAgICAgICAjIGNsb3Nl X2ZkcyBpcyBhIHdvcmthcm91bmQgZm9yIGh0dHA6Ly9idWdzLnB5dGhvbi5vcmcvaXNzdWUyMzIw Ci0gICAgICAgIGNsb3NlX2ZkcyA9IHN5cy5wbGF0Zm9ybSBub3QgaW4gKCd3aW4zMicsICdjeWd3 aW4nKQorICAgICAgICBjbG9zZV9mZHMgPSBub3Qgc2VsZi5faG9zdC5wbGF0Zm9ybS5pc193aW4o KQogICAgICAgICBzZWxmLl9wcm9jID0gc3VicHJvY2Vzcy5Qb3BlbihzZWxmLl9jbWQsIHN0ZGlu PXN1YnByb2Nlc3MuUElQRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RkZXJyPXN1YnByb2Nlc3MuUElQRSwKQEAgLTI5OCw3ICsyOTksNyBAQCBjbGFzcyBT ZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3Byb2Muc3Rkb3V0LmNsb3NlKCkK ICAgICAgICAgaWYgc2VsZi5fcHJvYy5zdGRlcnI6CiAgICAgICAgICAgICBzZWxmLl9wcm9jLnN0 ZGVyci5jbG9zZSgpCi0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSBub3QgaW4gKCd3aW4zMicsICdj eWd3aW4nKToKKyAgICAgICAgaWYgbm90IHNlbGYuX2hvc3QucGxhdGZvcm0uaXNfd2luKCk6CiAg ICAgICAgICAgICAjIENsb3Npbmcgc3RkaW4vc3Rkb3V0L3N0ZGVyciBoYW5ncyBzb21ldGltZXMg b24gT1MgWCwKICAgICAgICAgICAgICMgKHNlZSByZXN0YXJ0KCksIGFib3ZlKSwgYW5kIGFueXdh eSB3ZSBkb24ndCB3YW50IHRvIGhhbmcKICAgICAgICAgICAgICMgdGhlIGhhcm5lc3MgaWYgRHVt cFJlbmRlclRyZWUgaXMgYnVnZ3ksIHNvIHdlIHdhaXQgYSBjb3VwbGUKQEAgLTMxNiw3ICszMTcs NyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAKICAgICBkZWYga2lsbChzZWxmKToK ICAgICAgICAgaWYgc2VsZi5fcHJvYzoKLSAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5raWxs X3Byb2Nlc3Moc2VsZi5fcHJvYy5waWQpCisgICAgICAgICAgICBzZWxmLl9ob3N0LmV4ZWN1dGl2 ZS5raWxsX3Byb2Nlc3Moc2VsZi5fcHJvYy5waWQpCiAgICAgICAgICAgICBpZiBzZWxmLl9wcm9j LnBvbGwoKSBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAgICBzZWxmLl9wcm9jLndhaXQoKQog ICAgICAgICAgICAgc2VsZi5fcmVzZXQoKQo= 140067 2012-05-03 12:26:56 -0700 2012-05-03 12:55:41 -0700 Patch bug-85516-20120503162655.patch text/plain 6187 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTdlYmY3ODU0OWI1MDc0MzM4ZDRhM2M2ZGM2MjA4Y2I0 NGFjYmQxZi4uOWRiNTllYTkzYjgyNDgxZGViNjM5YzYyZWM5OTNiZjdkNmRjNTZkMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTA1LTAzICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9y Zz4KKworICAgICAgICB3ZWJraXRweTogVXNlIFBsYXRmb3JtSW5mbyB3aGVuZXZlciBwb3NzaWJs ZSBpbiBzZXJ2ZXJfcHJvY2Vzcy5weS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg1NTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRWxpbWluYXRlIGRpcmVjdCBhY2Nlc3MgdG8gc3lzLnBsYXRmb3JtIHdo ZXJldmVyIHBvc3NpYmxlIGJ5IHVzaW5nCisgICAgICAgIFBsYXRmb3JtSW5mby5pc193aW4oKSBp bnN0ZWFkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9z ZXJ2ZXJfcHJvY2Vzcy5weToKKyAgICAgICAgKFNlcnZlclByb2Nlc3MuX19pbml0X18pOiBSZW1v dmUgdGhlIGV4ZWN1dGl2ZSBwYXJhbWV0ZXIgYXMgaXQgd2FzCisgICAgICAgIG5vdCBwYXNzZWQg YnkgYW55IGNhbGxlciwgb2J0YWluIGEgU3lzdGVtSG9zdCBmcm9tIHBvcnRfb2JqCisgICAgICAg IGluc3RlYWQuCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9sb2cpOiBTdHlsZSwgcmVtb3ZlIGV4 dHJhIGVtcHR5IGxpbmUuCisgICAgICAgIChTZXJ2ZXJQcm9jZXNzLl9zdGFydCk6CisgICAgICAg IChTZXJ2ZXJQcm9jZXNzLnN0b3ApOgorICAgICAgICAoU2VydmVyUHJvY2Vzcy5raWxsKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNz X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVHJpdmlhbE1vY2tQb3J0Ll9faW5pdF9fKTogQ3JlYXRl IGEgTW9ja1N5c3RlbUhvc3QgdXNlZCBieQorICAgICAgICBTZXJ2ZXJQcm9jZXNzLgorICAgICAg ICAoVGVzdFNlcnZlclByb2Nlc3MudGVzdF9icm9rZW5fcGlwZSk6IFRlc3QgZGlmZmVyZW50IHBs YXRmb3Jtcy4KKwogMjAxMi0wNS0wMyAgVGhpYWdvIE1hcmNvcyBQLiBTYW50b3MgIDx0aGlhZ28u c2FudG9zQGludGVsLmNvbT4KIAogICAgICAgICB3ZWJraXRweTogU3R5bGUgY2hlY2tlciBicm9r ZW4gd2hlbiBjb21taXR0aW5nIGEgUE5HCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzcy5weQppbmRleCBjNDY3Mzgw YTk5YzUyN2JhMjdhZDQzYzhkZTdiMTJlNmQ1ZGY2NzFmLi40MGNkMWMyOTJmMzZjMTM3ZTM3N2U5 MDU2OTk0ODY0YjgxMDRlNjg2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3MucHkKQEAgLTQ4LDcgKzQ4LDcg QEAgZWxzZToKICAgICBpbXBvcnQgb3MKICAgICBpbXBvcnQgc2VsZWN0CiAKLWZyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZSwgU2NyaXB0RXJyb3IK K2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9y CiAKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtNjEsMTMgKzYxLDEz IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0KToKICAgICBpbmRlZmluaXRlbHkuIFRoZSBj bGFzcyBhbHNvIGhhbmRsZXMgdHJhbnNwYXJlbnRseSByZXN0YXJ0aW5nIHByb2Nlc3NlcwogICAg IGFzIG5lY2Vzc2FyeSB0byBrZWVwIGlzc3VpbmcgY29tbWFuZHMuIiIiCiAKLSAgICBkZWYgX19p bml0X18oc2VsZiwgcG9ydF9vYmosIG5hbWUsIGNtZCwgZW52PU5vbmUsIGV4ZWN1dGl2ZT1FeGVj dXRpdmUoKSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnRfb2JqLCBuYW1lLCBjbWQsIGVu dj1Ob25lKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnRfb2JqCiAgICAgICAgIHNlbGYuX25h bWUgPSBuYW1lICAjIFNob3VsZCBiZSB0aGUgY29tbWFuZCBuYW1lIChlLmcuIER1bXBSZW5kZXJU cmVlLCBJbWFnZURpZmYpCiAgICAgICAgIHNlbGYuX2NtZCA9IGNtZAogICAgICAgICBzZWxmLl9l bnYgPSBlbnYKKyAgICAgICAgc2VsZi5faG9zdCA9IHNlbGYuX3BvcnQuaG9zdAogICAgICAgICBz ZWxmLl9yZXNldCgpCi0gICAgICAgIHNlbGYuX2V4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZQogCiAgICAg ICAgICMgU2VlIGNvbW1lbnQgaW4gaW1wb3J0cyBmb3Igd2h5IHdlIG5lZWQgdGhlIHdpbjMyIEFQ SXMgYW5kIGNhbid0IGp1c3QgdXNlIHNlbGVjdC4KICAgICAgICAgIyBGSVhNRTogdGhlcmUgc2hv dWxkIGJlIGEgd2F5IHRvIGdldCB3aW4zMiB2cy4gY3lnd2luIGZyb20gcGxhdGZvcm1pbmZvLgpA QCAtOTQsNyArOTQsNyBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAg ICByYWlzZSBWYWx1ZUVycm9yKCIlcyBhbHJlYWR5IHJ1bm5pbmciICUgc2VsZi5fbmFtZSkKICAg ICAgICAgc2VsZi5fcmVzZXQoKQogICAgICAgICAjIGNsb3NlX2ZkcyBpcyBhIHdvcmthcm91bmQg Zm9yIGh0dHA6Ly9idWdzLnB5dGhvbi5vcmcvaXNzdWUyMzIwCi0gICAgICAgIGNsb3NlX2ZkcyA9 IHN5cy5wbGF0Zm9ybSBub3QgaW4gKCd3aW4zMicsICdjeWd3aW4nKQorICAgICAgICBjbG9zZV9m ZHMgPSBub3Qgc2VsZi5faG9zdC5wbGF0Zm9ybS5pc193aW4oKQogICAgICAgICBzZWxmLl9wcm9j ID0gc3VicHJvY2Vzcy5Qb3BlbihzZWxmLl9jbWQsIHN0ZGluPXN1YnByb2Nlc3MuUElQRSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQ RSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RkZXJyPXN1YnByb2Nl c3MuUElQRSwKQEAgLTE5Myw3ICsxOTMsNiBAQCBjbGFzcyBTZXJ2ZXJQcm9jZXNzKG9iamVjdCk6 CiAgICAgICAgIF9sb2cuaW5mbygnJykKICAgICAgICAgX2xvZy5pbmZvKG1lc3NhZ2UpCiAKLQog ICAgIGRlZiBfaGFuZGxlX3RpbWVvdXQoc2VsZik6CiAgICAgICAgIHNlbGYudGltZWRfb3V0ID0g VHJ1ZQogICAgICAgICBzZWxmLl9wb3J0LnNhbXBsZV9wcm9jZXNzKHNlbGYuX25hbWUsIHNlbGYu X3Byb2MucGlkKQpAQCAtMjk4LDcgKzI5Nyw3IEBAIGNsYXNzIFNlcnZlclByb2Nlc3Mob2JqZWN0 KToKICAgICAgICAgc2VsZi5fcHJvYy5zdGRvdXQuY2xvc2UoKQogICAgICAgICBpZiBzZWxmLl9w cm9jLnN0ZGVycjoKICAgICAgICAgICAgIHNlbGYuX3Byb2Muc3RkZXJyLmNsb3NlKCkKLSAgICAg ICAgaWYgc3lzLnBsYXRmb3JtIG5vdCBpbiAoJ3dpbjMyJywgJ2N5Z3dpbicpOgorICAgICAgICBp ZiBub3Qgc2VsZi5faG9zdC5wbGF0Zm9ybS5pc193aW4oKToKICAgICAgICAgICAgICMgQ2xvc2lu ZyBzdGRpbi9zdGRvdXQvc3RkZXJyIGhhbmdzIHNvbWV0aW1lcyBvbiBPUyBYLAogICAgICAgICAg ICAgIyAoc2VlIHJlc3RhcnQoKSwgYWJvdmUpLCBhbmQgYW55d2F5IHdlIGRvbid0IHdhbnQgdG8g aGFuZwogICAgICAgICAgICAgIyB0aGUgaGFybmVzcyBpZiBEdW1wUmVuZGVyVHJlZSBpcyBidWdn eSwgc28gd2Ugd2FpdCBhIGNvdXBsZQpAQCAtMzE2LDcgKzMxNSw3IEBAIGNsYXNzIFNlcnZlclBy b2Nlc3Mob2JqZWN0KToKIAogICAgIGRlZiBraWxsKHNlbGYpOgogICAgICAgICBpZiBzZWxmLl9w cm9jOgotICAgICAgICAgICAgc2VsZi5fZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9wcm9j LnBpZCkKKyAgICAgICAgICAgIHNlbGYuX2hvc3QuZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxm Ll9wcm9jLnBpZCkKICAgICAgICAgICAgIGlmIHNlbGYuX3Byb2MucG9sbCgpIGlzIG5vdCBOb25l OgogICAgICAgICAgICAgICAgIHNlbGYuX3Byb2Mud2FpdCgpCiAgICAgICAgICAgICBzZWxmLl9y ZXNldCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9zZXJ2ZXJfcHJvY2Vzc191bml0dGVzdC5weQppbmRleCAyMTJkNzY1 ZWJmODRjOTAyMDY5NTIzY2ZhNjI4YTAxZDcwMjkwMDIxLi40MjU3ZDU0NTUzZTMyZmFjZjg5YjI5 MjhjMmU4MTJhOGZjMTkxODMzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3NlcnZlcl9wcm9jZXNzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvc2VydmVyX3Byb2Nlc3NfdW5pdHRlc3Qu cHkKQEAgLTMyLDE0ICszMiwxNiBAQCBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMucG9ydC5mYWN0b3J5IGltcG9ydCBQb3J0RmFjdG9yeQogZnJvbSB3ZWJraXRw eS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgc2VydmVyX3Byb2Nlc3MKLWZyb20gd2Via2l0cHku Y29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCi1mcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1wb3J0IE1vY2tFeGVjdXRpdmUyCiBmcm9t IHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBvcnQgU3lzdGVtSG9zdAorZnJv bSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnN5c3RlbWhvc3RfbW9jayBpbXBvcnQgTW9ja1N5c3Rl bUhvc3QKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRwdXRjYXB0dXJlIGltcG9ydCBP dXRwdXRDYXB0dXJlCiAKIAogCiBjbGFzcyBUcml2aWFsTW9ja1BvcnQob2JqZWN0KToKKyAgICBk ZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIHNlbGYuaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KCkK KwogICAgIGRlZiByZXN1bHRzX2RpcmVjdG9yeShzZWxmKToKICAgICAgICAgcmV0dXJuICIvbW9j ay1yZXN1bHRzIgogCkBAIC0xMDcsNyArMTA5LDE3IEBAIGNsYXNzIFRlc3RTZXJ2ZXJQcm9jZXNz KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcHJvYy5zdG9wKCkKIAogICAgIGRlZiB0ZXN0 X2Jyb2tlbl9waXBlKHNlbGYpOgotICAgICAgICBzZXJ2ZXJfcHJvY2VzcyA9IEZha2VTZXJ2ZXJQ cm9jZXNzKHBvcnRfb2JqPVRyaXZpYWxNb2NrUG9ydCgpLCBuYW1lPSJ0ZXN0IiwgY21kPVsidGVz dCJdKQorICAgICAgICBwb3J0X29iaiA9IFRyaXZpYWxNb2NrUG9ydCgpCisKKyAgICAgICAgcG9y dF9vYmouaG9zdC5wbGF0Zm9ybS5vc19uYW1lID0gJ3dpbicKKyAgICAgICAgc2VydmVyX3Byb2Nl c3MgPSBGYWtlU2VydmVyUHJvY2Vzcyhwb3J0X29iaj1wb3J0X29iaiwgbmFtZT0idGVzdCIsIGNt ZD1bInRlc3QiXSkKKyAgICAgICAgc2VydmVyX3Byb2Nlc3Mud3JpdGUoInNob3VsZCBicmVhayIp CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZXJ2ZXJfcHJvY2Vzcy5oYXNfY3Jhc2hlZCgpKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZXJ2ZXJfcHJvY2Vzcy5fcHJvYywgTm9uZSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VydmVyX3Byb2Nlc3MuYnJva2VuX3BpcGVzLCBbc2Vy dmVyX3Byb2Nlc3Muc3RkaW5dKQorCisgICAgICAgIHBvcnRfb2JqLmhvc3QucGxhdGZvcm0ub3Nf bmFtZSA9ICdtYWMnCisgICAgICAgIHNlcnZlcl9wcm9jZXNzID0gRmFrZVNlcnZlclByb2Nlc3Mo cG9ydF9vYmo9cG9ydF9vYmosIG5hbWU9InRlc3QiLCBjbWQ9WyJ0ZXN0Il0pCiAgICAgICAgIHNl cnZlcl9wcm9jZXNzLndyaXRlKCJzaG91bGQgYnJlYWsiKQogICAgICAgICBzZWxmLmFzc2VydFRy dWUoc2VydmVyX3Byb2Nlc3MuaGFzX2NyYXNoZWQoKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bHMoc2VydmVyX3Byb2Nlc3MuX3Byb2MsIE5vbmUpCg==