81595 2012-03-19 16:54:54 -0700 webkitpy: clean up some port._filesystem references to not reference private members 2012-03-19 18:26:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 71380 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 582466 0 dpranke 2012-03-19 16:54:54 -0700 webkitpy: clean up some port._filesystem references to not reference private members 582468 1 132722 dpranke 2012-03-19 16:55:31 -0700 Created attachment 132722 Patch 582479 2 132725 dpranke 2012-03-19 17:01:23 -0700 Created attachment 132725 fix nit in write_image_diff_files() as well 582495 3 132725 eric 2012-03-19 17:16:58 -0700 Comment on attachment 132725 fix nit in write_image_diff_files() as well View in context: https://bugs.webkit.org/attachment.cgi?id=132725&action=review OK. > Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:71 > - if port.host.filesystem.exists(expected_filename): > + if self._filesystem.exists(expected_filename): In general getting away from using "port" for these sorts of things seems good. The goal being to make "port" less of the hub/god object. 582573 4 dpranke 2012-03-19 18:26:03 -0700 Committed r111289: <http://trac.webkit.org/changeset/111289> 132722 2012-03-19 16:55:31 -0700 2012-03-19 17:01:20 -0700 Patch bug-81595-20120319165530.patch text/plain 11915 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIzMGY0YTViN2QxYmFjYTE1MGM0Y2Q4NWU5YThiNzE4 MjlhMzU4Ny4uYzRiMDUxZDdjNjcwODU5Zjg4MzFjYjAwMzkzNDQxM2MwODhhNmZlMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3 IEBACiAyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCBzb21lIHBvcnQuX2ZpbGVzeXN0ZW0gcmVmZXJlbmNl cyB0byBub3QgcmVmZXJlbmNlIHByaXZhdGUgbWVtYmVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1OTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBzaG91bGQgYmUgbm8gZnVuY3Rpb25hbCBj aGFuZ2VzIGluIHRoaXMgcGF0Y2gsIGp1c3Qgc29tZQorICAgICAgICByZWZhY3RvcmluZy4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Npbmds ZV90ZXN0X3J1bm5lci5weToKKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX19pbml0X18pOgor ICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fcnVuX2NvbXBhcmVfdGVzdCk6CisgICAgICAgIChT aW5nbGVUZXN0UnVubmVyLl9ydW5fcmViYXNlbGluZSk6CisgICAgICAgIChTaW5nbGVUZXN0UnVu bmVyLl9zYXZlX2Jhc2VsaW5lX2RhdGEpOgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5faGFu ZGxlX2Vycm9yKToKKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIuX3J1bl9yZWZ0ZXN0KToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jl c3VsdF93cml0ZXIucHk6CisgICAgICAgICh3cml0ZV90ZXN0X3Jlc3VsdCk6CisgICAgICAgIChU ZXN0UmVzdWx0V3JpdGVyLl9faW5pdF9fKToKKyAgICAgICAgKFRlc3RSZXN1bHRXcml0ZXIuX21h a2Vfb3V0cHV0X2RpcmVjdG9yeSk6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyLm91dHB1dF9m aWxlbmFtZSk6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyLl9vdXRwdXRfdGVzdG5hbWUpOgor ICAgICAgICAoVGVzdFJlc3VsdFdyaXRlci53cml0ZV9vdXRwdXRfZmlsZXMpOgorICAgICAgICAo VGVzdFJlc3VsdFdyaXRlci53cml0ZV9zdGRlcnIpOgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRl ci53cml0ZV9jcmFzaF9yZXBvcnQpOgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlci5jcmVhdGVf dGV4dF9kaWZmX2FuZF93cml0ZV9yZXN1bHQpOgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlci53 cml0ZV9pbWFnZV9kaWZmX2ZpbGVzKToKKyAgICAgICAgKGNvcHlfZmlsZSk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3Jp dGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlclRlc3QudGVzdF9yZWZ0 ZXN0X2RpZmZfaW1hZ2UpOgorCisyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hy b21pdW0ub3JnPgorCiAgICAgICAgIE5SV1QgcnVucyBzb21lIHRlc3RzIHRoYXQgYXJlIHNraXBw ZWQgd2l0aCAtaSBjb21tYW5kIGxpbmUgb3B0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTUzNQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVf dGVzdF9ydW5uZXIucHkKaW5kZXggNjM3NTgyMGNkMzljM2EwMDMyY2M3NjNkMjAwOGVhMGI4NmUy YWQ5MS4uZGNiMTBjMTNkYmY2NjQwODRiYzRlMjVjNzZkMzAwYTM0ZWQ2YmZkZSAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xl X3Rlc3RfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weQpAQCAtNTEsNiArNTEsNyBAQCBjbGFz cyBTaW5nbGVUZXN0UnVubmVyOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBvcHRpb25zLCBwb3J0 LCBkcml2ZXIsIHRlc3RfaW5wdXQsIHdvcmtlcl9uYW1lKToKICAgICAgICAgc2VsZi5fb3B0aW9u cyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKKyAgICAgICAgc2VsZi5fZmls ZXN5c3RlbSA9IHBvcnQuaG9zdC5maWxlc3lzdGVtCiAgICAgICAgIHNlbGYuX2RyaXZlciA9IGRy aXZlcgogICAgICAgICBzZWxmLl90aW1lb3V0ID0gdGVzdF9pbnB1dC50aW1lb3V0CiAgICAgICAg IHNlbGYuX3dvcmtlcl9uYW1lID0gd29ya2VyX25hbWUKQEAgLTY3LDcgKzY4LDcgQEAgY2xhc3Mg U2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICMgaW4gZWl0aGVyIGxheW91dCB0ZXN0cyBv ciByZWZ0ZXN0cywgYnV0IG5vdCBpbiBib3RoLgogICAgICAgICAgICAgZm9yIHN1ZmZpeCBpbiAo Jy50eHQnLCAnLnBuZycsICcud2F2Jyk6CiAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfZmlsZW5h bWUgPSBzZWxmLl9wb3J0LmV4cGVjdGVkX2ZpbGVuYW1lKHNlbGYuX3Rlc3RfbmFtZSwgc3VmZml4 KQotICAgICAgICAgICAgICAgIGlmIHBvcnQuaG9zdC5maWxlc3lzdGVtLmV4aXN0cyhleHBlY3Rl ZF9maWxlbmFtZSk6CisgICAgICAgICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMo ZXhwZWN0ZWRfZmlsZW5hbWUpOgogICAgICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCclcyBp cyBib3RoIGEgcmVmdGVzdCBhbmQgaGFzIGFuIGV4cGVjdGVkIG91dHB1dCBmaWxlICVzLicsCiAg ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl90ZXN0X25hbWUsIGV4cGVjdGVkX2ZpbGVuYW1l KQogCkBAIC0xMTUsMTMgKzExNiwxMyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVyOgogICAgICAg ICB0ZXN0X3Jlc3VsdCA9IHNlbGYuX2NvbXBhcmVfb3V0cHV0KGRyaXZlcl9vdXRwdXQsIGV4cGVj dGVkX2RyaXZlcl9vdXRwdXQpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMubmV3X3Rlc3RfcmVz dWx0czoKICAgICAgICAgICAgIHNlbGYuX2FkZF9taXNzaW5nX2Jhc2VsaW5lcyh0ZXN0X3Jlc3Vs dCwgZHJpdmVyX291dHB1dCkKLSAgICAgICAgdGVzdF9yZXN1bHRfd3JpdGVyLndyaXRlX3Rlc3Rf cmVzdWx0KHNlbGYuX3BvcnQsIHNlbGYuX3Rlc3RfbmFtZSwgZHJpdmVyX291dHB1dCwgZXhwZWN0 ZWRfZHJpdmVyX291dHB1dCwgdGVzdF9yZXN1bHQuZmFpbHVyZXMpCisgICAgICAgIHRlc3RfcmVz dWx0X3dyaXRlci53cml0ZV90ZXN0X3Jlc3VsdChzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9wb3J0 LCBzZWxmLl90ZXN0X25hbWUsIGRyaXZlcl9vdXRwdXQsIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQs IHRlc3RfcmVzdWx0LmZhaWx1cmVzKQogICAgICAgICByZXR1cm4gdGVzdF9yZXN1bHQKIAogICAg IGRlZiBfcnVuX3JlYmFzZWxpbmUoc2VsZik6CiAgICAgICAgIGRyaXZlcl9vdXRwdXQgPSBzZWxm Ll9kcml2ZXIucnVuX3Rlc3Qoc2VsZi5fZHJpdmVyX2lucHV0KCkpCiAgICAgICAgIGZhaWx1cmVz ID0gc2VsZi5faGFuZGxlX2Vycm9yKGRyaXZlcl9vdXRwdXQpCi0gICAgICAgIHRlc3RfcmVzdWx0 X3dyaXRlci53cml0ZV90ZXN0X3Jlc3VsdChzZWxmLl9wb3J0LCBzZWxmLl90ZXN0X25hbWUsIGRy aXZlcl9vdXRwdXQsIE5vbmUsIGZhaWx1cmVzKQorICAgICAgICB0ZXN0X3Jlc3VsdF93cml0ZXIu d3JpdGVfdGVzdF9yZXN1bHQoc2VsZi5fZmlsZXN5c3RlbSwgc2VsZi5fcG9ydCwgc2VsZi5fdGVz dF9uYW1lLCBkcml2ZXJfb3V0cHV0LCBOb25lLCBmYWlsdXJlcykKICAgICAgICAgIyBGSVhNRTog SXQgdGhlIHRlc3QgY3Jhc2hlZCBvciB0aW1lZCBvdXQsIGl0IG1pZ2h0IGJlIGJldHR0ZXIgdG8g YXZvaWQKICAgICAgICAgIyB0byB3cml0ZSBuZXcgYmFzZWxpbmVzLgogICAgICAgICBzZWxmLl9v dmVyd3JpdGVfYmFzZWxpbmVzKGRyaXZlcl9vdXRwdXQpCkBAIC0xNjIsNyArMTYzLDcgQEAgY2xh c3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgaWYgZGF0YSBpcyBOb25lOgogICAgICAgICAg ICAgcmV0dXJuCiAgICAgICAgIHBvcnQgPSBzZWxmLl9wb3J0Ci0gICAgICAgIGZzID0gcG9ydC5f ZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0KICAgICAgICAgaWYgZ2Vu ZXJhdGVfbmV3X2Jhc2VsaW5lOgogICAgICAgICAgICAgcmVsYXRpdmVfZGlyID0gZnMuZGlybmFt ZShzZWxmLl90ZXN0X25hbWUpCiAgICAgICAgICAgICBiYXNlbGluZV9wYXRoID0gcG9ydC5iYXNl bGluZV9wYXRoKCkKQEAgLTE4Nyw3ICsxODgsNyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVyOgog ICAgICAgICAgICAgICB3aGljaCBodG1sIGZpbGUgaXMgdXNlZCBmb3IgcHJvZHVjaW5nIHRoZSBk cml2ZXJfb3V0cHV0LgogICAgICAgICAiIiIKICAgICAgICAgZmFpbHVyZXMgPSBbXQotICAgICAg ICBmcyA9IHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAgZnMgPSBzZWxmLl9maWxlc3lz dGVtCiAgICAgICAgIGlmIGRyaXZlcl9vdXRwdXQudGltZW91dDoKICAgICAgICAgICAgIGZhaWx1 cmVzLmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVUaW1lb3V0KGJvb2wocmVmZXJlbmNlX2Zp bGVuYW1lKSkpCiAKQEAgLTI5NSw3ICsyOTYsNyBAQCBjbGFzcyBTaW5nbGVUZXN0UnVubmVyOgog ICAgICAgICAgICAgdG90YWxfdGVzdF90aW1lICs9IHRlc3RfcmVzdWx0LnRlc3RfcnVuX3RpbWUK IAogICAgICAgICBhc3NlcnQocmVmZXJlbmNlX291dHB1dCkKLSAgICAgICAgdGVzdF9yZXN1bHRf d3JpdGVyLndyaXRlX3Rlc3RfcmVzdWx0KHNlbGYuX3BvcnQsIHNlbGYuX3Rlc3RfbmFtZSwgdGVz dF9vdXRwdXQsIHJlZmVyZW5jZV9vdXRwdXQsIHRlc3RfcmVzdWx0LmZhaWx1cmVzKQorICAgICAg ICB0ZXN0X3Jlc3VsdF93cml0ZXIud3JpdGVfdGVzdF9yZXN1bHQoc2VsZi5fZmlsZXN5c3RlbSwg c2VsZi5fcG9ydCwgc2VsZi5fdGVzdF9uYW1lLCB0ZXN0X291dHB1dCwgcmVmZXJlbmNlX291dHB1 dCwgdGVzdF9yZXN1bHQuZmFpbHVyZXMpCiAgICAgICAgIHJldHVybiBUZXN0UmVzdWx0KHNlbGYu X3Rlc3RfbmFtZSwgdGVzdF9yZXN1bHQuZmFpbHVyZXMsIHRvdGFsX3Rlc3RfdGltZSArIHRlc3Rf cmVzdWx0LnRlc3RfcnVuX3RpbWUsIHRlc3RfcmVzdWx0Lmhhc19zdGRlcnIpCiAKICAgICBkZWYg X2NvbXBhcmVfb3V0cHV0X3dpdGhfcmVmZXJlbmNlKHNlbGYsIGRyaXZlcl9vdXRwdXQxLCBkcml2 ZXJfb3V0cHV0MiwgcmVmZXJlbmNlX2ZpbGVuYW1lLCBtaXNtYXRjaCk6CmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3Vs dF93cml0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKaW5kZXggYTQwYzA5MGI1ODA4ZGFlOGY3OTVlYzU5 YzM5Y2RlY2RkOTMyMjc2ZS4uNjI5ZGQ2OGQyNzIxZGRmMmY4MGZhNDM4ZGU2MThhOGQyZjkyZmM1 NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlci5weQpAQCAtMzYsMTEg KzM2LDExIEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscyBpbXBvcnQgdGVzdF9m YWlsdXJlcwogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKLWRlZiB3cml0 ZV90ZXN0X3Jlc3VsdChwb3J0LCB0ZXN0X25hbWUsIGRyaXZlcl9vdXRwdXQsCitkZWYgd3JpdGVf dGVzdF9yZXN1bHQoZmlsZXN5c3RlbSwgcG9ydCwgdGVzdF9uYW1lLCBkcml2ZXJfb3V0cHV0LAog ICAgICAgICAgICAgICAgICAgICAgIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQsIGZhaWx1cmVzKToK ICAgICAiIiJXcml0ZSB0aGUgdGVzdCByZXN1bHQgdG8gdGhlIHJlc3VsdCBvdXRwdXQgZGlyZWN0 b3J5LiIiIgogICAgIHJvb3Rfb3V0cHV0X2RpciA9IHBvcnQucmVzdWx0c19kaXJlY3RvcnkoKQot ICAgIHdyaXRlciA9IFRlc3RSZXN1bHRXcml0ZXIocG9ydCwgcm9vdF9vdXRwdXRfZGlyLCB0ZXN0 X25hbWUpCisgICAgd3JpdGVyID0gVGVzdFJlc3VsdFdyaXRlcihmaWxlc3lzdGVtLCBwb3J0LCBy b290X291dHB1dF9kaXIsIHRlc3RfbmFtZSkKICAgICBpZiBkcml2ZXJfb3V0cHV0LmVycm9yOgog ICAgICAgICB3cml0ZXIud3JpdGVfc3RkZXJyKGRyaXZlcl9vdXRwdXQuZXJyb3IpCiAKQEAgLTk2 LDE0ICs5NiwxNSBAQCBjbGFzcyBUZXN0UmVzdWx0V3JpdGVyKG9iamVjdCk6CiAgICAgRklMRU5B TUVfU1VGRklYX0lNQUdFX0RJRkYgPSAiLWRpZmYucG5nIgogICAgIEZJTEVOQU1FX1NVRkZJWF9J TUFHRV9ESUZGU19IVE1MID0gIi1kaWZmcy5odG1sIgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYs IHBvcnQsIHJvb3Rfb3V0cHV0X2RpciwgdGVzdF9uYW1lKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgZmlsZXN5c3RlbSwgcG9ydCwgcm9vdF9vdXRwdXRfZGlyLCB0ZXN0X25hbWUpOgorICAgICAg ICBzZWxmLl9maWxlc3lzdGVtID0gZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl9wb3J0ID0gcG9y dAogICAgICAgICBzZWxmLl9yb290X291dHB1dF9kaXIgPSByb290X291dHB1dF9kaXIKICAgICAg ICAgc2VsZi5fdGVzdF9uYW1lID0gdGVzdF9uYW1lCiAKICAgICBkZWYgX21ha2Vfb3V0cHV0X2Rp cmVjdG9yeShzZWxmKToKICAgICAgICAgIiIiQ3JlYXRlcyB0aGUgb3V0cHV0IGRpcmVjdG9yeSAo aWYgbmVlZGVkKSBmb3IgYSBnaXZlbiB0ZXN0IGZpbGVuYW1lLiIiIgotICAgICAgICBmcyA9IHNl bGYuX3BvcnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAgZnMgPSBzZWxmLl9maWxlc3lzdGVtCiAgICAg ICAgIG91dHB1dF9maWxlbmFtZSA9IGZzLmpvaW4oc2VsZi5fcm9vdF9vdXRwdXRfZGlyLCBzZWxm Ll90ZXN0X25hbWUpCiAgICAgICAgIGZzLm1heWJlX21ha2VfZGlyZWN0b3J5KGZzLmRpcm5hbWUo b3V0cHV0X2ZpbGVuYW1lKSkKIApAQCAtMTE5LDEyICsxMjAsMTIgQEAgY2xhc3MgVGVzdFJlc3Vs dFdyaXRlcihvYmplY3QpOgogICAgICAgICBSZXR1cm46CiAgICAgICAgICAgVGhlIGFic29sdXRl IHBhdGggdG8gdGhlIG91dHB1dCBmaWxlbmFtZQogICAgICAgICAiIiIKLSAgICAgICAgZnMgPSBz ZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmlsZXN5c3RlbQogICAg ICAgICBvdXRwdXRfZmlsZW5hbWUgPSBmcy5qb2luKHNlbGYuX3Jvb3Rfb3V0cHV0X2Rpciwgc2Vs Zi5fdGVzdF9uYW1lKQogICAgICAgICByZXR1cm4gZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1l KVswXSArIG1vZGlmaWVyCiAKICAgICBkZWYgX291dHB1dF90ZXN0bmFtZShzZWxmLCBtb2RpZmll cik6Ci0gICAgICAgIGZzID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNl bGYuX2ZpbGVzeXN0ZW0KICAgICAgICAgcmV0dXJuIGZzLnNwbGl0ZXh0KGZzLmJhc2VuYW1lKHNl bGYuX3Rlc3RfbmFtZSkpWzBdICsgbW9kaWZpZXIKIAogICAgIGRlZiB3cml0ZV9vdXRwdXRfZmls ZXMoc2VsZiwgZmlsZV90eXBlLCBvdXRwdXQsIGV4cGVjdGVkKToKQEAgLTE0NCwyMyArMTQ1LDIy IEBAIGNsYXNzIFRlc3RSZXN1bHRXcml0ZXIob2JqZWN0KToKICAgICAgICAgYWN0dWFsX2ZpbGVu YW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfQUNUVUFMICsg ZmlsZV90eXBlKQogICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVu YW1lKHNlbGYuRklMRU5BTUVfU1VGRklYX0VYUEVDVEVEICsgZmlsZV90eXBlKQogCi0gICAgICAg IGZzID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0 ZW0KICAgICAgICAgaWYgb3V0cHV0IGlzIG5vdCBOb25lOgogICAgICAgICAgICAgZnMud3JpdGVf YmluYXJ5X2ZpbGUoYWN0dWFsX2ZpbGVuYW1lLCBvdXRwdXQpCiAgICAgICAgIGlmIGV4cGVjdGVk IGlzIG5vdCBOb25lOgogICAgICAgICAgICAgZnMud3JpdGVfYmluYXJ5X2ZpbGUoZXhwZWN0ZWRf ZmlsZW5hbWUsIGV4cGVjdGVkKQogCiAgICAgZGVmIHdyaXRlX3N0ZGVycihzZWxmLCBlcnJvcik6 Ci0gICAgICAgIGZzID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYu X2ZpbGVzeXN0ZW0KICAgICAgICAgZmlsZW5hbWUgPSBzZWxmLm91dHB1dF9maWxlbmFtZShzZWxm LkZJTEVOQU1FX1NVRkZJWF9TVERFUlIgKyAiLnR4dCIpCiAgICAgICAgIGZzLm1heWJlX21ha2Vf ZGlyZWN0b3J5KGZzLmRpcm5hbWUoZmlsZW5hbWUpKQogICAgICAgICBmcy53cml0ZV9iaW5hcnlf ZmlsZShmaWxlbmFtZSwgZXJyb3IpCiAKICAgICBkZWYgd3JpdGVfY3Jhc2hfcmVwb3J0KHNlbGYs IGNyYXNoZWRfcHJvY2Vzc19uYW1lLCBlcnJvcik6Ci0gICAgICAgIGZzID0gc2VsZi5fcG9ydC5f ZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0KICAgICAgICAgZmlsZW5h bWUgPSBzZWxmLm91dHB1dF9maWxlbmFtZShzZWxmLkZJTEVOQU1FX1NVRkZJWF9DUkFTSF9MT0cg KyAiLnR4dCIpCiAgICAgICAgIGZzLm1heWJlX21ha2VfZGlyZWN0b3J5KGZzLmRpcm5hbWUoZmls ZW5hbWUpKQotICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGRuJ3QgYmUgZ3JhYmJpbmcgcHJpdmF0 ZSBtZW1iZXJzIG9mIHBvcnQuCiAgICAgICAgIGNyYXNoX2xvZ3MgPSBDcmFzaExvZ3MoZnMpCiAg ICAgICAgIGxvZyA9IGNyYXNoX2xvZ3MuZmluZF9uZXdlc3RfbG9nKGNyYXNoZWRfcHJvY2Vzc19u YW1lKQogICAgICAgICAjIENyYXNoTG9ncyBkb2Vzbid0IHN1cHBvcnQgZXZlcnkgcGxhdGZvcm0s IHNvIHdlIGZhbGwgYmFjayB0bwpAQCAtMTgwLDcgKzE4MCw3IEBAIGNsYXNzIFRlc3RSZXN1bHRX cml0ZXIob2JqZWN0KToKICAgICAgICAgZmlsZV90eXBlID0gJy50eHQnCiAgICAgICAgIGFjdHVh bF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklYX0FD VFVBTCArIGZpbGVfdHlwZSkKICAgICAgICAgZXhwZWN0ZWRfZmlsZW5hbWUgPSBzZWxmLm91dHB1 dF9maWxlbmFtZShzZWxmLkZJTEVOQU1FX1NVRkZJWF9FWFBFQ1RFRCArIGZpbGVfdHlwZSkKLSAg ICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmls ZXN5c3RlbQogICAgICAgICAjIFdlIHRyZWF0IGRpZmYgb3V0cHV0IGFzIGJpbmFyeS4gRGlmZiBv dXRwdXQgbWF5IGNvbnRhaW4gbXVsdGlwbGUgZmlsZXMKICAgICAgICAgIyBpbiBjb25mbGljdGlu ZyBlbmNvZGluZ3MuCiAgICAgICAgIGRpZmYgPSBzZWxmLl9wb3J0LmRpZmZfdGV4dChleHBlY3Rl ZF90ZXh0LCBhY3R1YWxfdGV4dCwgZXhwZWN0ZWRfZmlsZW5hbWUsIGFjdHVhbF9maWxlbmFtZSkK QEAgLTIwNSw3ICsyMDUsNyBAQCBjbGFzcyBUZXN0UmVzdWx0V3JpdGVyKG9iamVjdCk6CiAKICAg ICBkZWYgd3JpdGVfaW1hZ2VfZGlmZl9maWxlcyhzZWxmLCBpbWFnZV9kaWZmKToKICAgICAgICAg ZGlmZl9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklY X0lNQUdFX0RJRkYpCi0gICAgICAgIGZzID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbQorICAgICAg ICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0KICAgICAgICAgZnMud3JpdGVfYmluYXJ5X2ZpbGUoZGlm Zl9maWxlbmFtZSwgaW1hZ2VfZGlmZikKIAogICAgICAgICBkaWZmc19odG1sX2ZpbGVuYW1lID0g c2VsZi5vdXRwdXRfZmlsZW5hbWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfSU1BR0VfRElGRlNfSFRN TCkKQEAgLTI2MywxMCArMjYzLDEwIEBAIERpZmZlcmVuY2UgYmV0d2VlbiBpbWFnZXM6IDxhIGhy ZWY9IiUoZGlmZl9maWxlbmFtZSlzIj5kaWZmPC9hPjxicj4KICAgICAgICAgICAgICdwcmVmaXgn OiBzZWxmLl9vdXRwdXRfdGVzdG5hbWUoJycpLAogICAgICAgICB9CiAgICAgICAgICMgRklYTUU6 IFRoaXMgc2VlbXMgbGlrZSBhIHRleHQgZmlsZSwgbm90IGEgYmluYXJ5IGZpbGUuCi0gICAgICAg IHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0ud3JpdGVfYmluYXJ5X2ZpbGUoZGlmZnNfaHRtbF9maWxl bmFtZSwgaHRtbCkKKyAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZShk aWZmc19odG1sX2ZpbGVuYW1lLCBodG1sKQogCiAgICAgZGVmIGNvcHlfZmlsZShzZWxmLCBzcmNf ZmlsZXBhdGgpOgotICAgICAgICBmcyA9IHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAg ZnMgPSBzZWxmLl9maWxlc3lzdGVtCiAgICAgICAgIGFzc2VydCBmcy5leGlzdHMoc3JjX2ZpbGVw YXRoKSwgJ3NyY19maWxlcGF0aDogJXMnICUgc3JjX2ZpbGVwYXRoCiAgICAgICAgIGRzdF9maWxl cGF0aCA9IGZzLmpvaW4oc2VsZi5fcm9vdF9vdXRwdXRfZGlyLCBzZWxmLl9wb3J0LnJlbGF0aXZl X3Rlc3RfZmlsZW5hbWUoc3JjX2ZpbGVwYXRoKSkKICAgICAgICAgc2VsZi5fbWFrZV9vdXRwdXRf ZGlyZWN0b3J5KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlcl91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRl cl91bml0dGVzdC5weQppbmRleCBjNzk4NDZhMmQyMGFmYjYyZmRjMTA0YzZkYjNiODQ4MDE1MmU5 YWEwLi4zYjliNTIyYWQ5ZGNiNzQ2OWI3MDcwZjU5MGQxZmEzYTFiMTZjY2ZkIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jl c3VsdF93cml0ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0LnB5CkBAIC01 MSw3ICs1MSw3IEBAIGNsYXNzIFRlc3RSZXN1bHRXcml0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgZHJpdmVyX291dHB1dDEgPSBEcml2ZXJPdXRwdXQoJ3RleHQxJywgJ2ltYWdl MScsICdpbWFnZWhhc2gxJywgJ2F1ZGlvMScpCiAgICAgICAgIGRyaXZlcl9vdXRwdXQyID0gRHJp dmVyT3V0cHV0KCd0ZXh0MicsICdpbWFnZTInLCAnaW1hZ2VoYXNoMicsICdhdWRpbzInKQogICAg ICAgICBmYWlsdXJlcyA9IFt0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2godGVz dF9yZWZlcmVuY2VfZmlsZSldCi0gICAgICAgIHRlc3RfcmVzdWx0X3dyaXRlci53cml0ZV90ZXN0 X3Jlc3VsdChJbWFnZURpZmZUZXN0UG9ydChob3N0KSwgdGVzdF9uYW1lLAorICAgICAgICB0ZXN0 X3Jlc3VsdF93cml0ZXIud3JpdGVfdGVzdF9yZXN1bHQoaG9zdC5maWxlc3lzdGVtLCBJbWFnZURp ZmZUZXN0UG9ydChob3N0KSwgdGVzdF9uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZHJpdmVyX291dHB1dDEsIGRyaXZlcl9vdXRwdXQyLCBmYWlsdXJl cykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChbMF0sIHVzZWRfdG9sZXJhbmNlX3ZhbHVlcykK IAo= 132725 2012-03-19 17:01:23 -0700 2012-03-19 17:16:58 -0700 fix nit in write_image_diff_files() as well bug-81595-20120319170122.patch text/plain 12052 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMjYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGIzMGY0YTViN2QxYmFjYTE1MGM0Y2Q4NWU5YThiNzE4 MjlhMzU4Ny4uOTA0YmIyOWQxZjlmYzRkOTlkMjU2M2VlMGJhYjM4ZjA4ZDY0YzMyZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3 IEBACiAyMDEyLTAzLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCBzb21lIHBvcnQuX2ZpbGVzeXN0ZW0gcmVmZXJlbmNl cyB0byBub3QgcmVmZXJlbmNlIHByaXZhdGUgbWVtYmVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE1OTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSBzaG91bGQgYmUgbm8gZnVuY3Rpb25hbCBj aGFuZ2VzIGluIHRoaXMgcGF0Y2gsIGp1c3Qgc29tZQorICAgICAgICByZWZhY3RvcmluZy4gQWxz bywgZml4ZXMgYSBtaW5vciBuaXQgaW4gd3JpdGVfaW1hZ2VfZGlmZl9maWxlcygoKQorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvc2luZ2xlX3Rl c3RfcnVubmVyLnB5OgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fX2luaXRfXyk6CisgICAg ICAgIChTaW5nbGVUZXN0UnVubmVyLl9ydW5fY29tcGFyZV90ZXN0KToKKyAgICAgICAgKFNpbmds ZVRlc3RSdW5uZXIuX3J1bl9yZWJhc2VsaW5lKToKKyAgICAgICAgKFNpbmdsZVRlc3RSdW5uZXIu X3NhdmVfYmFzZWxpbmVfZGF0YSk6CisgICAgICAgIChTaW5nbGVUZXN0UnVubmVyLl9oYW5kbGVf ZXJyb3IpOgorICAgICAgICAoU2luZ2xlVGVzdFJ1bm5lci5fcnVuX3JlZnRlc3QpOgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0 X3dyaXRlci5weToKKyAgICAgICAgKHdyaXRlX3Rlc3RfcmVzdWx0KToKKyAgICAgICAgKFRlc3RS ZXN1bHRXcml0ZXIuX19pbml0X18pOgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlci5fbWFrZV9v dXRwdXRfZGlyZWN0b3J5KToKKyAgICAgICAgKFRlc3RSZXN1bHRXcml0ZXIub3V0cHV0X2ZpbGVu YW1lKToKKyAgICAgICAgKFRlc3RSZXN1bHRXcml0ZXIuX291dHB1dF90ZXN0bmFtZSk6CisgICAg ICAgIChUZXN0UmVzdWx0V3JpdGVyLndyaXRlX291dHB1dF9maWxlcyk6CisgICAgICAgIChUZXN0 UmVzdWx0V3JpdGVyLndyaXRlX3N0ZGVycik6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyLndy aXRlX2NyYXNoX3JlcG9ydCk6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyLmNyZWF0ZV90ZXh0 X2RpZmZfYW5kX3dyaXRlX3Jlc3VsdCk6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyLndyaXRl X2ltYWdlX2RpZmZfZmlsZXMpOgorICAgICAgICAoY29weV9maWxlKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXJf dW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0UmVzdWx0V3JpdGVyVGVzdC50ZXN0X3JlZnRlc3Rf ZGlmZl9pbWFnZSk6CisKKzIwMTItMDMtMTkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1 bS5vcmc+CisKICAgICAgICAgTlJXVCBydW5zIHNvbWUgdGVzdHMgdGhhdCBhcmUgc2tpcHBlZCB3 aXRoIC1pIGNvbW1hbmQgbGluZSBvcHRpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTgxNTM1CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0 X3J1bm5lci5weQppbmRleCA2Mzc1ODIwY2QzOWMzYTAwMzJjYzc2M2QyMDA4ZWEwYjg2ZTJhZDkx Li5kY2IxMGMxM2RiZjY2NDA4NGJjNGUyNWM3NmQzMDBhMzRlZDZiZmRlIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5nbGVfdGVz dF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIFNp bmdsZVRlc3RSdW5uZXI6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHBvcnQsIGRy aXZlciwgdGVzdF9pbnB1dCwgd29ya2VyX25hbWUpOgogICAgICAgICBzZWxmLl9vcHRpb25zID0g b3B0aW9ucwogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAorICAgICAgICBzZWxmLl9maWxlc3lz dGVtID0gcG9ydC5ob3N0LmZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5fZHJpdmVyID0gZHJpdmVy CiAgICAgICAgIHNlbGYuX3RpbWVvdXQgPSB0ZXN0X2lucHV0LnRpbWVvdXQKICAgICAgICAgc2Vs Zi5fd29ya2VyX25hbWUgPSB3b3JrZXJfbmFtZQpAQCAtNjcsNyArNjgsNyBAQCBjbGFzcyBTaW5n bGVUZXN0UnVubmVyOgogICAgICAgICAgICAgIyBpbiBlaXRoZXIgbGF5b3V0IHRlc3RzIG9yIHJl ZnRlc3RzLCBidXQgbm90IGluIGJvdGguCiAgICAgICAgICAgICBmb3Igc3VmZml4IGluICgnLnR4 dCcsICcucG5nJywgJy53YXYnKToKICAgICAgICAgICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9 IHNlbGYuX3BvcnQuZXhwZWN0ZWRfZmlsZW5hbWUoc2VsZi5fdGVzdF9uYW1lLCBzdWZmaXgpCi0g ICAgICAgICAgICAgICAgaWYgcG9ydC5ob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKGV4cGVjdGVkX2Zp bGVuYW1lKToKKyAgICAgICAgICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhleHBl Y3RlZF9maWxlbmFtZSk6CiAgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJyVzIGlzIGJv dGggYSByZWZ0ZXN0IGFuZCBoYXMgYW4gZXhwZWN0ZWQgb3V0cHV0IGZpbGUgJXMuJywKICAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuX3Rlc3RfbmFtZSwgZXhwZWN0ZWRfZmlsZW5hbWUpCiAK QEAgLTExNSwxMyArMTE2LDEzIEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgICAgIHRl c3RfcmVzdWx0ID0gc2VsZi5fY29tcGFyZV9vdXRwdXQoZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRf ZHJpdmVyX291dHB1dCkKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5uZXdfdGVzdF9yZXN1bHRz OgogICAgICAgICAgICAgc2VsZi5fYWRkX21pc3NpbmdfYmFzZWxpbmVzKHRlc3RfcmVzdWx0LCBk cml2ZXJfb3V0cHV0KQotICAgICAgICB0ZXN0X3Jlc3VsdF93cml0ZXIud3JpdGVfdGVzdF9yZXN1 bHQoc2VsZi5fcG9ydCwgc2VsZi5fdGVzdF9uYW1lLCBkcml2ZXJfb3V0cHV0LCBleHBlY3RlZF9k cml2ZXJfb3V0cHV0LCB0ZXN0X3Jlc3VsdC5mYWlsdXJlcykKKyAgICAgICAgdGVzdF9yZXN1bHRf d3JpdGVyLndyaXRlX3Rlc3RfcmVzdWx0KHNlbGYuX2ZpbGVzeXN0ZW0sIHNlbGYuX3BvcnQsIHNl bGYuX3Rlc3RfbmFtZSwgZHJpdmVyX291dHB1dCwgZXhwZWN0ZWRfZHJpdmVyX291dHB1dCwgdGVz dF9yZXN1bHQuZmFpbHVyZXMpCiAgICAgICAgIHJldHVybiB0ZXN0X3Jlc3VsdAogCiAgICAgZGVm IF9ydW5fcmViYXNlbGluZShzZWxmKToKICAgICAgICAgZHJpdmVyX291dHB1dCA9IHNlbGYuX2Ry aXZlci5ydW5fdGVzdChzZWxmLl9kcml2ZXJfaW5wdXQoKSkKICAgICAgICAgZmFpbHVyZXMgPSBz ZWxmLl9oYW5kbGVfZXJyb3IoZHJpdmVyX291dHB1dCkKLSAgICAgICAgdGVzdF9yZXN1bHRfd3Jp dGVyLndyaXRlX3Rlc3RfcmVzdWx0KHNlbGYuX3BvcnQsIHNlbGYuX3Rlc3RfbmFtZSwgZHJpdmVy X291dHB1dCwgTm9uZSwgZmFpbHVyZXMpCisgICAgICAgIHRlc3RfcmVzdWx0X3dyaXRlci53cml0 ZV90ZXN0X3Jlc3VsdChzZWxmLl9maWxlc3lzdGVtLCBzZWxmLl9wb3J0LCBzZWxmLl90ZXN0X25h bWUsIGRyaXZlcl9vdXRwdXQsIE5vbmUsIGZhaWx1cmVzKQogICAgICAgICAjIEZJWE1FOiBJdCB0 aGUgdGVzdCBjcmFzaGVkIG9yIHRpbWVkIG91dCwgaXQgbWlnaHQgYmUgYmV0dHRlciB0byBhdm9p ZAogICAgICAgICAjIHRvIHdyaXRlIG5ldyBiYXNlbGluZXMuCiAgICAgICAgIHNlbGYuX292ZXJ3 cml0ZV9iYXNlbGluZXMoZHJpdmVyX291dHB1dCkKQEAgLTE2Miw3ICsxNjMsNyBAQCBjbGFzcyBT aW5nbGVUZXN0UnVubmVyOgogICAgICAgICBpZiBkYXRhIGlzIE5vbmU6CiAgICAgICAgICAgICBy ZXR1cm4KICAgICAgICAgcG9ydCA9IHNlbGYuX3BvcnQKLSAgICAgICAgZnMgPSBwb3J0Ll9maWxl c3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmlsZXN5c3RlbQogICAgICAgICBpZiBnZW5lcmF0 ZV9uZXdfYmFzZWxpbmU6CiAgICAgICAgICAgICByZWxhdGl2ZV9kaXIgPSBmcy5kaXJuYW1lKHNl bGYuX3Rlc3RfbmFtZSkKICAgICAgICAgICAgIGJhc2VsaW5lX3BhdGggPSBwb3J0LmJhc2VsaW5l X3BhdGgoKQpAQCAtMTg3LDcgKzE4OCw3IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAg ICAgICAgICAgIHdoaWNoIGh0bWwgZmlsZSBpcyB1c2VkIGZvciBwcm9kdWNpbmcgdGhlIGRyaXZl cl9vdXRwdXQuCiAgICAgICAgICIiIgogICAgICAgICBmYWlsdXJlcyA9IFtdCi0gICAgICAgIGZz ID0gc2VsZi5fcG9ydC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0K ICAgICAgICAgaWYgZHJpdmVyX291dHB1dC50aW1lb3V0OgogICAgICAgICAgICAgZmFpbHVyZXMu YXBwZW5kKHRlc3RfZmFpbHVyZXMuRmFpbHVyZVRpbWVvdXQoYm9vbChyZWZlcmVuY2VfZmlsZW5h bWUpKSkKIApAQCAtMjk1LDcgKzI5Niw3IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAg ICAgICAgICB0b3RhbF90ZXN0X3RpbWUgKz0gdGVzdF9yZXN1bHQudGVzdF9ydW5fdGltZQogCiAg ICAgICAgIGFzc2VydChyZWZlcmVuY2Vfb3V0cHV0KQotICAgICAgICB0ZXN0X3Jlc3VsdF93cml0 ZXIud3JpdGVfdGVzdF9yZXN1bHQoc2VsZi5fcG9ydCwgc2VsZi5fdGVzdF9uYW1lLCB0ZXN0X291 dHB1dCwgcmVmZXJlbmNlX291dHB1dCwgdGVzdF9yZXN1bHQuZmFpbHVyZXMpCisgICAgICAgIHRl c3RfcmVzdWx0X3dyaXRlci53cml0ZV90ZXN0X3Jlc3VsdChzZWxmLl9maWxlc3lzdGVtLCBzZWxm Ll9wb3J0LCBzZWxmLl90ZXN0X25hbWUsIHRlc3Rfb3V0cHV0LCByZWZlcmVuY2Vfb3V0cHV0LCB0 ZXN0X3Jlc3VsdC5mYWlsdXJlcykKICAgICAgICAgcmV0dXJuIFRlc3RSZXN1bHQoc2VsZi5fdGVz dF9uYW1lLCB0ZXN0X3Jlc3VsdC5mYWlsdXJlcywgdG90YWxfdGVzdF90aW1lICsgdGVzdF9yZXN1 bHQudGVzdF9ydW5fdGltZSwgdGVzdF9yZXN1bHQuaGFzX3N0ZGVycikKIAogICAgIGRlZiBfY29t cGFyZV9vdXRwdXRfd2l0aF9yZWZlcmVuY2Uoc2VsZiwgZHJpdmVyX291dHB1dDEsIGRyaXZlcl9v dXRwdXQyLCByZWZlcmVuY2VfZmlsZW5hbWUsIG1pc21hdGNoKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dy aXRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L3Rlc3RfcmVzdWx0X3dyaXRlci5weQppbmRleCBhNDBjMDkwYjU4MDhkYWU4Zjc5NWVjNTljMzlj ZGVjZGQ5MzIyNzZlLi43NWQ1Mjc4YjM2NTJhYzVkNjlkNDNmYWNiMmRhZDAzMjhlMzMwZDFmIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy90ZXN0X3Jlc3VsdF93cml0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyLnB5CkBAIC0zNiwxMSArMzYs MTEgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2ZhaWx1 cmVzCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAotZGVmIHdyaXRlX3Rl c3RfcmVzdWx0KHBvcnQsIHRlc3RfbmFtZSwgZHJpdmVyX291dHB1dCwKK2RlZiB3cml0ZV90ZXN0 X3Jlc3VsdChmaWxlc3lzdGVtLCBwb3J0LCB0ZXN0X25hbWUsIGRyaXZlcl9vdXRwdXQsCiAgICAg ICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfZHJpdmVyX291dHB1dCwgZmFpbHVyZXMpOgogICAg ICIiIldyaXRlIHRoZSB0ZXN0IHJlc3VsdCB0byB0aGUgcmVzdWx0IG91dHB1dCBkaXJlY3Rvcnku IiIiCiAgICAgcm9vdF9vdXRwdXRfZGlyID0gcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpCi0gICAg d3JpdGVyID0gVGVzdFJlc3VsdFdyaXRlcihwb3J0LCByb290X291dHB1dF9kaXIsIHRlc3RfbmFt ZSkKKyAgICB3cml0ZXIgPSBUZXN0UmVzdWx0V3JpdGVyKGZpbGVzeXN0ZW0sIHBvcnQsIHJvb3Rf b3V0cHV0X2RpciwgdGVzdF9uYW1lKQogICAgIGlmIGRyaXZlcl9vdXRwdXQuZXJyb3I6CiAgICAg ICAgIHdyaXRlci53cml0ZV9zdGRlcnIoZHJpdmVyX291dHB1dC5lcnJvcikKIApAQCAtOTYsMTQg Kzk2LDE1IEBAIGNsYXNzIFRlc3RSZXN1bHRXcml0ZXIob2JqZWN0KToKICAgICBGSUxFTkFNRV9T VUZGSVhfSU1BR0VfRElGRiA9ICItZGlmZi5wbmciCiAgICAgRklMRU5BTUVfU1VGRklYX0lNQUdF X0RJRkZTX0hUTUwgPSAiLWRpZmZzLmh0bWwiCiAKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9y dCwgcm9vdF9vdXRwdXRfZGlyLCB0ZXN0X25hbWUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBm aWxlc3lzdGVtLCBwb3J0LCByb290X291dHB1dF9kaXIsIHRlc3RfbmFtZSk6CisgICAgICAgIHNl bGYuX2ZpbGVzeXN0ZW0gPSBmaWxlc3lzdGVtCiAgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0CiAg ICAgICAgIHNlbGYuX3Jvb3Rfb3V0cHV0X2RpciA9IHJvb3Rfb3V0cHV0X2RpcgogICAgICAgICBz ZWxmLl90ZXN0X25hbWUgPSB0ZXN0X25hbWUKIAogICAgIGRlZiBfbWFrZV9vdXRwdXRfZGlyZWN0 b3J5KHNlbGYpOgogICAgICAgICAiIiJDcmVhdGVzIHRoZSBvdXRwdXQgZGlyZWN0b3J5IChpZiBu ZWVkZWQpIGZvciBhIGdpdmVuIHRlc3QgZmlsZW5hbWUuIiIiCi0gICAgICAgIGZzID0gc2VsZi5f cG9ydC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0KICAgICAgICAg b3V0cHV0X2ZpbGVuYW1lID0gZnMuam9pbihzZWxmLl9yb290X291dHB1dF9kaXIsIHNlbGYuX3Rl c3RfbmFtZSkKICAgICAgICAgZnMubWF5YmVfbWFrZV9kaXJlY3RvcnkoZnMuZGlybmFtZShvdXRw dXRfZmlsZW5hbWUpKQogCkBAIC0xMTksMTIgKzEyMCwxMiBAQCBjbGFzcyBUZXN0UmVzdWx0V3Jp dGVyKG9iamVjdCk6CiAgICAgICAgIFJldHVybjoKICAgICAgICAgICBUaGUgYWJzb2x1dGUgcGF0 aCB0byB0aGUgb3V0cHV0IGZpbGVuYW1lCiAgICAgICAgICIiIgotICAgICAgICBmcyA9IHNlbGYu X3BvcnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAgZnMgPSBzZWxmLl9maWxlc3lzdGVtCiAgICAgICAg IG91dHB1dF9maWxlbmFtZSA9IGZzLmpvaW4oc2VsZi5fcm9vdF9vdXRwdXRfZGlyLCBzZWxmLl90 ZXN0X25hbWUpCiAgICAgICAgIHJldHVybiBmcy5zcGxpdGV4dChvdXRwdXRfZmlsZW5hbWUpWzBd ICsgbW9kaWZpZXIKIAogICAgIGRlZiBfb3V0cHV0X3Rlc3RuYW1lKHNlbGYsIG1vZGlmaWVyKToK LSAgICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5f ZmlsZXN5c3RlbQogICAgICAgICByZXR1cm4gZnMuc3BsaXRleHQoZnMuYmFzZW5hbWUoc2VsZi5f dGVzdF9uYW1lKSlbMF0gKyBtb2RpZmllcgogCiAgICAgZGVmIHdyaXRlX291dHB1dF9maWxlcyhz ZWxmLCBmaWxlX3R5cGUsIG91dHB1dCwgZXhwZWN0ZWQpOgpAQCAtMTQ0LDIzICsxNDUsMjIgQEAg Y2xhc3MgVGVzdFJlc3VsdFdyaXRlcihvYmplY3QpOgogICAgICAgICBhY3R1YWxfZmlsZW5hbWUg PSBzZWxmLm91dHB1dF9maWxlbmFtZShzZWxmLkZJTEVOQU1FX1NVRkZJWF9BQ1RVQUwgKyBmaWxl X3R5cGUpCiAgICAgICAgIGV4cGVjdGVkX2ZpbGVuYW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUo c2VsZi5GSUxFTkFNRV9TVUZGSVhfRVhQRUNURUQgKyBmaWxlX3R5cGUpCiAKLSAgICAgICAgZnMg PSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmlsZXN5c3RlbQog ICAgICAgICBpZiBvdXRwdXQgaXMgbm90IE5vbmU6CiAgICAgICAgICAgICBmcy53cml0ZV9iaW5h cnlfZmlsZShhY3R1YWxfZmlsZW5hbWUsIG91dHB1dCkKICAgICAgICAgaWYgZXhwZWN0ZWQgaXMg bm90IE5vbmU6CiAgICAgICAgICAgICBmcy53cml0ZV9iaW5hcnlfZmlsZShleHBlY3RlZF9maWxl bmFtZSwgZXhwZWN0ZWQpCiAKICAgICBkZWYgd3JpdGVfc3RkZXJyKHNlbGYsIGVycm9yKToKLSAg ICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmls ZXN5c3RlbQogICAgICAgICBmaWxlbmFtZSA9IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklM RU5BTUVfU1VGRklYX1NUREVSUiArICIudHh0IikKICAgICAgICAgZnMubWF5YmVfbWFrZV9kaXJl Y3RvcnkoZnMuZGlybmFtZShmaWxlbmFtZSkpCiAgICAgICAgIGZzLndyaXRlX2JpbmFyeV9maWxl KGZpbGVuYW1lLCBlcnJvcikKIAogICAgIGRlZiB3cml0ZV9jcmFzaF9yZXBvcnQoc2VsZiwgY3Jh c2hlZF9wcm9jZXNzX25hbWUsIGVycm9yKToKLSAgICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxl c3lzdGVtCisgICAgICAgIGZzID0gc2VsZi5fZmlsZXN5c3RlbQogICAgICAgICBmaWxlbmFtZSA9 IHNlbGYub3V0cHV0X2ZpbGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklYX0NSQVNIX0xPRyArICIu dHh0IikKICAgICAgICAgZnMubWF5YmVfbWFrZV9kaXJlY3RvcnkoZnMuZGlybmFtZShmaWxlbmFt ZSkpCi0gICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBiZSBncmFiYmluZyBwcml2YXRlIG1l bWJlcnMgb2YgcG9ydC4KICAgICAgICAgY3Jhc2hfbG9ncyA9IENyYXNoTG9ncyhmcykKICAgICAg ICAgbG9nID0gY3Jhc2hfbG9ncy5maW5kX25ld2VzdF9sb2coY3Jhc2hlZF9wcm9jZXNzX25hbWUp CiAgICAgICAgICMgQ3Jhc2hMb2dzIGRvZXNuJ3Qgc3VwcG9ydCBldmVyeSBwbGF0Zm9ybSwgc28g d2UgZmFsbCBiYWNrIHRvCkBAIC0xODAsNyArMTgwLDcgQEAgY2xhc3MgVGVzdFJlc3VsdFdyaXRl cihvYmplY3QpOgogICAgICAgICBmaWxlX3R5cGUgPSAnLnR4dCcKICAgICAgICAgYWN0dWFsX2Zp bGVuYW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfQUNUVUFM ICsgZmlsZV90eXBlKQogICAgICAgICBleHBlY3RlZF9maWxlbmFtZSA9IHNlbGYub3V0cHV0X2Zp bGVuYW1lKHNlbGYuRklMRU5BTUVfU1VGRklYX0VYUEVDVEVEICsgZmlsZV90eXBlKQotICAgICAg ICBmcyA9IHNlbGYuX3BvcnQuX2ZpbGVzeXN0ZW0KKyAgICAgICAgZnMgPSBzZWxmLl9maWxlc3lz dGVtCiAgICAgICAgICMgV2UgdHJlYXQgZGlmZiBvdXRwdXQgYXMgYmluYXJ5LiBEaWZmIG91dHB1 dCBtYXkgY29udGFpbiBtdWx0aXBsZSBmaWxlcwogICAgICAgICAjIGluIGNvbmZsaWN0aW5nIGVu Y29kaW5ncy4KICAgICAgICAgZGlmZiA9IHNlbGYuX3BvcnQuZGlmZl90ZXh0KGV4cGVjdGVkX3Rl eHQsIGFjdHVhbF90ZXh0LCBleHBlY3RlZF9maWxlbmFtZSwgYWN0dWFsX2ZpbGVuYW1lKQpAQCAt MjA1LDcgKzIwNSw3IEBAIGNsYXNzIFRlc3RSZXN1bHRXcml0ZXIob2JqZWN0KToKIAogICAgIGRl ZiB3cml0ZV9pbWFnZV9kaWZmX2ZpbGVzKHNlbGYsIGltYWdlX2RpZmYpOgogICAgICAgICBkaWZm X2ZpbGVuYW1lID0gc2VsZi5vdXRwdXRfZmlsZW5hbWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfSU1B R0VfRElGRikKLSAgICAgICAgZnMgPSBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtCisgICAgICAgIGZz ID0gc2VsZi5fZmlsZXN5c3RlbQogICAgICAgICBmcy53cml0ZV9iaW5hcnlfZmlsZShkaWZmX2Zp bGVuYW1lLCBpbWFnZV9kaWZmKQogCiAgICAgICAgIGRpZmZzX2h0bWxfZmlsZW5hbWUgPSBzZWxm Lm91dHB1dF9maWxlbmFtZShzZWxmLkZJTEVOQU1FX1NVRkZJWF9JTUFHRV9ESUZGU19IVE1MKQpA QCAtMjYyLDExICsyNjIsMTAgQEAgRGlmZmVyZW5jZSBiZXR3ZWVuIGltYWdlczogPGEgaHJlZj0i JShkaWZmX2ZpbGVuYW1lKXMiPmRpZmY8L2E+PGJyPgogICAgICAgICAgICAgJ2RpZmZfZmlsZW5h bWUnOiBzZWxmLl9vdXRwdXRfdGVzdG5hbWUoc2VsZi5GSUxFTkFNRV9TVUZGSVhfSU1BR0VfRElG RiksCiAgICAgICAgICAgICAncHJlZml4Jzogc2VsZi5fb3V0cHV0X3Rlc3RuYW1lKCcnKSwKICAg ICAgICAgfQotICAgICAgICAjIEZJWE1FOiBUaGlzIHNlZW1zIGxpa2UgYSB0ZXh0IGZpbGUsIG5v dCBhIGJpbmFyeSBmaWxlLgotICAgICAgICBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtLndyaXRlX2Jp bmFyeV9maWxlKGRpZmZzX2h0bWxfZmlsZW5hbWUsIGh0bWwpCisgICAgICAgIHNlbGYuX2ZpbGVz eXN0ZW0ud3JpdGVfdGV4dF9maWxlKGRpZmZzX2h0bWxfZmlsZW5hbWUsIGh0bWwpCiAKICAgICBk ZWYgY29weV9maWxlKHNlbGYsIHNyY19maWxlcGF0aCk6Ci0gICAgICAgIGZzID0gc2VsZi5fcG9y dC5fZmlsZXN5c3RlbQorICAgICAgICBmcyA9IHNlbGYuX2ZpbGVzeXN0ZW0KICAgICAgICAgYXNz ZXJ0IGZzLmV4aXN0cyhzcmNfZmlsZXBhdGgpLCAnc3JjX2ZpbGVwYXRoOiAlcycgJSBzcmNfZmls ZXBhdGgKICAgICAgICAgZHN0X2ZpbGVwYXRoID0gZnMuam9pbihzZWxmLl9yb290X291dHB1dF9k aXIsIHNlbGYuX3BvcnQucmVsYXRpdmVfdGVzdF9maWxlbmFtZShzcmNfZmlsZXBhdGgpKQogICAg ICAgICBzZWxmLl9tYWtlX291dHB1dF9kaXJlY3RvcnkoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVy X3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0LnB5CmluZGV4IGM3OTg0NmEyZDIwYWZi NjJmZGMxMDRjNmRiM2I4NDgwMTUyZTlhYTAuLjNiOWI1MjJhZDlkY2I3NDY5YjcwNzBmNTkwZDFm YTNhMWIxNmNjZmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVzdWx0X3dyaXRlcl91bml0dGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93 cml0ZXJfdW5pdHRlc3QucHkKQEAgLTUxLDcgKzUxLDcgQEAgY2xhc3MgVGVzdFJlc3VsdFdyaXRl clRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBkcml2ZXJfb3V0cHV0MSA9IERyaXZl ck91dHB1dCgndGV4dDEnLCAnaW1hZ2UxJywgJ2ltYWdlaGFzaDEnLCAnYXVkaW8xJykKICAgICAg ICAgZHJpdmVyX291dHB1dDIgPSBEcml2ZXJPdXRwdXQoJ3RleHQyJywgJ2ltYWdlMicsICdpbWFn ZWhhc2gyJywgJ2F1ZGlvMicpCiAgICAgICAgIGZhaWx1cmVzID0gW3Rlc3RfZmFpbHVyZXMuRmFp bHVyZVJlZnRlc3RNaXNtYXRjaCh0ZXN0X3JlZmVyZW5jZV9maWxlKV0KLSAgICAgICAgdGVzdF9y ZXN1bHRfd3JpdGVyLndyaXRlX3Rlc3RfcmVzdWx0KEltYWdlRGlmZlRlc3RQb3J0KGhvc3QpLCB0 ZXN0X25hbWUsCisgICAgICAgIHRlc3RfcmVzdWx0X3dyaXRlci53cml0ZV90ZXN0X3Jlc3VsdCho b3N0LmZpbGVzeXN0ZW0sIEltYWdlRGlmZlRlc3RQb3J0KGhvc3QpLCB0ZXN0X25hbWUsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkcml2ZXJfb3V0cHV0MSwg ZHJpdmVyX291dHB1dDIsIGZhaWx1cmVzKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFswXSwg dXNlZF90b2xlcmFuY2VfdmFsdWVzKQogCg==