76475 2012-01-17 12:39:46 -0800 investigate use of 'mac' and 'win' as fully-specified port names for the apple ports 2012-01-25 17:29:26 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75037 1 dpranke dpranke abarth ap aroben eric ojan webkit.review.bot oldest_to_newest 537297 0 dpranke 2012-01-17 12:39:46 -0800 With all the cleanup of creating Port objects in webkitpy, I have tried to distinguish between 'port name as short hand for the version of this implementation appropriate for the platform I'm running on' and 'a fully-specified port name', for example, 'chromium-mac' vs. 'chromium-mac-leopard'. Most places in the code outside of NRWT should only every use the latter kind of port names. However, it looks like there are places in the code that rely on being able to say 'mac' and 'win', and it is now ambiguous what they is supposed to refer to. I am filing this bug to track the tests that fail and ensure that 'mac' and 'win' are not considered fully specified names anywhere any longer. 537302 1 eric 2012-01-17 12:48:01 -0800 Where would these aliases be needed? Can we just use the Port objects directly? Port objects seem to be moving away from having any real logic in them and just being (relatively lightweight) configuration objects, right? 537304 2 dpranke 2012-01-17 12:52:49 -0800 (In reply to comment #1) > Where would these aliases be needed? Can we just use the Port objects directly? > On the command line of NRWT, so, no :) (--platform chromium is functionally equivalent to --chromium, and in fact the latter is implemented in terms of the former). > Port objects seem to be moving away from having any real logic in them and just being (relatively lightweight) configuration objects, right? Sort of? There's a fair amount of heavy lifting in the base Port class, and some of those things do get overridden (e.g., diff_image in chromium.py to deal with the fact that Chromium's ImageDiff is quite different from the one the other ports use). My hope is to eventually remove most of the chromium'isms, though. 537305 3 eric 2012-01-17 12:54:49 -0800 I don't think anyone ever uses --platform=mac or --platform=win, since those are the default behavior on those operating systems anyway. 537309 4 eric 2012-01-17 12:58:19 -0800 (Btw, I'm not arguing against any proposed change, just letting you know that as I understand this bug, it's likely no change is necessary. I'm happy to drop support for the command line flags --platform=mac/--platform=win entirely, since I doubt they're used at all.) 537315 5 dpranke 2012-01-17 13:01:20 -0800 (In reply to comment #4) > (Btw, I'm not arguing against any proposed change, just letting you know that as I understand this bug, it's likely no change is necessary. I'm happy to drop support for the command line flags --platform=mac/--platform=win entirely, since I doubt they're used at all.) Oh, I agree, in the mac/win case. But there are tests that fail if I make 'mac' and 'win' illegal, so those tests need to be fixed: that's what this bug is for. That, and I need to confirm w/ aroben or somebody that 'mac' and 'win' are not considered legal fully-specified port names, period. 541077 6 123689 dpranke 2012-01-23 19:15:11 -0800 Created attachment 123689 Patch 541080 7 123689 dpranke 2012-01-23 19:20:59 -0800 Comment on attachment 123689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123689&action=review > Tools/Scripts/webkitpy/layout_tests/port/apple.py:55 > + assert port_name == host.platform.os_name Note the new assertions here and on line 58. > Tools/Scripts/webkitpy/layout_tests/port/apple.py:73 > + port_name = port_name.replace('-wk2', '') This logic is a bit goofy and the assertion error on line 81 is actually wrong (since it doesn't list the -wk2 variants. At some point it might just be easier and clearer to keep static lists of all of the port names and just add to them when we add new variants. > Tools/Scripts/webkitpy/layout_tests/port/apple.py:77 > + # FIXME: A more sophisticated version of this function should move to WebKitPort and replace all calls to name(). I'm not actually sure how such a thing would work, or if it would be worth it. > Tools/Scripts/webkitpy/layout_tests/port/builders.py:69 > + "Windows 7 Release (WebKit2 Tests)": {"port_name": "win-future-wk2", "specifiers": set(["wk2"])}, These lines had to change since 'mac-wk2' and 'win-wk2' don't actually tell you which version things are (they're not fully-specified). > Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py:70 > + self.assert_port(port_name='win', os_name='win', os_version='xp', cls=win.WinPort) These lines had to change since it's no longer legal to say 'mac' on a non-mac host. > Tools/Scripts/webkitpy/layout_tests/port/mac.py:55 > + fallback_names = list(self.VERSION_FALLBACK_ORDER[fallback_index:]) Here and below, note that old versions will no longer be siliently allowed (we now also have tests for this). 542697 8 123689 eric 2012-01-25 15:30:36 -0800 Comment on attachment 123689 Patch This feels a little hacky, but I think it's moving us in the right direction. Thank you. And thnak you again for bringing me up to speed on IRC. 542809 9 dpranke 2012-01-25 17:29:26 -0800 Committed r105951: <http://trac.webkit.org/changeset/105951> 123689 2012-01-23 19:15:11 -0800 2012-01-25 15:30:36 -0800 Patch bug-76475-20120123191510.patch text/plain 11946 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Njc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzQ4Zjg2OTFjNDU0NjgzNWE4ZDc2M2E1YzA0YTI3Yzgw NzJmYjg3ZS4uNzdmYmExOTMxOWZhMWJhOGRiNTgyYzVjNGVkYTA5MDU3MTVlYzg5ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ4 IEBACiAyMDEyLTAxLTIzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIGludmVzdGlnYXRlIHVzZSBvZiAnbWFjJyBhbmQgJ3dpbicgYXMgZnVsbHktc3BlY2lm aWVkIHBvcnQgbmFtZXMgZm9yIHRoZSBhcHBsZSBwb3J0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY0NzUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNsZWFucyB1cCB0aGUgaW50ZXJu YWwgdXNhZ2Ugb2YgcG9ydCBuYW1lcyBmb3IgdGhlCisgICAgICAgIEFwcGxlIG1hYyBhbmQgQXBw bGUgd2luIHBvcnRzIHNvIHRoYXQgJ21hYycgYW5kICd3aW4gYXJlIG5ldmVyCisgICAgICAgIGNv bnNpZGVyZWQgImZ1bGx5IHNwZWNpZmllZCIgcG9ydCBuYW1lczogdGhleSBhcmUgc3RpbGwgbGVn YWwKKyAgICAgICAgaW5wdXQgdG8gdGhlIFBvcnRGYWN0b3J5LmdldCgpIHJvdXRpbmUsIGJ1dCBv bmx5IGlmIHJ1biBvbiB0aGUgZ2l2ZW4KKyAgICAgICAgcGxhdGZvcm0gKGkuZS4gdHJ5aW5nIHRv IFBvcnRGYWN0b3J5LmdldCgnbWFjJykgb24gd2luZG93cyBvcgorICAgICAgICBsaW51eCB3aWxs IHJldHVybiBhbiBlcnJvciwgc2luY2Ugd2UgZG9uJ3Qga25vdyB3aGljaCB2ZXJzaW9uIG9mCisg ICAgICAgIHRoZSBwb3J0IGlzIGRlc2lyZWQuCisKKyAgICAgICAgVGhpcyBhbHNvIGNsZWFucyB1 cCBoYW5kbGluZyBvZiB0aGUgd2Via2l0MiB2YXJpYW50cywgc28gdGhhdAorICAgICAgICB0aGUg ZnVsbCBwb3J0IG5hbWVzIGNvbnNpc3RlbnRseSBmb2xsb3cgdGhlCisgICAgICAgIDxvcGVyYXRp bmdfc3lzdGVtPi08dmVyc2lvbj5bLTx3azI+XSBjb252ZW50aW9uLgorCisgICAgICAgIExhc3Rs eSB0aGlzIHBhdGNoIGFkZHMgc29tZSBhc3NlcnRpb25zIGFuZCByZW1vdmVzIHNvbWUKKyAgICAg ICAgdHJ5L2NhdGNoIGxvZ2ljIHRvIGNhdGNoIG1vcmUgcHJvZ3JhbW1pbmcgYW5kIHVzYWdlIGVy cm9yczsKKyAgICAgICAgcHJldmlvdXNseSBtYWMtdGlnZXIgbWlnaHQndmUgYmVlbiBhbGxvd2Vk IC0tIGFuZCBpdCB3b3VsZCd2ZQorICAgICAgICB0cmFuc2xhdGVkIGludG8gdXNpbmcganVzdCB0 aGUgYmFzZWxpbmVzIGluIHBsYXRmb3JtL21hYyAtLSBidXQKKyAgICAgICAgbm93IGl0IHNob3Vs ZCBmYWlsLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9h cHBsZS5weToKKyAgICAgICAgKEFwcGxlUG9ydC5kZXRlcm1pbmVfZnVsbF9wb3J0X25hbWUpOgor ICAgICAgICAoQXBwbGVQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKEFwcGxlUG9ydCk6CisgICAg ICAgIChBcHBsZVBvcnQuX3BvcnRfbmFtZV93aXRoX3ZlcnNpb24pOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYnVpbGRlcnMucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0LnB5OgorICAg ICAgICAoRmFjdG9yeVRlc3QudGVzdF9tYWMpOgorICAgICAgICAoRmFjdG9yeVRlc3QudGVzdF93 aW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbWFjLnB5 OgorICAgICAgICAoTWFjUG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAgICAg IChNYWNUZXN0LnRlc3RfdmVyc2lvbnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2luLnB5OgorICAgICAgICAoV2luUG9ydC5iYXNlbGluZV9zZWFyY2hf cGF0aCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW5f dW5pdHRlc3QucHk6CisgICAgICAgIChXaW5UZXN0LnRlc3RfdmVyc2lvbnMpOgorCisyMDEyLTAx LTIzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6 IG1ha2UgLS1jaHJvbWl1bSB3b3JrIGxpa2UgLS1xdAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY4NzUKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9hcHBsZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYXBwbGUucHkKaW5kZXggZjBiZWZlOTFiYTljODllNDc0 NjE5NDQwY2M2MzM2N2U1ODc5MjBmMS4uYWM0MjVjOTZlZGJhZGFlYWFjMzg3ZmU0OTNlZDUwMTcx NjQ4NzRhYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9hcHBsZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2FwcGxlLnB5CkBAIC01MSwyMCArNTEsMTIgQEAgY2xhc3MgQXBwbGVQb3J0KFdlYktpdFBv cnQpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGRldGVybWluZV9mdWxsX3BvcnRfbmFt ZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6Ci0gICAgICAgIGlmIHBvcnRfbmFtZS5l bmRzd2l0aCgnLXdrMicpOgotICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBtYXkgYmUgd3Jvbmcs IHNpbmNlIG9wdGlvbnMgaXMgYSBnbG9iYWwgcHJvcGVydHksIGFuZCB0aGUgcG9ydF9uYW1lIGlz IHNwZWNpZmljIHRvIHRoaXMgb2JqZWN0PwotICAgICAgICAgICAgaWYgb3B0aW9ucyBhbmQgbm90 IGhhc2F0dHIob3B0aW9ucywgJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgotICAgICAgICAgICAgICAg IG9wdGlvbnMud2Via2l0X3Rlc3RfcnVubmVyID0gVHJ1ZQotICAgICAgICAgICAgcG9ydF9uYW1l ID0gcG9ydF9uYW1lLnJlcGxhY2UoJy13azInLCAnJykKICAgICAgICAgaWYgcG9ydF9uYW1lID09 IGNscy5wb3J0X25hbWU6Ci0gICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGFsbW9zdCBjZXJ0 YWlubHkgd3Jvbmc7IHdlIHNob3VsZG4ndCBiZSByZXR1cm5pbmcgYSBwb3J0IG5hbWUgYXQgYWxs Ci0gICAgICAgICAgICAjIGlmIHdlJ3JlIG9uIHRoZSB3cm9uZyBwbGF0Zm9ybSBhbmQgaXQgaXNu J3QgZnVsbHkgc3BlY2lmaWVkLiBBbHNvLCAnbWFjJyBhbmQgJ3dpbicKLSAgICAgICAgICAgICMg c2hvdWxkbid0IGJlIGxlZ2FsIHBvcnQgbmFtZXMsIHNpbmNlIHdlIGNhbid0IGRpc3Rpbmd1aXNo IHRoZW0gZnJvbSB1bmRlcnNwZWNpZmllZAotICAgICAgICAgICAgIyBhYmJyZXZpYXRpb25zIChp LmUuLCBkb2VzICdtYWMnIHJlZmVyIHRvICdtYWMtZnV0dXJlJyBvciAndGhlIHZlcnNpb24gb2Yg bWFjIG1hdGNoaW5nIHRoZQotICAgICAgICAgICAgIyB2ZXJzaW9uIG9mIHRoZSBvcGVyYXRpbmcg c3lzdGVtIG9uIHRoZSBob3N0IG1hY2hpbmUnPykuCi0gICAgICAgICAgICBpZiBwb3J0X25hbWUg IT0gaG9zdC5wbGF0Zm9ybS5vc19uYW1lOgotICAgICAgICAgICAgICAgIHJldHVybiBwb3J0X25h bWUKLSAgICAgICAgICAgIHJldHVybiBwb3J0X25hbWUgKyAnLScgKyBob3N0LnBsYXRmb3JtLm9z X3ZlcnNpb24KKyAgICAgICAgICAgIGFzc2VydCBwb3J0X25hbWUgPT0gaG9zdC5wbGF0Zm9ybS5v c19uYW1lCisgICAgICAgICAgICByZXR1cm4gY2xzLnBvcnRfbmFtZSArICctJyArIGhvc3QucGxh dGZvcm0ub3NfdmVyc2lvbgorICAgICAgICBpZiBwb3J0X25hbWUgPT0gY2xzLnBvcnRfbmFtZSAr ICctd2syJzoKKyAgICAgICAgICAgIGFzc2VydCBwb3J0X25hbWUgPT0gaG9zdC5wbGF0Zm9ybS5v c19uYW1lCisgICAgICAgICAgICByZXR1cm4gY2xzLnBvcnRfbmFtZSArICctJyArIGhvc3QucGxh dGZvcm0ub3NfdmVyc2lvbiArICctd2syJwogICAgICAgICByZXR1cm4gcG9ydF9uYW1lCiAKICAg ICBkZWYgX3N0cmlwX3BvcnRfbmFtZV9wcmVmaXgoc2VsZiwgcG9ydF9uYW1lKToKQEAgLTc4LDE1 ICs3MCwxNCBAQCBjbGFzcyBBcHBsZVBvcnQoV2ViS2l0UG9ydCk6CiAgICAgICAgIFdlYktpdFBv cnQuX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJncykKIAogICAgICAgICBh bGxvd2VkX3BvcnRfbmFtZXMgPSBzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVIgKyBbc2VsZi5v cGVyYXRpbmdfc3lzdGVtKCkgKyAiLWZ1dHVyZSJdCisgICAgICAgIHBvcnRfbmFtZSA9IHBvcnRf bmFtZS5yZXBsYWNlKCctd2syJywgJycpCiAgICAgICAgIGFzc2VydCBwb3J0X25hbWUgaW4gYWxs b3dlZF9wb3J0X25hbWVzLCAiJXMgaXMgbm90IGluICVzIiAlIChwb3J0X25hbWUsIGFsbG93ZWRf cG9ydF9uYW1lcykKICAgICAgICAgc2VsZi5fdmVyc2lvbiA9IHNlbGYuX3N0cmlwX3BvcnRfbmFt ZV9wcmVmaXgocG9ydF9uYW1lKQogCi0gICAgIyBGSVhNRTogQSBtb3JlIHNvcGhpc2l0Y2F0ZWQg dmVyc2lvbiBvZiB0aGlzIGZ1bmN0aW9uIHNob3VsZCBtb3ZlIHRvIFdlYktpdFBvcnQgYW5kIHJl cGxhY2UgYWxsIGNhbGxzIHRvIG5hbWUoKS4KKyAgICAjIEZJWE1FOiBBIG1vcmUgc29waGlzdGlj YXRlZCB2ZXJzaW9uIG9mIHRoaXMgZnVuY3Rpb24gc2hvdWxkIG1vdmUgdG8gV2ViS2l0UG9ydCBh bmQgcmVwbGFjZSBhbGwgY2FsbHMgdG8gbmFtZSgpLgorICAgICMgVGhpcyBpcyBhbHNvIGEgbWlz bGVhZGluZyBuYW1lLCBzaW5jZSAnbWFjLWZ1dHVyZScgZ2V0cyByZW1hcHBlZCB0byAnbWFjJy4K ICAgICBkZWYgX3BvcnRfbmFtZV93aXRoX3ZlcnNpb24oc2VsZik6Ci0gICAgICAgIGNvbXBvbmVu dHMgPSBbc2VsZi5wb3J0X25hbWVdCi0gICAgICAgIGlmIHNlbGYuX3ZlcnNpb24gIT0gc2VsZi5G VVRVUkVfVkVSU0lPTjoKLSAgICAgICAgICAgIGNvbXBvbmVudHMuYXBwZW5kKHNlbGYuX3ZlcnNp b24pCi0gICAgICAgIHJldHVybiAnLScuam9pbihjb21wb25lbnRzKQorICAgICAgICByZXR1cm4g c2VsZi5uYW1lKCkucmVwbGFjZSgnLWZ1dHVyZScsICcnKS5yZXBsYWNlKCctd2syJywgJycpCiAK ICAgICBkZWYgX2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKHNlbGYpOgogICAgICAg ICBjb25maWd1cmF0aW9ucyA9IFtdCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2J1aWxkZXJzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9idWlsZGVycy5weQppbmRleCBmMDViYWY5YWQ2MDYwYTc0NzI1NTA2 MmI5MDZhMjM1NTI1YmZjZWE5Li40MmZlZDUwYjI1MzE3OThmZjNlYzgwYmY2MWE0MDIyYTEwYTRj YjM1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2J1aWxkZXJzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYnVpbGRlcnMucHkKQEAgLTYzLDEwICs2MywxMCBAQCBfZXhhY3RfbWF0Y2hlcyA9IHsKICAg ICAiR1RLIExpbnV4IDMyLWJpdCBEZWJ1ZyI6IHsicG9ydF9uYW1lIjogImd0ayIsICJzcGVjaWZp ZXJzIjogc2V0KFsiZ3RrIl0pfSwKICAgICAiTGVvcGFyZCBJbnRlbCBEZWJ1ZyAoVGVzdHMpIjog eyJwb3J0X25hbWUiOiAibWFjLWxlb3BhcmQiLCAic3BlY2lmaWVycyI6IHNldChbImxlb3BhcmQi XSl9LAogICAgICJTbm93TGVvcGFyZCBJbnRlbCBSZWxlYXNlIChUZXN0cykiOiB7InBvcnRfbmFt ZSI6ICJtYWMtc25vd2xlb3BhcmQiLCAic3BlY2lmaWVycyI6IHNldChbInNub3dsZW9wYXJkIl0p fSwKLSAgICAiU25vd0xlb3BhcmQgSW50ZWwgUmVsZWFzZSAoV2ViS2l0MiBUZXN0cykiOiB7InBv cnRfbmFtZSI6ICJtYWMtd2syIiwgInNwZWNpZmllcnMiOiBzZXQoWyJ3azIiXSl9LAorICAgICJT bm93TGVvcGFyZCBJbnRlbCBSZWxlYXNlIChXZWJLaXQyIFRlc3RzKSI6IHsicG9ydF9uYW1lIjog Im1hYy1zbm93bGVvcGFyZC13azIiLCAic3BlY2lmaWVycyI6IHNldChbIndrMiJdKX0sCiAgICAg IlF0IExpbnV4IFJlbGVhc2UiOiB7InBvcnRfbmFtZSI6ICJxdC1saW51eCIsICJzcGVjaWZpZXJz Ijogc2V0KFsid2luIiwgImxpbnV4IiwgIm1hYyJdKX0sCiAgICAgIldpbmRvd3MgWFAgRGVidWcg KFRlc3RzKSI6IHsicG9ydF9uYW1lIjogIndpbi14cCIsICJzcGVjaWZpZXJzIjogc2V0KFsid2lu Il0pfSwKLSAgICAiV2luZG93cyA3IFJlbGVhc2UgKFdlYktpdDIgVGVzdHMpIjogeyJwb3J0X25h bWUiOiAid2luLXdrMiIsICJzcGVjaWZpZXJzIjogc2V0KFsid2syIl0pfSwKKyAgICAiV2luZG93 cyA3IFJlbGVhc2UgKFdlYktpdDIgVGVzdHMpIjogeyJwb3J0X25hbWUiOiAid2luLWZ1dHVyZS13 azIiLCAic3BlY2lmaWVycyI6IHNldChbIndrMiJdKX0sCiB9CiAKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0ZXN0LnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5X3VuaXR0 ZXN0LnB5CmluZGV4IGMxOTk2MjY3MjE0YjZmNjg2Y2EzOGE4NDMzMWE0OWQ1MjY4YmU1NjkuLjg4 Mjg1MTg1ZjdiMzdkNDY0YjU4MTdjY2VkNzAxOWY2YzhiOWYwNzAgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZmFjdG9yeV91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnlfdW5p dHRlc3QucHkKQEAgLTU5LDExICs1OSwxNSBAQCBjbGFzcyBGYWN0b3J5VGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShpc2luc3RhbmNlKHBvcnQsIGNscykp CiAKICAgICBkZWYgdGVzdF9tYWMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQocG9y dF9uYW1lPSdtYWMnLCBjbHM9bWFjLk1hY1BvcnQpCisgICAgICAgIHNlbGYuYXNzZXJ0X3BvcnQo cG9ydF9uYW1lPSdtYWMtbGVvcGFyZCcsIGNscz1tYWMuTWFjUG9ydCkKKyAgICAgICAgc2VsZi5h c3NlcnRfcG9ydChwb3J0X25hbWU9J21hYy1sZW9wYXJkLXdrMicsIGNscz1tYWMuTWFjUG9ydCkK KyAgICAgICAgc2VsZi5hc3NlcnRfcG9ydChwb3J0X25hbWU9J21hYycsIG9zX25hbWU9J21hYycs IG9zX3ZlcnNpb249J2xlb3BhcmQnLCBjbHM9bWFjLk1hY1BvcnQpCiAgICAgICAgIHNlbGYuYXNz ZXJ0X3BvcnQocG9ydF9uYW1lPU5vbmUsICBvc19uYW1lPSdtYWMnLCBvc192ZXJzaW9uPSdsZW9w YXJkJywgY2xzPW1hYy5NYWNQb3J0KQogCiAgICAgZGVmIHRlc3Rfd2luKHNlbGYpOgotICAgICAg ICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nd2luJywgY2xzPXdpbi5XaW5Qb3J0KQorICAg ICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nd2luLXhwJywgY2xzPXdpbi5XaW5Qb3J0 KQorICAgICAgICBzZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT0nd2luLXhwLXdrMicsIGNscz13 aW4uV2luUG9ydCkKKyAgICAgICAgc2VsZi5hc3NlcnRfcG9ydChwb3J0X25hbWU9J3dpbicsIG9z X25hbWU9J3dpbicsIG9zX3ZlcnNpb249J3hwJywgY2xzPXdpbi5XaW5Qb3J0KQogICAgICAgICBz ZWxmLmFzc2VydF9wb3J0KHBvcnRfbmFtZT1Ob25lLCBvc19uYW1lPSd3aW4nLCBvc192ZXJzaW9u PSd4cCcsIGNscz13aW4uV2luUG9ydCkKICAgICAgICAgc2VsZi5hc3NlcnRfcG9ydChwb3J0X25h bWU9Tm9uZSwgb3NfbmFtZT0nd2luJywgb3NfdmVyc2lvbj0neHAnLCBvcHRpb25zPXNlbGYud2Vi a2l0X29wdGlvbnMsIGNscz13aW4uV2luUG9ydCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQppbmRleCBmYzE5MjVjOTFlYjdhMWNlYTI0YjY0 NzJiOTM2MGQzODE3NzNmM2U2Li5lMjNmYjgyY2M3MTMwNjBlYzExNmRmODMyNGFiNGM2N2VkMDU3 M2FhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L21hYy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21h Yy5weQpAQCAtNTEsMTIgKzUxLDggQEAgY2xhc3MgTWFjUG9ydChBcHBsZVBvcnQpOgogICAgICAg ICAgICAgc2VsZi5zZXRfb3B0aW9uX2RlZmF1bHQoImJhdGNoX3NpemUiLCAxMDAwKQogCiAgICAg ZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICB0cnk6Ci0gICAgICAgICAg ICBmYWxsYmFja19pbmRleCA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUi5pbmRleChzZWxm Ll9wb3J0X25hbWVfd2l0aF92ZXJzaW9uKCkpCi0gICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9 IGxpc3Qoc2VsZi5WRVJTSU9OX0ZBTExCQUNLX09SREVSW2ZhbGxiYWNrX2luZGV4Ol0pCi0gICAg ICAgIGV4Y2VwdCBWYWx1ZUVycm9yOgotICAgICAgICAgICAgIyBVbmtub3duIHZlcnNpb25zIGp1 c3QgZmFsbCBiYWNrIHRvIHRoZSBiYXNlIHBvcnQgcmVzdWx0cy4KLSAgICAgICAgICAgIGZhbGxi YWNrX25hbWVzID0gW3NlbGYucG9ydF9uYW1lXQorICAgICAgICBmYWxsYmFja19pbmRleCA9IHNl bGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUi5pbmRleChzZWxmLl9wb3J0X25hbWVfd2l0aF92ZXJz aW9uKCkpCisgICAgICAgIGZhbGxiYWNrX25hbWVzID0gbGlzdChzZWxmLlZFUlNJT05fRkFMTEJB Q0tfT1JERVJbZmFsbGJhY2tfaW5kZXg6XSkKICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3 ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzLmluc2VydCgw LCBzZWxmLl93azJfcG9ydF9uYW1lKCkpCiAgICAgICAgICAgICAjIE5vdGUgd2UgZG8gbm90IGFk ZCAnd2syJyBoZXJlLCBldmVuIHRob3VnaCBpdCdzIGluY2x1ZGVkIGluIF9za2lwcGVkX3NlYXJj aF9wYXRocygpLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9tYWNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L21hY191bml0dGVzdC5weQppbmRleCA3Mzc2NjI5NmM0ZWMzNzA4YmIzYzE1ODVi NzY3YmQ3ZTJhNTE3ZWEzLi40M2E4MDA4MzlkMzJjMGE5Yjk0MmQ0ZWZiMGQxMDhhNTI0MDAyNDFm IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21h Y191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L21hY191bml0dGVzdC5weQpAQCAtMTE0LDYgKzExNCw4IEBAIGphdmEvCiAgICAgICAgIHNl bGYuYXNzZXJ0X25hbWUoJ21hYycsICdmdXR1cmUnLCAnbWFjLWZ1dHVyZScpCiAgICAgICAgIHNl bGYuYXNzZXJ0X25hbWUoJ21hYy1mdXR1cmUnLCAnZnV0dXJlJywgJ21hYy1mdXR1cmUnKQogCisg ICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLmFzc2VydF9uYW1l LCAnbWFjLXRpZ2VyJywgJ2xlb3BhcmQnLCAnbWFjLWxlb3BhcmQnKQorCiAKICAgICBkZWYgdGVz dF9pc192ZXJzaW9uX21ldGhvZHMoc2VsZik6CiAgICAgICAgIGxlb3BhcmRfcG9ydCA9IHNlbGYu bWFrZV9wb3J0KHBvcnRfbmFtZT0nbWFjLWxlb3BhcmQnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dpbi5weQppbmRleCAzMjNiYzFkYmYzY2ViOWNkZjkz ZGQ3ODI2NTcxODI3OGM3MGIzZGM0Li5hYjcxMDNjZTMzMmYwZDE5YjU0YjIwMTE0YTU0ZTQwNjNj NmY0ZTk5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dpbi5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L3dpbi5weQpAQCAtNjAsMTIgKzYwLDggQEAgY2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogICAg ICAgICByZXR1cm4gZXhwZWN0ZWRfdGV4dCAhPSBhY3R1YWxfdGV4dAogCiAgICAgZGVmIGJhc2Vs aW5lX3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICB0cnk6Ci0gICAgICAgICAgICBmYWxsYmFj a19pbmRleCA9IHNlbGYuVkVSU0lPTl9GQUxMQkFDS19PUkRFUi5pbmRleChzZWxmLl9wb3J0X25h bWVfd2l0aF92ZXJzaW9uKCkpCi0gICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IGxpc3Qoc2Vs Zi5WRVJTSU9OX0ZBTExCQUNLX09SREVSW2ZhbGxiYWNrX2luZGV4Ol0pCi0gICAgICAgIGV4Y2Vw dCBWYWx1ZUVycm9yOgotICAgICAgICAgICAgIyBVbmtub3duIHZlcnNpb25zIGp1c3QgZmFsbCBi YWNrIHRvIHRoZSBiYXNlIHBvcnQgcmVzdWx0cy4KLSAgICAgICAgICAgIGZhbGxiYWNrX25hbWVz ID0gW3NlbGYucG9ydF9uYW1lXQorICAgICAgICBmYWxsYmFja19pbmRleCA9IHNlbGYuVkVSU0lP Tl9GQUxMQkFDS19PUkRFUi5pbmRleChzZWxmLl9wb3J0X25hbWVfd2l0aF92ZXJzaW9uKCkpCisg ICAgICAgIGZhbGxiYWNrX25hbWVzID0gbGlzdChzZWxmLlZFUlNJT05fRkFMTEJBQ0tfT1JERVJb ZmFsbGJhY2tfaW5kZXg6XSkKICAgICAgICAgIyBGSVhNRTogVGhlIEFwcGxlV2luIHBvcnQgZmFs bHMgYmFjayB0byBBcHBsZU1hYyBmb3Igc29tZSByZXN1bHRzLiAgRXZlbnR1YWxseSB3ZSdsbCBo YXZlIGEgc2hhcmVkICdhcHBsZScgcG9ydC4KICAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3 ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzLmluc2VydCgw LCAnd2luLXdrMicpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3dpbl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2luX3VuaXR0ZXN0LnB5CmluZGV4IGMwMTYwODM5ZGJjMWEyMTY2M2FkZTEx ZWFhNDYzNDAzOWM5YTU4NTYuLjc2MGY5OGQ5N2M3NTVhNjQxZmQ3YzhjZWFkNWRkMDcxNmVkMmYw OTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv d2luX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2luX3VuaXR0ZXN0LnB5CkBAIC04MCw2ICs4MCw3IEBAIGNsYXNzIFdpblBvcnRUZXN0 KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICAgICAgc2VsZi5fYXNzZXJ0X3ZlcnNp b24oJ3dpbi14cCcsICd4cCcpCiAgICAgICAgIHNlbGYuX2Fzc2VydF92ZXJzaW9uKCd3aW4tdmlz dGEnLCAndmlzdGEnKQogICAgICAgICBzZWxmLl9hc3NlcnRfdmVyc2lvbignd2luLTdzcDAnLCAn N3NwMCcpCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKEFzc2VydGlvbkVycm9yLCBzZWxmLl9h c3NlcnRfdmVyc2lvbiwgJ3dpbi1tZScsICd4cCcpCiAKICAgICBkZWYgdGVzdF9jb21wYXJlX3Rl eHQoc2VsZik6CiAgICAgICAgIGV4cGVjdGVkID0gIkVESVRJTkcgREVMRUdBVEU6IHdlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb246V2ViVmlld0RpZENoYW5nZVNlbGVjdGlvbk5vdGlmaWNhdGlvblxu Zm9vXG5FRElUSU5HIERFTEVHQVRFOiB3ZWJWaWV3RGlkQ2hhbmdlU2VsZWN0aW9uOldlYlZpZXdE aWRDaGFuZ2VTZWxlY3Rpb25Ob3RpZmljYXRpb25cbiIK