47128 2010-10-04 16:01:55 -0700 [chromium] fix image diffing in NRWT 2010-10-05 20:04:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 47163 1 tony tony dpranke ojan tkent oldest_to_newest 289250 0 tony 2010-10-04 16:01:55 -0700 [chromium] fix image diffing in NRWT 289255 1 69710 tony 2010-10-04 16:04:33 -0700 Created attachment 69710 Patch 289256 2 tony 2010-10-04 16:04:56 -0700 This explains why the flakiness dashboard hasn't been generating new image diffs. 289257 3 tony 2010-10-04 16:05:14 -0700 ...at least on Linux. Haven't tested on other platforms. 289383 4 69710 dpranke 2010-10-04 21:15:16 -0700 Comment on attachment 69710 Patch patch LGTM, although I'm not a reviewer. 289390 5 69710 tkent 2010-10-04 21:20:04 -0700 Comment on attachment 69710 Patch ok, I believe the dpanke's comment :-) 289391 6 69710 tkent 2010-10-04 21:21:21 -0700 Comment on attachment 69710 Patch Clearing flags on attachment: 69710 Committed r69066: <http://trac.webkit.org/changeset/69066> 289392 7 tkent 2010-10-04 21:21:28 -0700 All reviewed patches have been landed. Closing bug. 289446 8 tkent 2010-10-04 22:29:32 -0700 (In reply to comment #6) > (From update of attachment 69710 [details]) > Committed r69066: <http://trac.webkit.org/changeset/69066> I rolled it out. If image_diff exited with neither 0 nor 1, NRWT stopped by a ValueError. 289451 9 tkent 2010-10-04 22:35:57 -0700 (In reply to comment #8) > (In reply to comment #6) > > (From update of attachment 69710 [details] [details]) > > Committed r69066: <http://trac.webkit.org/changeset/69066> > > I rolled it out. > If image_diff exited with neither 0 nor 1, NRWT stopped by a ValueError. An example: http://build.chromium.org/buildbot/waterfall.fyi/builders/Webkit%20(webkit.org)/builds/35915/steps/webkit_tests/logs/stdio 289658 10 tony 2010-10-05 09:30:21 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #6) > > > (From update of attachment 69710 [details] [details] [details]) > > > Committed r69066: <http://trac.webkit.org/changeset/69066> > > > > I rolled it out. > > If image_diff exited with neither 0 nor 1, NRWT stopped by a ValueError. > > An example: > http://build.chromium.org/buildbot/waterfall.fyi/builders/Webkit%20(webkit.org)/builds/35915/steps/webkit_tests/logs/stdio That's too bad. Maybe flushing the temp files isn't enough on Windows. We might have to switch to real files that we can close(). I'll try testing on Windows. Thanks for trying to land this for me. 289805 11 69825 tony 2010-10-05 12:17:07 -0700 Created attachment 69825 Patch 289807 12 tony 2010-10-05 12:18:55 -0700 It turns out that on Windows, you can't open the the file created by NamedTemporaryFile. So I updated the patch to just make a temp dir and open the files using open(). 289921 13 tony 2010-10-05 15:33:28 -0700 Committed r69153: <http://trac.webkit.org/changeset/69153> 290052 14 dpranke 2010-10-05 20:03:20 -0700 how annoying. I'll have to remember that for next time. 290055 15 dpranke 2010-10-05 20:04:48 -0700 also, it sure seems lately that I (at least) would benefit from try servers that ran test-webkitpy. I'll see if I can add that step to the layout bots ... 69710 2010-10-04 16:04:33 -0700 2010-10-05 12:17:03 -0700 Patch bug-47128-20101004160443.patch text/plain 4454 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4YjQ1OGMyNzc5YjJlZjVmNTQxMGY0MGViNjJmNWQ3NDM1ZTk3NzY2Li4wNDc5ZWM2 MTUyZGE4YWNhMDZmMWMxZWM4NmJhMjBjZWU0MjA4YmJhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTAtMDQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGZpeCBpbWFn ZSBkaWZmaW5nIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3MTI4CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtLnB5OiBGbHVzaCBkYXRhIHRvIHRoZQorICAgICAgICAgICAgICB0ZW1w IGZpbGUgYW5kIGNoZWNrIHRoZSBpbWFnZV9kaWZmIGVycm9yIGNvZGUgbW9yZSBjYXJlZnVsbHkK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3Vu aXR0ZXN0LnB5OgorCiAyMDEwLTEwLTA0ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkaW5nIG15c2VsZiB0byB0aGUgY29tbWl0 dGVycyBsaXN0LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggYTcyNjI3YTE2YTdmYTU0YzQ4ODNj NDM5Mjk1YTcwM2U5NWYzYjhkNy4uZDlhM2U0YzIwODAyZjZiN2U0Y2NmY2MwZjY3NTg5NWVmNWQ5 OTk0ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0xMzYsOCArMTM2LDEwIEBAIGNsYXNzIENo cm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICBleGVjdXRhYmxlID0gc2VsZi5fcGF0aF90 b19pbWFnZV9kaWZmKCkKICAgICAgICAgZXhwZWN0ZWRfdG1wZmlsZSA9IHRlbXBmaWxlLk5hbWVk VGVtcG9yYXJ5RmlsZSgpCiAgICAgICAgIGV4cGVjdGVkX3RtcGZpbGUud3JpdGUoZXhwZWN0ZWRf Y29udGVudHMpCisgICAgICAgIGV4cGVjdGVkX3RtcGZpbGUuZmx1c2goKQogICAgICAgICBhY3R1 YWxfdG1wZmlsZSA9IHRlbXBmaWxlLk5hbWVkVGVtcG9yYXJ5RmlsZSgpCiAgICAgICAgIGFjdHVh bF90bXBmaWxlLndyaXRlKGFjdHVhbF9jb250ZW50cykKKyAgICAgICAgYWN0dWFsX3RtcGZpbGUu Zmx1c2goKQogICAgICAgICBpZiBkaWZmX2ZpbGVuYW1lOgogICAgICAgICAgICAgY21kID0gW2V4 ZWN1dGFibGUsICctLWRpZmYnLCBleHBlY3RlZF90bXBmaWxlLm5hbWUsCiAgICAgICAgICAgICAg ICAgICAgYWN0dWFsX3RtcGZpbGUubmFtZSwgZGlmZl9maWxlbmFtZV0KQEAgLTE0Niw4ICsxNDgs MTQgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KGJhc2UuUG9ydCk6CiAKICAgICAgICAgcmVzdWx0ID0g VHJ1ZQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBpZiBzZWxmLl9leGVjdXRpdmUucnVuX2Nv bW1hbmQoY21kLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpID09IDA6Ci0gICAgICAgICAgICAgICAg cmV0dXJuIEZhbHNlCisgICAgICAgICAgICBleGl0X2NvZGUgPSBzZWxmLl9leGVjdXRpdmUucnVu X2NvbW1hbmQoY21kLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCisgICAgICAgICAgICBpZiBleGl0 X2NvZGUgPT0gMDoKKyAgICAgICAgICAgICAgICAjIFRoZSBpbWFnZXMgYXJlIHRoZSBzYW1lLgor ICAgICAgICAgICAgICAgIHJlc3VsdCA9IEZhbHNlCisgICAgICAgICAgICBlbGlmIGV4aXRfY29k ZSAhPSAxOgorICAgICAgICAgICAgICAgICMgU29tZSBvdGhlciBlcnJvciBvY2N1cnJlZC4KKyAg ICAgICAgICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCJpbWFnZSBkaWZmIHJldHVybmVkIGFuIGV4 aXQgY29kZSBvZiAiICsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cihleGl0 X2NvZGUpKQogICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKICAgICAgICAgICAgIGlmIGUuZXJy bm8gPT0gZXJybm8uRU5PRU5UIG9yIGUuZXJybm8gPT0gZXJybm8uRUFDQ0VTOgogICAgICAgICAg ICAgICAgIF9jb21wYXJlX2F2YWlsYWJsZSA9IEZhbHNlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV91bml0dGVzdC5weQppbmRleCBhNGE5ZWE2MDY2YzZmYTMwNTE5NDZmZTJhZGI2YjY3ZDVjM2Ni MDE3Li40OGU5NTg1NGNjNDczZGU0N2ViZTg5ZTZlMTNkMzE3MTU1NWM4MTk1IDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkKQEAgLTE1Niw1ICsxNTYsNDcgQEAgREVGRVIg TElOVVggV0lOIDogZmFzdC9qcy92ZXJ5LWdvb2QuanMgPSBUSU1FT1VUIFBBU1MiIiIKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMob3B0aW9ucy5jb25maWd1cmF0aW9uLCAnZGVmYXVsdCcpCiAg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LmRlZmF1bHRfY29uZmlndXJhdGlvbl9jYWxsZWQp CiAKKyAgICBkZWYgdGVzdF9kaWZmX2ltYWdlKHNlbGYpOgorICAgICAgICBjbGFzcyBUZXN0UG9y dChDaHJvbWl1bVBvcnRUZXN0LlRlc3RMaW51eFBvcnQpOgorICAgICAgICAgICAgZGVmIF9wYXRo X3RvX2ltYWdlX2RpZmYoc2VsZik6CisgICAgICAgICAgICAgICAgcmV0dXJuICIvcGF0aC90by9p bWFnZV9kaWZmIgorCisgICAgICAgIGNsYXNzIEVtcHR5T3B0aW9uczoKKyAgICAgICAgICAgIHVz ZV9kcnQgPSBGYWxzZQorCisgICAgICAgIGNsYXNzIE1vY2tFeGVjdXRlOgorICAgICAgICAgICAg ZGVmIF9faW5pdF9fKHNlbGYsIHJlc3VsdCk6CisgICAgICAgICAgICAgICAgc2VsZi5fcmVzdWx0 ID0gcmVzdWx0CisKKyAgICAgICAgICAgIGRlZiBydW5fY29tbWFuZChzZWxmLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFyZ3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dk PU5vbmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXQ9Tm9uZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlcnJvcl9oYW5kbGVyPU5vbmUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuX2V4aXRfY29kZT1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZXR1cm5fc3RkZXJyPVRydWUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGVjb2RlX291dHB1dD1GYWxzZSk6CisgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3Jlc3Vs dAorCisgICAgICAgIG9wdGlvbnMgPSBFbXB0eU9wdGlvbnMoKQorICAgICAgICBwb3J0ID0gQ2hy b21pdW1Qb3J0VGVzdC5UZXN0TGludXhQb3J0KG9wdGlvbnMpCisKKyAgICAgICAgIyBJbWFnZXMg YXJlIGRpZmZlcmVudC4KKyAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGUoMCkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoRmFsc2UsIHBvcnQuZGlmZl9pbWFnZSgiRVhQRUNU RUQiLCAiQUNUVUFMIikpCisKKyAgICAgICAgIyBJbWFnZXMgYXJlIHRoZSBzYW1lLgorICAgICAg ICBwb3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0ZSgxKQorICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhUcnVlLCBwb3J0LmRpZmZfaW1hZ2UoIkVYUEVDVEVEIiwgIkFDVFVBTCIpKQorCisgICAg ICAgICMgVGhlcmUgd2FzIHNvbWUgZXJyb3IgcnVubmluZyBpbWFnZV9kaWZmLgorICAgICAgICBw b3J0Ll9leGVjdXRpdmUgPSBNb2NrRXhlY3V0ZSgyKQorICAgICAgICBleGNlcHRpb25fcmFpc2Vk ID0gRmFsc2UKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcG9ydC5kaWZmX2ltYWdlKCJFWFBF Q1RFRCIsICJBQ1RVQUwiKQorICAgICAgICBleGNlcHQgVmFsdWVFcnJvciwgZToKKyAgICAgICAg ICAgIGV4Y2VwdGlvbl9yYWlzZWQgPSBUcnVlCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShleGNl cHRpb25fcmFpc2VkKQorCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0 Lm1haW4oKQo= 69825 2010-10-05 12:17:07 -0700 2010-10-05 12:19:37 -0700 Patch bug-47128-20101005121717.patch text/plain 5269 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmMjhiNTIyN2RkZGViYjZjMWNlOGFhYWUzOGUyYjBlMjlhMTVjOTc3Li4yNWM2ZWMx M2IyMDdkMGNkNWU4MTcwYWVjYWM1Zjc2NTQwZjNjNDE1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTAtMDUgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGZpeCBpbWFn ZSBkaWZmaW5nIGluIE5SV1QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ3MTI4CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtLnB5OiBTdG9wIHVzaW5nCisgICAgICAgICAgICBOYW1lZFRlbXBvcmFy eUZpbGUgc2luY2UgaXQgZG9lc24ndCB3b3JrIG9uIFdpbmRvd3MuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weToKKwogMjAx MC0xMC0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5IGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQppbmRleCBhNzI2Mjdh MTZhN2ZhNTRjNDg4M2M0MzkyOTVhNzAzZTk1ZjNiOGQ3Li5kNzVjZmI3OWQ4MDUwMDdlYTYwYmFi OTYyYmFhMmMzMDA5NmY1MzU4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKQEAgLTEzNCwyOCArMTM0 LDM4IEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgIGRlZiBkaWZmX2ltYWdl KHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsCiAgICAgICAgICAgICAg ICAgICAgZGlmZl9maWxlbmFtZT1Ob25lLCB0b2xlcmFuY2U9MCk6CiAgICAgICAgIGV4ZWN1dGFi bGUgPSBzZWxmLl9wYXRoX3RvX2ltYWdlX2RpZmYoKQotICAgICAgICBleHBlY3RlZF90bXBmaWxl ID0gdGVtcGZpbGUuTmFtZWRUZW1wb3JhcnlGaWxlKCkKLSAgICAgICAgZXhwZWN0ZWRfdG1wZmls ZS53cml0ZShleHBlY3RlZF9jb250ZW50cykKLSAgICAgICAgYWN0dWFsX3RtcGZpbGUgPSB0ZW1w ZmlsZS5OYW1lZFRlbXBvcmFyeUZpbGUoKQotICAgICAgICBhY3R1YWxfdG1wZmlsZS53cml0ZShh Y3R1YWxfY29udGVudHMpCisKKyAgICAgICAgdGVtcGRpciA9IHRlbXBmaWxlLm1rZHRlbXAoKQor ICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IG9zLnBhdGguam9pbih0ZW1wZGlyLCAiZXhwZWN0 ZWQucG5nIikKKyAgICAgICAgd2l0aCBvcGVuKGV4cGVjdGVkX2ZpbGVuYW1lLCAndytiJykgYXMg ZmlsZToKKyAgICAgICAgICAgIGZpbGUud3JpdGUoZXhwZWN0ZWRfY29udGVudHMpCisgICAgICAg IGFjdHVhbF9maWxlbmFtZSA9IG9zLnBhdGguam9pbih0ZW1wZGlyLCAiYWN0dWFsLnBuZyIpCisg ICAgICAgIHdpdGggb3BlbihhY3R1YWxfZmlsZW5hbWUsICd3K2InKSBhcyBmaWxlOgorICAgICAg ICAgICAgZmlsZS53cml0ZShhY3R1YWxfY29udGVudHMpCisKICAgICAgICAgaWYgZGlmZl9maWxl bmFtZToKLSAgICAgICAgICAgIGNtZCA9IFtleGVjdXRhYmxlLCAnLS1kaWZmJywgZXhwZWN0ZWRf dG1wZmlsZS5uYW1lLAotICAgICAgICAgICAgICAgICAgIGFjdHVhbF90bXBmaWxlLm5hbWUsIGRp ZmZfZmlsZW5hbWVdCisgICAgICAgICAgICBjbWQgPSBbZXhlY3V0YWJsZSwgJy0tZGlmZicsIGV4 cGVjdGVkX2ZpbGVuYW1lLAorICAgICAgICAgICAgICAgICAgIGFjdHVhbF9maWxlbmFtZSwgZGlm Zl9maWxlbmFtZV0KICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGNtZCA9IFtleGVjdXRhYmxl LCBleHBlY3RlZF90bXBmaWxlLm5hbWUsIGFjdHVhbF90bXBmaWxlLm5hbWVdCisgICAgICAgICAg ICBjbWQgPSBbZXhlY3V0YWJsZSwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZV0K IAogICAgICAgICByZXN1bHQgPSBUcnVlCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIGlmIHNl bGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChjbWQsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgPT0g MDoKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAgICAgICAgIGV4aXRfY29kZSA9 IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChjbWQsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkK KyAgICAgICAgICAgIGlmIGV4aXRfY29kZSA9PSAwOgorICAgICAgICAgICAgICAgICMgVGhlIGlt YWdlcyBhcmUgdGhlIHNhbWUuCisgICAgICAgICAgICAgICAgcmVzdWx0ID0gRmFsc2UKKyAgICAg ICAgICAgIGVsaWYgZXhpdF9jb2RlICE9IDE6CisgICAgICAgICAgICAgICAgIyBTb21lIG90aGVy IGVycm9yIG9jY3VycmVkLgorICAgICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoImltYWdl IGRpZmYgcmV0dXJuZWQgYW4gZXhpdCBjb2RlIG9mICIgKworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc3RyKGV4aXRfY29kZSkpCiAgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgog ICAgICAgICAgICAgaWYgZS5lcnJubyA9PSBlcnJuby5FTk9FTlQgb3IgZS5lcnJubyA9PSBlcnJu by5FQUNDRVM6CiAgICAgICAgICAgICAgICAgX2NvbXBhcmVfYXZhaWxhYmxlID0gRmFsc2UKICAg ICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgcmFpc2UgZQogICAgICAgICBmaW5hbGx5 OgotICAgICAgICAgICAgZXhwZWN0ZWRfdG1wZmlsZS5jbG9zZSgpCi0gICAgICAgICAgICBhY3R1 YWxfdG1wZmlsZS5jbG9zZSgpCisgICAgICAgICAgICBzaHV0aWwucm10cmVlKHRlbXBkaXIpCiAg ICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIGRlZiBkcml2ZXJfbmFtZShzZWxmKToKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CmluZGV4IGE0YTllYTYwNjZjNmZhMzA1MTk0 NmZlMmFkYjZiNjdkNWMzY2IwMTcuLjQ4ZTk1ODU0Y2M0NzNkZTQ3ZWJlODllNmUxM2QzMTcxNTU1 YzgxOTUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weQpAQCAtMTU2LDUg KzE1Niw0NyBAQCBERUZFUiBMSU5VWCBXSU4gOiBmYXN0L2pzL3ZlcnktZ29vZC5qcyA9IFRJTUVP VVQgUEFTUyIiIgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhvcHRpb25zLmNvbmZpZ3VyYXRp b24sICdkZWZhdWx0JykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuZGVmYXVsdF9jb25m aWd1cmF0aW9uX2NhbGxlZCkKIAorICAgIGRlZiB0ZXN0X2RpZmZfaW1hZ2Uoc2VsZik6CisgICAg ICAgIGNsYXNzIFRlc3RQb3J0KENocm9taXVtUG9ydFRlc3QuVGVzdExpbnV4UG9ydCk6CisgICAg ICAgICAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihzZWxmKToKKyAgICAgICAgICAgICAgICBy ZXR1cm4gIi9wYXRoL3RvL2ltYWdlX2RpZmYiCisKKyAgICAgICAgY2xhc3MgRW1wdHlPcHRpb25z OgorICAgICAgICAgICAgdXNlX2RydCA9IEZhbHNlCisKKyAgICAgICAgY2xhc3MgTW9ja0V4ZWN1 dGU6CisgICAgICAgICAgICBkZWYgX19pbml0X18oc2VsZiwgcmVzdWx0KToKKyAgICAgICAgICAg ICAgICBzZWxmLl9yZXN1bHQgPSByZXN1bHQKKworICAgICAgICAgICAgZGVmIHJ1bl9jb21tYW5k KHNlbGYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJncywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjd2Q9Tm9uZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1 dD1Ob25lLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVycm9yX2hhbmRsZXI9Tm9uZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm5fZXhpdF9jb2RlPUZhbHNlLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybl9zdGRlcnI9VHJ1ZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkZWNvZGVfb3V0cHV0PUZhbHNlKToKKyAgICAgICAgICAgICAgICBy ZXR1cm4gc2VsZi5fcmVzdWx0CisKKyAgICAgICAgb3B0aW9ucyA9IEVtcHR5T3B0aW9ucygpCisg ICAgICAgIHBvcnQgPSBDaHJvbWl1bVBvcnRUZXN0LlRlc3RMaW51eFBvcnQob3B0aW9ucykKKwor ICAgICAgICAjIEltYWdlcyBhcmUgZGlmZmVyZW50LgorICAgICAgICBwb3J0Ll9leGVjdXRpdmUg PSBNb2NrRXhlY3V0ZSgwKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhGYWxzZSwgcG9ydC5k aWZmX2ltYWdlKCJFWFBFQ1RFRCIsICJBQ1RVQUwiKSkKKworICAgICAgICAjIEltYWdlcyBhcmUg dGhlIHNhbWUuCisgICAgICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRlKDEpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFRydWUsIHBvcnQuZGlmZl9pbWFnZSgiRVhQRUNURUQiLCAi QUNUVUFMIikpCisKKyAgICAgICAgIyBUaGVyZSB3YXMgc29tZSBlcnJvciBydW5uaW5nIGltYWdl X2RpZmYuCisgICAgICAgIHBvcnQuX2V4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRlKDIpCisgICAgICAg IGV4Y2VwdGlvbl9yYWlzZWQgPSBGYWxzZQorICAgICAgICB0cnk6CisgICAgICAgICAgICBwb3J0 LmRpZmZfaW1hZ2UoIkVYUEVDVEVEIiwgIkFDVFVBTCIpCisgICAgICAgIGV4Y2VwdCBWYWx1ZUVy cm9yLCBlOgorICAgICAgICAgICAgZXhjZXB0aW9uX3JhaXNlZCA9IFRydWUKKyAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKGV4Y2VwdGlvbl9yYWlzZWQpCisKIGlmIF9fbmFtZV9fID09ICdfX21haW5f Xyc6CiAgICAgdW5pdHRlc3QubWFpbigpCg==