101240 2012-11-05 11:44:10 -0800 webkitpy: lint, clean up rebaseline.py 2012-11-05 11:48:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan oldest_to_newest 758752 0 dpranke 2012-11-05 11:44:10 -0800 webkitpy: lint, clean up rebaseline.py 758753 1 172371 dpranke 2012-11-05 11:44:42 -0800 Created attachment 172371 Patch 758757 2 dpranke 2012-11-05 11:48:15 -0800 Committed r133510: <http://trac.webkit.org/changeset/133510> 172371 2012-11-05 11:44:42 -0800 2012-11-05 11:46:56 -0800 Patch bug-101240-20121105114256.patch text/plain 10825 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmRjMWY2MzVhNjJlNmM1YTQ5NzA4YTQwODIwZDdjNzg2 MmZiMjRjNy4uMGIzMWI2ODFhNWJlMzE5NjViMGE3OWY2OGE2NzYzNzY2MjRiNTQ5ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMw IEBACiAyMDEyLTExLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBsaW50LCBjbGVhbiB1cCByZWJhc2VsaW5lLnB5CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyNDAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNaXNjZWxsYW5lb3VzIGNsZWFu dXAgb2YgbGludCBlcnJvcnMgYW5kIHdhcm5pbmdzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChBYnN0cmFjdFJlYmFz ZWxpbmluZ0NvbW1hbmQpOgorICAgICAgICAoUmViYXNlbGluZVRlc3QuX3Rlc3Rfcm9vdCk6Cisg ICAgICAgIChPcHRpbWl6ZUJhc2VsaW5lcy5fb3B0aW1pemVfYmFzZWxpbmUpOgorICAgICAgICAo T3B0aW1pemVCYXNlbGluZXMuZXhlY3V0ZSk6CisgICAgICAgIChBbmFseXplQmFzZWxpbmVzLl9f aW5pdF9fKToKKyAgICAgICAgKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZCk6Cisg ICAgICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQuX2J1aWxkZXJzX3RvX2Zl dGNoX2Zyb20pOgorICAgICAgICAoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kLl9m aWxlc190b19hZGQpOgorICAgICAgICAoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5k Ll9yZWJhc2VsaW5lKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuX19pbml0X18p OgorICAgICAgICAoUmViYXNlbGluZS5leGVjdXRlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weToKKyAgICAgICAgKF9CYXNl VGVzdENhc2Uuc2V0VXApOgorICAgICAgICAoVGVzdEFuYWx5emVCYXNlbGluZXMuc2V0VXApOgor CisyMDEyLTExLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIHdlYmtpdC1wYXRjaCBvcHRpbWl6ZS1iYXNlbGluZXMgc2hvdWxkIHRha2UgYSAtLXBsYXRm b3JtIGFyZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTc2MjMKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3JlYmFzZWxpbmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmVi YXNlbGluZS5weQppbmRleCBiYjk1YTI5MzJmZThmYWEyY2Q3NGZjYzAyZTMyYjg2YzI4MjY0ZTM3 Li5lNWMzYzQ4NTY1NmVmZGExNDRlZDg2NzRlOGExOGUwYWZjYWQ2MzJiIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpAQCAtMjks MjUgKzI5LDE1IEBACiBpbXBvcnQganNvbgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcHRwYXJz ZQotaW1wb3J0IG9zLnBhdGgKLWltcG9ydCByZQotaW1wb3J0IHNodXRpbAogaW1wb3J0IHN5cwot aW1wb3J0IHVybGxpYgogCi1pbXBvcnQgd2Via2l0cHkuY29tbW9uLmNvbmZpZy51cmxzIGFzIGNv bmZpZ191cmxzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5iYXNlbGluZW9wdGltaXpl ciBpbXBvcnQgQmFzZWxpbmVPcHRpbWl6ZXIKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5idWls ZGJvdCBpbXBvcnQgQnVpbGRCb3QKLWZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5sYXlvdXR0ZXN0 cmVzdWx0cyBpbXBvcnQgTGF5b3V0VGVzdFJlc3VsdHMKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0udXNlciBpbXBvcnQgVXNlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuY29udHJv bGxlcnMudGVzdF9yZXN1bHRfd3JpdGVyIGltcG9ydCBUZXN0UmVzdWx0V3JpdGVyCiBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZmFpbHVyZXMKLWZyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RD b25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9leHBl Y3RhdGlvbnMgaW1wb3J0IFRlc3RFeHBlY3RhdGlvbnMsIEJBU0VMSU5FX1NVRkZJWF9MSVNUCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBidWlsZGVycwogZnJvbSB3ZWJr aXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgZmFjdG9yeQotZnJvbSB3ZWJraXRweS50b29s LmdyYW1tYXIgaW1wb3J0IHBsdXJhbGl6ZQogZnJvbSB3ZWJraXRweS50b29sLm11bHRpY29tbWFu ZHRvb2wgaW1wb3J0IEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kCiAKIApAQCAtNjAsNiArNTAs OCBAQCBkZWYgX2Jhc2VsaW5lX25hbWUoZnMsIHRlc3RfbmFtZSwgc3VmZml4KToKIAogCiBjbGFz cyBBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQp OgorICAgICMgbm90IG92ZXJyaWRpbmcgZXhlY3V0ZSgpIC0gcHlsaW50OiBkaXNhYmxlLW1zZz1X MDIyMworCiAgICAgbW92ZV9vdmVyd3JpdHRlbl9iYXNlbGluZXNfb3B0aW9uID0gb3B0cGFyc2Uu bWFrZV9vcHRpb24oIi0tbW92ZS1vdmVyd3JpdHRlbi1iYXNlbGluZXMiLCBhY3Rpb249InN0b3Jl X3RydWUiLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICBoZWxwPSJNb3ZlIG92ZXJ3cml0dGVuIGJh c2VsaW5lcyBlbHNld2hlcmUgaW4gdGhlIGJhc2VsaW5lIHBhdGguIFRoaXMgaXMgZm9yIGJyaW5n aW5nIHVwIG5ldyBwb3J0cy4iKQogCkBAIC0xNzAsNyArMTYyLDcgQEAgY2xhc3MgUmViYXNlbGlu ZVRlc3QoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICAgICAgICAgIGxvY2sucmVs ZWFzZV9sb2NrKCkKIAogICAgIGRlZiBfdGVzdF9yb290KHNlbGYsIHRlc3RfbmFtZSk6Ci0gICAg ICAgIHJldHVybiBvcy5wYXRoLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0KKyAgICAgICAgcmV0dXJu IHNlbGYuX3Rvb2wuZmlsZXN5c3RlbS5zcGxpdGV4dCh0ZXN0X25hbWUpWzBdCiAKICAgICBkZWYg X2ZpbGVfbmFtZV9mb3JfYWN0dWFsX3Jlc3VsdChzZWxmLCB0ZXN0X25hbWUsIHN1ZmZpeCk6CiAg ICAgICAgIHJldHVybiAiJXMtYWN0dWFsLiVzIiAlIChzZWxmLl90ZXN0X3Jvb3QodGVzdF9uYW1l KSwgc3VmZml4KQpAQCAtMjEwLDEwICsyMDIsMTAgQEAgY2xhc3MgT3B0aW1pemVCYXNlbGluZXMo QWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAg ICAgICAgIHN1cGVyKE9wdGltaXplQmFzZWxpbmVzLCBzZWxmKS5fX2luaXRfXyhvcHRpb25zPVtz ZWxmLnN1ZmZpeGVzX29wdGlvbl0gKyBzZWxmLnBsYXRmb3JtX29wdGlvbnMpCiAKLSAgICBkZWYg X29wdGltaXplX2Jhc2VsaW5lKHNlbGYsIHRlc3RfbmFtZSk6CisgICAgZGVmIF9vcHRpbWl6ZV9i YXNlbGluZShzZWxmLCBvcHRpbWl6ZXIsIHRlc3RfbmFtZSk6CiAgICAgICAgIGZvciBzdWZmaXgg aW4gc2VsZi5fYmFzZWxpbmVfc3VmZml4X2xpc3Q6CiAgICAgICAgICAgICBiYXNlbGluZV9uYW1l ID0gX2Jhc2VsaW5lX25hbWUoc2VsZi5fdG9vbC5maWxlc3lzdGVtLCB0ZXN0X25hbWUsIHN1ZmZp eCkKLSAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9iYXNlbGluZV9vcHRpbWl6ZXIub3B0aW1pemUo YmFzZWxpbmVfbmFtZSk6CisgICAgICAgICAgICBpZiBub3Qgb3B0aW1pemVyLm9wdGltaXplKGJh c2VsaW5lX25hbWUpOgogICAgICAgICAgICAgICAgIHByaW50ICJIZXVyaXN0aWNzIGZhaWxlZCB0 byBvcHRpbWl6ZSAlcyIgJSBiYXNlbGluZV9uYW1lCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBv cHRpb25zLCBhcmdzLCB0b29sKToKQEAgLTIyMywxMSArMjE1LDExIEBAIGNsYXNzIE9wdGltaXpl QmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgICAgICBwcmlu dCAiTm8gcG9ydCBuYW1lcyBtYXRjaCAnJXMnIiAlIG9wdGlvbnMucGxhdGZvcm0KICAgICAgICAg ICAgIHJldHVybgogCi0gICAgICAgIHNlbGYuX2Jhc2VsaW5lX29wdGltaXplciA9IEJhc2VsaW5l T3B0aW1pemVyKHRvb2wsIHBvcnRfbmFtZXMpCi0gICAgICAgIHNlbGYuX3BvcnQgPSB0b29sLnBv cnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lc1swXSkKLSAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBz ZWxmLl9wb3J0LnRlc3RzKGFyZ3MpOgorICAgICAgICBvcHRpbWl6ZXIgPSBCYXNlbGluZU9wdGlt aXplcih0b29sLCBwb3J0X25hbWVzKQorICAgICAgICBwb3J0ID0gdG9vbC5wb3J0X2ZhY3Rvcnku Z2V0KHBvcnRfbmFtZXNbMF0pCisgICAgICAgIGZvciB0ZXN0X25hbWUgaW4gcG9ydC50ZXN0cyhh cmdzKToKICAgICAgICAgICAgIF9sb2cuaW5mbygiT3B0aW1pemluZyAlcyIgJSB0ZXN0X25hbWUp Ci0gICAgICAgICAgICBzZWxmLl9vcHRpbWl6ZV9iYXNlbGluZSh0ZXN0X25hbWUpCisgICAgICAg ICAgICBzZWxmLl9vcHRpbWl6ZV9iYXNlbGluZShvcHRpbWl6ZXIsIHRlc3RfbmFtZSkKIAogCiBj bGFzcyBBbmFseXplQmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CkBAIC0y NDEsNiArMjMzLDggQEAgY2xhc3MgQW5hbHl6ZUJhc2VsaW5lcyhBYnN0cmFjdFJlYmFzZWxpbmlu Z0NvbW1hbmQpOgogICAgICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tbWlzc2luZycs IGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsIGhlbHA9J3Nob3cgbWlzc2luZyBi YXNlbGluZXMgYXMgd2VsbCcpLAogICAgICAgICAgICAgXSArIHNlbGYucGxhdGZvcm1fb3B0aW9u cykKICAgICAgICAgc2VsZi5fb3B0aW1pemVyX2NsYXNzID0gQmFzZWxpbmVPcHRpbWl6ZXIgICMg b3ZlcnJpZGFibGUgZm9yIHRlc3RpbmcKKyAgICAgICAgc2VsZi5fYmFzZWxpbmVfb3B0aW1pemVy ID0gTm9uZQorICAgICAgICBzZWxmLl9wb3J0ID0gTm9uZQogCiAgICAgZGVmIF93cml0ZShzZWxm LCBtc2cpOgogICAgICAgICBwcmludCBtc2cKQEAgLTI2OSw2ICsyNjMsNyBAQCBjbGFzcyBBbmFs eXplQmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAKIAogY2xhc3MgQWJz dHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFu ZCk6CisgICAgIyBub3Qgb3ZlcnJpZGluZyBleGVjdXRlKCkgLSBweWxpbnQ6IGRpc2FibGUtbXNn PVcwMjIzCiAKICAgICBkZWYgX3J1bl93ZWJraXRfcGF0Y2goc2VsZiwgYXJncywgdmVyYm9zZSk6 CiAgICAgICAgIHRyeToKQEAgLTI3OSw3ICsyNzQsNyBAQCBjbGFzcyBBYnN0cmFjdFBhcmFsbGVs UmViYXNlbGluZUNvbW1hbmQoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICAgICAg ZXhjZXB0IFNjcmlwdEVycm9yLCBlOgogICAgICAgICAgICAgX2xvZy5lcnJvcihlKQogCi0gICAg ZGVmIF9idWlsZGVyc190b19mZXRjaF9mcm9tKHNlbGYsIGJ1aWxkZXJzKToKKyAgICBkZWYgX2J1 aWxkZXJzX3RvX2ZldGNoX2Zyb20oc2VsZiwgYnVpbGRlcnNfdG9fY2hlY2spOgogICAgICAgICAj IFRoaXMgcm91dGluZSByZXR1cm5zIHRoZSBzdWJzZXQgb2YgYnVpbGRlcnMgdGhhdCB3aWxsIGNv dmVyIGFsbCBvZiB0aGUgYmFzZWxpbmUgc2VhcmNoIHBhdGhzCiAgICAgICAgICMgdXNlZCBpbiB0 aGUgaW5wdXQgbGlzdC4gSW4gcGFydGljdWxhciwgaWYgdGhlIGlucHV0IGxpc3QgY29udGFpbnMg Ym90aCBSZWxlYXNlIGFuZCBEZWJ1ZwogICAgICAgICAjIHZlcnNpb25zIG9mIGEgY29uZmlndXJh dGlvbiwgd2UgKm9ubHkqIHJldHVybiB0aGUgUmVsZWFzZSB2ZXJzaW9uIChzaW5jZSB3ZSBkb24n dCBzYXZlCkBAIC0yODcsNyArMjgyLDcgQEAgY2xhc3MgQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxp bmVDb21tYW5kKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgIHJlbGVhc2Vf YnVpbGRlcnMgPSBzZXQoKQogICAgICAgICBkZWJ1Z19idWlsZGVycyA9IHNldCgpCiAgICAgICAg IGJ1aWxkZXJzX3RvX2ZhbGxiYWNrX3BhdGhzID0ge30KLSAgICAgICAgZm9yIGJ1aWxkZXIgaW4g YnVpbGRlcnM6CisgICAgICAgIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzX3RvX2NoZWNrOgogICAg ICAgICAgICAgcG9ydCA9IHNlbGYuX3Rvb2wucG9ydF9mYWN0b3J5LmdldF9mcm9tX2J1aWxkZXJf bmFtZShidWlsZGVyKQogICAgICAgICAgICAgaWYgcG9ydC50ZXN0X2NvbmZpZ3VyYXRpb24oKS5i dWlsZF90eXBlID09ICdSZWxlYXNlJzoKICAgICAgICAgICAgICAgICByZWxlYXNlX2J1aWxkZXJz LmFkZChidWlsZGVyKQpAQCAtMzI5LDcgKzMyNCw3IEBAIGNsYXNzIEFic3RyYWN0UGFyYWxsZWxS ZWJhc2VsaW5lQ29tbWFuZChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQpOgogICAgICAgICAg ICAgICAgICAgICBpZiBsaW5lOgogICAgICAgICAgICAgICAgICAgICAgICAgZmlsZXNfdG9fYWRk LnVwZGF0ZShqc29uLmxvYWRzKGxpbmUpWydhZGQnXSkKICAgICAgICAgICAgICAgICAgICAgICAg IGZpbGVfYWRkZWQgPSBUcnVlCi0gICAgICAgICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IsIGU6 CisgICAgICAgICAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6CiAgICAgICAgICAgICAgICAgICAg IF9sb2cuZGVidWcoJyIlcyIgaXMgbm90IGEgSlNPTiBvYmplY3QsIGlnbm9yaW5nJyAlIGxpbmUp CiAKICAgICAgICAgICAgIGlmIG5vdCBmaWxlX2FkZGVkOgpAQCAtMzQ4LDkgKzM0Myw5IEBAIGNs YXNzIEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZChBYnN0cmFjdFJlYmFzZWxpbmlu Z0NvbW1hbmQpOgogICAgICAgICAgICAgc2VsZi5fcnVuX3dlYmtpdF9wYXRjaChbJ29wdGltaXpl LWJhc2VsaW5lcycsICctLXN1ZmZpeGVzJywgJywnLmpvaW4oYWxsX3N1ZmZpeGVzKSwgdGVzdF0s IHZlcmJvc2UpCiAKICAgICBkZWYgX3JlYmFzZWxpbmUoc2VsZiwgb3B0aW9ucywgdGVzdF9saXN0 KToKLSAgICAgICAgZm9yIHRlc3QsIGJ1aWxkZXJzIGluIHNvcnRlZCh0ZXN0X2xpc3QuaXRlbXMo KSk6CisgICAgICAgIGZvciB0ZXN0LCBidWlsZGVyc190b19jaGVjayBpbiBzb3J0ZWQodGVzdF9s aXN0Lml0ZW1zKCkpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCJSZWJhc2VsaW5pbmcgJXMiICUg dGVzdCkKLSAgICAgICAgICAgIGZvciBidWlsZGVyLCBzdWZmaXhlcyBpbiBzb3J0ZWQoYnVpbGRl cnMuaXRlbXMoKSk6CisgICAgICAgICAgICBmb3IgYnVpbGRlciwgc3VmZml4ZXMgaW4gc29ydGVk KGJ1aWxkZXJzX3RvX2NoZWNrLml0ZW1zKCkpOgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWco IiAgJXM6ICVzIiAlIChidWlsZGVyLCAiLCIuam9pbihzdWZmaXhlcykpKQogCiAgICAgICAgIGNv bW1hbmRzID0gc2VsZi5fcmViYXNlbGluZV9jb21tYW5kcyh0ZXN0X2xpc3QsIG9wdGlvbnMpCkBA IC0zOTMsNiArMzg4LDcgQEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdFBh cmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgogICAgICAgICAgICAgc2VsZi5tb3ZlX292ZXJ3cml0 dGVuX2Jhc2VsaW5lc19vcHRpb24sCiAgICAgICAgICAgICBzZWxmLm5vX29wdGltaXplX29wdGlv biwKICAgICAgICAgICAgIF0gKyBzZWxmLnBsYXRmb3JtX29wdGlvbnMpCisgICAgICAgIHNlbGYu X3Rlc3RfbGlzdCA9IE5vbmUKIAogICAgIGRlZiBfdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlcyhz ZWxmLCBwb3J0X25hbWUpOgogICAgICAgICBwb3J0ID0gc2VsZi5fdG9vbC5wb3J0X2ZhY3Rvcnku Z2V0KHBvcnRfbmFtZSkKQEAgLTQ3OSwxNiArNDc1LDE2IEBAIGNsYXNzIFJlYmFzZWxpbmUoQWJz dHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBv cHRpb25zLCBhcmdzLCB0b29sKToKICAgICAgICAgb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSA9 IE5vbmUKICAgICAgICAgaWYgb3B0aW9ucy5idWlsZGVyczoKLSAgICAgICAgICAgIGJ1aWxkZXJz ID0gW10KKyAgICAgICAgICAgIGJ1aWxkZXJzX3RvX2NoZWNrID0gW10KICAgICAgICAgICAgIGZv ciBidWlsZGVyX25hbWVzIGluIG9wdGlvbnMuYnVpbGRlcnM6Ci0gICAgICAgICAgICAgICAgYnVp bGRlcnMgKz0gW3NlbGYuX2J1aWxkZXJfd2l0aF9uYW1lKG5hbWUpIGZvciBuYW1lIGluIGJ1aWxk ZXJfbmFtZXMuc3BsaXQoIiwiKV0KKyAgICAgICAgICAgICAgICBidWlsZGVyc190b19jaGVjayAr PSBbc2VsZi5fYnVpbGRlcl93aXRoX25hbWUobmFtZSkgZm9yIG5hbWUgaW4gYnVpbGRlcl9uYW1l cy5zcGxpdCgiLCIpXQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgYnVpbGRlcnMgPSBzZWxm Ll9idWlsZGVyc190b19wdWxsX2Zyb20oKQorICAgICAgICAgICAgYnVpbGRlcnNfdG9fY2hlY2sg PSBzZWxmLl9idWlsZGVyc190b19wdWxsX2Zyb20oKQogCiAgICAgICAgIHRlc3RfbGlzdCA9IHt9 CiAgICAgICAgIHN1ZmZpeGVzX3RvX3VwZGF0ZSA9IG9wdGlvbnMuc3VmZml4ZXMuc3BsaXQoIiwi KQogCi0gICAgICAgIGZvciBidWlsZGVyIGluIGJ1aWxkZXJzOgorICAgICAgICBmb3IgYnVpbGRl ciBpbiBidWlsZGVyc190b19jaGVjazoKICAgICAgICAgICAgIHRlc3RzID0gYXJncyBvciBzZWxm Ll90ZXN0c190b191cGRhdGUoYnVpbGRlcikKICAgICAgICAgICAgIGZvciB0ZXN0IGluIHRlc3Rz OgogICAgICAgICAgICAgICAgIGlmIHRlc3Qgbm90IGluIHRlc3RfbGlzdDoKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5p dHRlc3QucHkKaW5kZXggM2JmMTg4OGExMzZiYTZlYTA3NTZkNWQ5NWEyZDRlYWI5MTBmYTU2OC4u NDkwNTZjMGEzNjcyMzllNjVmYjA2MDQ2OWNlYzIzNzRlY2YxYWI1OSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5p dHRlc3QucHkKQEAgLTQ1LDcgKzQ1LDcgQEAgY2xhc3MgX0Jhc2VUZXN0Q2FzZSh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYudG9vbCA9IE1v Y2tUb29sKCkKLSAgICAgICAgc2VsZi5jb21tYW5kID0gc2VsZi5jb21tYW5kX2NvbnN0cnVjdG9y KCkKKyAgICAgICAgc2VsZi5jb21tYW5kID0gc2VsZi5jb21tYW5kX2NvbnN0cnVjdG9yKCkgICMg bGludCB3YXJucyB0aGF0IGNvbW1hbmRfY29uc3RydWN0b3IgbWlnaHQgbm90IGJlIHNldCwgYnV0 IHRoaXMgaXMgaW50ZW50aW9uYWw7IHB5bGludDogZGlzYWJsZS1tc2c9RTExMDIKICAgICAgICAg c2VsZi5jb21tYW5kLmJpbmRfdG9fdG9vbChzZWxmLnRvb2wpCiAgICAgICAgIHNlbGYubGlvbl9w b3J0ID0gc2VsZi50b29sLnBvcnRfZmFjdG9yeS5nZXRfZnJvbV9idWlsZGVyX25hbWUoIldlYktp dCBNYWMxMC43IikKICAgICAgICAgc2VsZi5saW9uX2V4cGVjdGF0aW9uc19wYXRoID0gc2VsZi5s aW9uX3BvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkKQEAgLTM3MCwxMCArMzcw LDEwIEBAIGNsYXNzIFRlc3RBbmFseXplQmFzZWxpbmVzKF9CYXNlVGVzdENhc2UpOgogICAgIGRl ZiBzZXRVcChzZWxmKToKICAgICAgICAgc3VwZXIoVGVzdEFuYWx5emVCYXNlbGluZXMsIHNlbGYp LnNldFVwKCkKICAgICAgICAgc2VsZi5wb3J0ID0gc2VsZi50b29sLnBvcnRfZmFjdG9yeS5nZXQo J3Rlc3QnKQotICAgICAgICBzZWxmLnRvb2wucG9ydF9mYWN0b3J5LmdldCA9IGxhbWJkYSBwb3J0 X25hbWU9Tm9uZSwgb3B0aW9ucz1Ob25lOiBzZWxmLnBvcnQKKyAgICAgICAgc2VsZi50b29sLnBv cnRfZmFjdG9yeS5nZXQgPSAobGFtYmRhIHBvcnRfbmFtZT1Ob25lLCBvcHRpb25zPU5vbmU6IHNl bGYucG9ydCkKICAgICAgICAgc2VsZi5saW5lcyA9IFtdCiAgICAgICAgIHNlbGYuY29tbWFuZC5f b3B0aW1pemVyX2NsYXNzID0gX0Zha2VPcHRpbWl6ZXIKLSAgICAgICAgc2VsZi5jb21tYW5kLl93 cml0ZSA9IGxhbWJkYSBtc2c6IHNlbGYubGluZXMuYXBwZW5kKG1zZykKKyAgICAgICAgc2VsZi5j b21tYW5kLl93cml0ZSA9IChsYW1iZGEgbXNnOiBzZWxmLmxpbmVzLmFwcGVuZChtc2cpKSAgIyBw eWxpbnQgYnVnIHdhcm5pbmcgYWJvdXQgdW5uZWNlc3NhcnkgbGFtYmRhPyBweWxpbnQ6IGRpc2Fi bGUtbXNnPVcwMTA4CiAKICAgICBkZWYgdGVzdF9kZWZhdWx0KHNlbGYpOgogICAgICAgICBzZWxm LmNvbW1hbmQuZXhlY3V0ZShNb2NrT3B0aW9ucyhzdWZmaXhlcz0ndHh0JywgbWlzc2luZz1GYWxz ZSwgcGxhdGZvcm09Tm9uZSksIFsncGFzc2VzL3RleHQuaHRtbCddLCBzZWxmLnRvb2wpCg==