206194 2020-01-13 14:14:54 -0800 webkitpy: Pass ImageDiff commands in a single write 2020-01-14 22:57:11 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard ap ews-watchlist glenn slewis tsavell webkit-bug-importer oldest_to_newest 1606049 0 jbedard 2020-01-13 14:14:54 -0800 It seems that ImageDiff can get misaligned and timeout after the Python 3 transition. 1606050 1 387566 jbedard 2020-01-13 14:17:40 -0800 Created attachment 387566 Patch 1606208 2 ap 2020-01-13 19:31:20 -0800 The patch appears incomplete. But also, how can this be caused by Python3, does this imply a bug elsewhere. 1606409 3 jbedard 2020-01-14 08:50:33 -0800 (In reply to Alexey Proskuryakov from comment #2) > The patch appears incomplete. But also, how can this be caused by Python3, > does this imply a bug elsewhere. The uploaded patch was actually intended to test EWS. The bug is real, though. I think this could be caused by a bug elsewhere (especially since it flakily reproduces), but I can bisect this to the Python 3 compatibility change, and I've made some significant progress towards narrowing down what part of that change actually causes the problem. 1606442 4 ap 2020-01-14 09:30:01 -0800 It is also possible that the flakiness is caused by actually getting different results (e.g. there is a preceding test that changes color settings permanently, affecting subsequent tests). 1606466 5 jbedard 2020-01-14 10:21:04 -0800 (In reply to Alexey Proskuryakov from comment #4) > It is also possible that the flakiness is caused by actually getting > different results (e.g. there is a preceding test that changes color > settings permanently, affecting subsequent tests). The root cause seems to be comparing images with different sizes, though. I've narrowed it down to a few lines of code that have changed in image_diff.py, so I'll have a fix shortly. 1606474 6 ap 2020-01-14 10:42:37 -0800 if all of these are different sizes, we should also file a bug to get the tests fixed, it's not really OK for them to rely on automatic resizing. 1606488 7 jbedard 2020-01-14 11:28:40 -0800 (In reply to Alexey Proskuryakov from comment #6) > if all of these are different sizes, we should also file a bug to get the > tests fixed, it's not really OK for them to rely on automatic resizing. If it is the fault of the tests, then yes, we should/ But I'm not certain that's the root of the problem. I think the root of the problem might actually be ImageDiff getting tripped up when we feed it one image at a time instead of both images at the same time, ImageDiff is reporting one of the images to be exactly twice the size of the other. 1606517 8 387686 jbedard 2020-01-14 12:15:30 -0800 Created attachment 387686 Patch 1606555 9 webkit-bug-importer 2020-01-14 13:15:20 -0800 <rdar://problem/58578775> 1606563 10 jbedard 2020-01-14 13:32:13 -0800 Committed r254532: <https://trac.webkit.org/changeset/254532> 1606821 11 ap 2020-01-14 22:56:05 -0800 *** Bug 206179 has been marked as a duplicate of this bug. *** 1606822 12 ap 2020-01-14 22:57:11 -0800 > If it is the fault of the tests, then yes, we should/ But I'm not certain > that's the root of the problem. I agree that this is not the root of the problem at hand, but the tests are broken too, I don't think that they need to do this, or are allowed to. 387566 2020-01-13 14:17:40 -0800 2020-01-14 12:15:28 -0800 Patch bug-206194-20200113141739.patch text/plain 1280 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDQ1MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTAxLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogRml4IG1pcy1hbGlnbmVkIEltYWdlRGlmZgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MTk0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHk6CisgICAg ICAgIChTaW5nbGVUZXN0UnVubmVyLl9jb21wYXJlX291dHB1dCk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHk6CisgICAgICAgIChJbWFnZURpZmZlci5fcmVh ZCk6CisKIDIwMjAtMDEtMTMgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtFV1NdIEFkZCB1bml0IHRlc3RzIGZvciBmYWN0b3JpZXMKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5CShyZXZpc2lvbiAyNTQ0NTIpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQkod29ya2luZyBjb3B5 KQpAQCAtODUsNyArODUsNyBAQCBjbGFzcyBJbWFnZURpZmZlcihvYmplY3QpOgogICAgICAgICAg ICAgaWYgc2VsZi5fcHJvY2Vzcy50aW1lZF9vdXQgb3Igc2VsZi5fcHJvY2Vzcy5oYXNfY3Jhc2hl ZCgpIG9yIG5vdCBvdXRwdXQ6CiAgICAgICAgICAgICAgICAgYnJlYWsKIAotICAgICAgICAgICAg aWYgb3V0cHV0LnN0YXJ0c3dpdGgoYidkaWZmJyk6ICAjIFRoaXMgaXMgdGhlIGxhc3QgbGluZSBJ bWFnZURpZmYgcHJpbnRzLgorICAgICAgICAgICAgaWYgb3V0cHV0LnN0YXJ0c3dpdGgoYidkaWZm Jyk6CiAgICAgICAgICAgICAgICAgYnJlYWsKIAogICAgICAgICAgICAgaWYgb3V0cHV0LnN0YXJ0 c3dpdGgoYidDb250ZW50LUxlbmd0aCcpOgo= 387686 2020-01-14 12:15:30 -0800 2020-01-14 13:51:11 -0800 Patch bug-206194-20200114121529.patch text/plain 7693 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NDUyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIwLTAxLTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUGFzcyBJbWFnZURpZmYgY29tbWFuZHMgaW4gYSBzaW5n bGUgd3JpdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNjE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEltYWdlRGlmZiBjYW4gZW5jb3VudGVyIHJhY2UgY29uZGl0aW9ucyBpZiBpdCBpcyBmZWQgY29u dGVudCBpbiBtdWx0aXBsZSB3cml0ZXMsCisgICAgICAgIGluc3RlYWQgb2YgaW4gYSBzaW5nbGUg YmxvY2suCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weToK KyAgICAgICAgKEltYWdlRGlmZmVyLmRpZmZfaW1hZ2UpOiBQYXNzIEltYWdlRGlmZiBkYXRhIGlu IGEgc2luZ2xlIHdyaXRlIGNvbW1hbmQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L3BvcnRfdGVzdGNhc2UucHk6CisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdl X19taXNzaW5nX2JvdGgpOiBkaWZmX2ltYWdlIG9ubHkgYWNjZXB0cyBieXRlIGFycmF5cy4KKyAg ICAgICAgKFBvcnRUZXN0Q2FzZS50ZXN0X2RpZmZfaW1hZ2VfX21pc3NpbmdfYWN0dWFsKTogRGl0 dG8uCisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX19taXNzaW5nX2V4cGVj dGVkKTogRGl0dG8uCisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlKTogRGl0 dG8uCisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX3Bhc3NlZCk6IERpdHRv LgorICAgICAgICAoUG9ydFRlc3RDYXNlLnRlc3RfZGlmZl9pbWFnZV9mYWlsZWQpOiBEaXR0by4K KyAgICAgICAgKFBvcnRUZXN0Q2FzZS50ZXN0X2RpZmZfaW1hZ2VfY3Jhc2hlZCk6IERpdHRvLgor CiAyMDIwLTAxLTE0ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBbTEZDXVtJbnRlZ3JhdGlvbl0gU3VwcG9ydCB0aGUgZmVhdHVyZSBmbGFnIGluIER1bXBSZW5k ZXJUcmVlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQko cmV2aXNpb24gMjU0NTIwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2Rp ZmYucHkJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDcgQEAgaW1wb3J0IHJlCiBpbXBvcnQg dGltZQogCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IHNlcnZlcl9wcm9jZXNzCi1mcm9tIHdl YmtpdHB5LmNvbW1vbi51bmljb2RlX2NvbXBhdGliaWxpdHkgaW1wb3J0IGRlY29kZV9mb3IKK2Zy b20gd2Via2l0cHkuY29tbW9uLnVuaWNvZGVfY29tcGF0aWJpbGl0eSBpbXBvcnQgQnl0ZXNJTywg ZGVjb2RlX2ZvciwgZW5jb2RlX2lmX25lY2Vzc2FyeQogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExv Z2dlcihfX25hbWVfXykKQEAgLTU4LDEwICs1OCwxMiBAQCBjbGFzcyBJbWFnZURpZmZlcihvYmpl Y3QpOgogICAgICAgICAgICAgaWYgbm90IHNlbGYuX3Byb2Nlc3M6CiAgICAgICAgICAgICAgICAg c2VsZi5fc3RhcnQodG9sZXJhbmNlKQogICAgICAgICAgICAgIyBOb3RlIHRoYXQgYWx0aG91Z2gg d2UgYXJlIGhhbmRlZCAnb2xkJywgJ25ldycsIEltYWdlRGlmZiB3YW50cyAnbmV3JywgJ29sZCcu Ci0gICAgICAgICAgICBzZWxmLl9wcm9jZXNzLndyaXRlKCdDb250ZW50LUxlbmd0aDoge31cbicu Zm9ybWF0KGxlbihhY3R1YWxfY29udGVudHMpKSkKLSAgICAgICAgICAgIHNlbGYuX3Byb2Nlc3Mu d3JpdGUoYWN0dWFsX2NvbnRlbnRzKQotICAgICAgICAgICAgc2VsZi5fcHJvY2Vzcy53cml0ZSgn Q29udGVudC1MZW5ndGg6IHt9XG4nLmZvcm1hdChsZW4oZXhwZWN0ZWRfY29udGVudHMpKSkKLSAg ICAgICAgICAgIHNlbGYuX3Byb2Nlc3Mud3JpdGUoZXhwZWN0ZWRfY29udGVudHMpCisgICAgICAg ICAgICBidWZmZXIgPSBCeXRlc0lPKCkKKyAgICAgICAgICAgIGJ1ZmZlci53cml0ZShlbmNvZGVf aWZfbmVjZXNzYXJ5KCdDb250ZW50LUxlbmd0aDoge31cbicuZm9ybWF0KGxlbihhY3R1YWxfY29u dGVudHMpKSkpCisgICAgICAgICAgICBidWZmZXIud3JpdGUoYWN0dWFsX2NvbnRlbnRzKQorICAg ICAgICAgICAgYnVmZmVyLndyaXRlKGVuY29kZV9pZl9uZWNlc3NhcnkoJ0NvbnRlbnQtTGVuZ3Ro OiB7fVxuJy5mb3JtYXQobGVuKGV4cGVjdGVkX2NvbnRlbnRzKSkpKQorICAgICAgICAgICAgYnVm ZmVyLndyaXRlKGV4cGVjdGVkX2NvbnRlbnRzKQorICAgICAgICAgICAgc2VsZi5fcHJvY2Vzcy53 cml0ZShidWZmZXIuZ2V0dmFsdWUoKSkKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9yZWFkKCkK ICAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZXhjZXB0aW9uOgogICAgICAgICAgICAgcmV0dXJu IChOb25lLCAwLCAiRmFpbGVkIHRvIGNvbXB1dGUgYW4gaW1hZ2UgZGlmZjogJXMiICUgc3RyKGV4 Y2VwdGlvbikpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0Y2Fz ZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0 Y2FzZS5weQkocmV2aXNpb24gMjU0NTIwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L3BvcnRfdGVzdGNhc2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTI1OSwyMCArMjU5LDIwIEBAIGNs YXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZGlmZl9p bWFnZV9fbWlzc2luZ19ib3RoKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQo KQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQuZGlmZl9pbWFnZShOb25lLCBOb25lKVsw XSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LmRpZmZfaW1hZ2UoTm9uZSwgJycpWzBd KQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQuZGlmZl9pbWFnZSgnJywgTm9uZSlbMF0p CisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocG9ydC5kaWZmX2ltYWdlKE5vbmUsIGInJylbMF0p CisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocG9ydC5kaWZmX2ltYWdlKGInJywgTm9uZSlbMF0p CiAKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LmRpZmZfaW1hZ2UoJycsICcnKVswXSkK KyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LmRpZmZfaW1hZ2UoYicnLCBiJycpWzBdKQog CiAgICAgZGVmIHRlc3RfZGlmZl9pbWFnZV9fbWlzc2luZ19hY3R1YWwoc2VsZik6CiAgICAgICAg IHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmRp ZmZfaW1hZ2UoTm9uZSwgJ2ZvbycpWzBdKQotICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5k aWZmX2ltYWdlKCcnLCAnZm9vJylbMF0pCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmRp ZmZfaW1hZ2UoTm9uZSwgYidmb28nKVswXSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQu ZGlmZl9pbWFnZShiJycsIGInZm9vJylbMF0pCiAKICAgICBkZWYgdGVzdF9kaWZmX2ltYWdlX19t aXNzaW5nX2V4cGVjdGVkKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQot ICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5kaWZmX2ltYWdlKCdmb28nLCBOb25lKVswXSkK LSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJycpWzBdKQor ICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5kaWZmX2ltYWdlKGInZm9vJywgTm9uZSlbMF0p CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmRpZmZfaW1hZ2UoYidmb28nLCBiJycpWzBd KQogCiAgICAgZGVmIHRlc3RfZGlmZl9pbWFnZShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKQEAgLTI5MiwyMiArMjkyLDIyIEBAIGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgRmlyc3QgdGVzdCB0aGUgY2FzZSBvZiBub3QgdXNp bmcgdGhlIEpIQnVpbGQgd3JhcHBlci4KICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0Ll9z aG91bGRfdXNlX2poYnVpbGQoKSkKIAotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlm Zl9pbWFnZSgnZm9vJywgJ2JhcicpLCAoYicnLCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInKSwgKGInJywgMTAwLjAs IE5vbmUpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIFtwb3J0Ll9w YXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2JhcicsIE5vbmUpLCAoYicnLCAx MDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKGIn Zm9vJywgYidiYXInLCBOb25lKSwgKGInJywgMTAwLjAsIE5vbmUpKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIFtwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0t dG9sZXJhbmNlIiwgIjAuMSJdKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9p bWFnZSgnZm9vJywgJ2JhcicsIDApLCAoYicnLCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInLCAwKSwgKGInJywgMTAw LjAsIE5vbmUpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIFtwb3J0 Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAiXSkKIAogICAgICAgICAj IE5vdyB0ZXN0IHRoZSBjYXNlIG9mIHVzaW5nIEpIQnVpbGQgd3JhcHBlci4KICAgICAgICAgcG9y dC5fZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShwb3J0LnBhdGhfZnJvbV93ZWJraXRf YmFzZSgnV2ViS2l0QnVpbGQnLCAnRGVwZW5kZW5jaWVzJXMnICUgcG9ydC5wb3J0X25hbWUudXBw ZXIoKSkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9zaG91bGRfdXNlX2poYnVpbGQo KSkKIAotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2Jh cicpLCAoYicnLCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5k aWZmX2ltYWdlKGInZm9vJywgYidiYXInKSwgKGInJywgMTAwLjAsIE5vbmUpKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIHBvcnQuX2poYnVpbGRfd3JhcHBlciArIFtw b3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2JhcicsIE5vbmUpLCAo YicnLCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kaWZmX2lt YWdlKGInZm9vJywgYidiYXInLCBOb25lKSwgKGInJywgMTAwLjAsIE5vbmUpKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIHBvcnQuX2poYnVpbGRfd3JhcHBlciArIFtw b3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZSgnZm9vJywgJ2JhcicsIDApLCAoYicn LCAxMDAuMCwgTm9uZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdl KGInZm9vJywgYidiYXInLCAwKSwgKGInJywgMTAwLjAsIE5vbmUpKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIHBvcnQuX2poYnVpbGRfd3JhcHBlciArIFtwb3J0Ll9w YXRoX3RvX2ltYWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAiXSkKIAogICAgICAgICBwb3J0 LmNsZWFuX3VwX3Rlc3RfcnVuKCkKQEAgLTMxOCwxMyArMzE4LDEzIEBAIGNsYXNzIFBvcnRUZXN0 Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgp CiAgICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yID0gbGFtYmRhIHBvcnQs IG5tLCBjbWQsIGVudjogTW9ja1NlcnZlclByb2Nlc3MobGluZXM9WydkaWZmOiAwJSBwYXNzZWRc biddKQogICAgICAgICBpbWFnZV9kaWZmZXIgPSBJbWFnZURpZmZlcihwb3J0KQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGltYWdlX2RpZmZlci5kaWZmX2ltYWdlKCdmb28nLCAnYmFyJywgMC4x KSwgKE5vbmUsIDAsIE5vbmUpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGltYWdlX2RpZmZl ci5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInLCAwLjEpLCAoTm9uZSwgMCwgTm9uZSkpCiAKICAg ICBkZWYgdGVzdF9kaWZmX2ltYWdlX2ZhaWxlZChzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYu bWFrZV9wb3J0KCkKICAgICAgICAgcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IgPSBs YW1iZGEgcG9ydCwgbm0sIGNtZCwgZW52OiBNb2NrU2VydmVyUHJvY2VzcyhsaW5lcz1bJ2RpZmY6 IDEwMCUgZmFpbGVkXG4nXSkKICAgICAgICAgaW1hZ2VfZGlmZmVyID0gSW1hZ2VEaWZmZXIocG9y dCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZSgnZm9v JywgJ2JhcicsIDAuMSksIChiJycsIDEwMC4wLCBOb25lKSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgMC4xKSwgKGInJywg MTAwLjAsIE5vbmUpKQogCiAgICAgZGVmIHRlc3RfZGlmZl9pbWFnZV9jcmFzaGVkKHNlbGYpOgog ICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQpAQCAtMzQwLDcgKzM0MCw3IEBAIGNsYXNz IFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICAgICAgcG9ydC5fc2VydmVy X3Byb2Nlc3NfY29uc3RydWN0b3IgPSBtYWtlX3Byb2MKICAgICAgICAgcG9ydC5zZXR1cF90ZXN0 X3J1bigpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKCdmb28nLCAn YmFyJyksIChiJycsIDAsICdJbWFnZURpZmYgY3Jhc2hlZFxuJykpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInKSwgKGInJywgMCwgJ0ltYWdl RGlmZiBjcmFzaGVkXG4nKSkKICAgICAgICAgcG9ydC5jbGVhbl91cF90ZXN0X3J1bigpCiAKICAg ICBkZWYgaW50ZWdyYXRpb25fdGVzdF93ZWJzb2NrZXRfc2VydmVyX19ub3JtYWwoc2VsZik6Cg==