145583 2015-06-02 17:52:59 -0700 add errors to run-benchmark exception handling. 2015-06-05 02:54:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 144842 1 slewis webkit-unassigned dewei_zhu rniwa slewis oldest_to_newest 1098990 0 254128 slewis 2015-06-02 17:52:59 -0700 Created attachment 254128 patch add errors to run-benchmark exception handling. 1099002 1 254128 rniwa 2015-06-02 18:13:19 -0700 Comment on attachment 254128 patch View in context: https://bugs.webkit.org/attachment.cgi?id=254128&action=review > Tools/Scripts/run-benchmark:42 > + except Exception as e: Can we spell out either exception or error instead of e? > Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:36 > + except Exception as e: > self.clean() > - raise > + raise e Apparently you don't need this in Python to forward the exception object. > Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py:45 > - raise Exception('Cannot create the benchmark', errorCode) > + raise Exception('Cannot create the benchmark - Error: %s' % errorCode, errorCode) Why are we also passing errorCode as the second argument?? > Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py:42 > + except IOError as e: Ditto about spelling out error or exception. > Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py:84 > + result = json.loads(result) > results.append(result) We can probably just both of these in one line: results.append(json.loads(result)) > Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py:85 > + except Exception as e: Ditto about spelling out e. > Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py:23 > - except KeyError: > - raise > + except KeyError as e: > + raise e Ditto about not needing this. > Tools/Scripts/webkitpy/benchmark_runner/generic_factory.py:31 > + except Exception as e: > + raise e Ditto. > Tools/Scripts/webkitpy/benchmark_runner/utils.py:38 > + except Exception as e: > + raise Exception("Invalid json format or empty json was found in %s - Error %s" % (filePath, e)) Spellout exception or error. > Tools/Scripts/webkitpy/benchmark_runner/utils.py:44 > + except Exception as e: Ditto. 1099785 2 slewis 2015-06-05 02:53:54 -0700 Committed http://trac.webkit.org/changeset/185243 254128 2015-06-02 17:52:59 -0700 2015-06-02 18:13:19 -0700 patch 0002-Add-errors-to-run-benchmark-exception-handling.patch text/plain 11806 slewis RnJvbSA3OTA4ODgxZWYyYzM5ZTY4YmYzYTBlYmM2M2Y4YTdmNTg5NDEzNzkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVwaGFuaWUgTGV3aXMgPHNsZXdpc0BhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMiBKdW4gMjAxNSAxNzozNjozMSAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMi8zXSBB ZGQgZXJyb3JzIHRvIHJ1bi1iZW5jaG1hcmsgZXhjZXB0aW9uIGhhbmRsaW5nLgoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgoqIFNjcmlwdHMvcnVuLWJlbmNobWFyazoKKG1haW4pOgoqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmlj X2JlbmNobWFya19idWlsZGVyLnB5OgooR2VuZXJpY0JlbmNobWFya0J1aWxkZXIucHJlcGFyZSk6 CihHZW5lcmljQmVuY2htYXJrQnVpbGRlci5fcnVuQ3JlYXRlU2NyaXB0KToKKEdlbmVyaWNCZW5j aG1hcmtCdWlsZGVyLl9hcHBseVBhdGNoKToKKEdlbmVyaWNCZW5jaG1hcmtCdWlsZGVyLmNsZWFu KToKKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5w eToKKEJlbmNobWFya1J1bm5lci5fX2luaXRfXyk6CihCZW5jaG1hcmtSdW5uZXIuZXhlY3V0ZSk6 CihCZW5jaG1hcmtSdW5uZXIpOgooQmVuY2htYXJrUnVubmVyLmNsZWFudXApOgoqIFNjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9nZW5lcmljX2ZhY3RvcnkucHk6CihHZW5lcmljRmFj dG9yeS5pdGVyYXRlR2V0SXRlbSk6CihHZW5lcmljRmFjdG9yeS5jcmVhdGUpOgoqIFNjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci91dGlscy5weToKKGxvYWRNb2R1bGUpOgoobG9hZEpT T05Gcm9tRmlsZSk6Cihmb3JjZVJlbW92ZSk6Ci0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAyNiArKysrKysrKysrKysrCiBUb29scy9TY3Jp cHRzL3J1bi1iZW5jaG1hcmsgICAgICAgICAgICAgICAgICAgICAgICB8ICA3ICsrKy0KIC4uLi9i ZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVyLnB5IHwgMTAgKystLS0K IC4uLi93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkgIHwgNDQg KysrKysrKysrKysrKy0tLS0tLS0tLQogLi4uL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvZ2Vu ZXJpY19mYWN0b3J5LnB5ICAgfCAgOCArKy0tCiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvdXRpbHMucHkgICB8ICA5ICsrKy0tCiA2IGZpbGVzIGNoYW5nZWQsIDcxIGlu c2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkYjU5ODFjLi44NzI2NWMxIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEgQEAKIDIw MTUtMDYtMDIgIFN0ZXBoYW5pZSBMZXdpcyAgPHNsZXdpc0BhcHBsZS5jb20+CiAKKyAgICAgICAg QWRkIGVycm9ycyB0byBydW4tYmVuY2htYXJrIGV4Y2VwdGlvbiBoYW5kbGluZy4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWJl bmNobWFyazoKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2JlbmNobWFya19idWlsZGVy LnB5OgorICAgICAgICAoR2VuZXJpY0JlbmNobWFya0J1aWxkZXIucHJlcGFyZSk6CisgICAgICAg IChHZW5lcmljQmVuY2htYXJrQnVpbGRlci5fcnVuQ3JlYXRlU2NyaXB0KToKKyAgICAgICAgKEdl bmVyaWNCZW5jaG1hcmtCdWlsZGVyLl9hcHBseVBhdGNoKToKKyAgICAgICAgKEdlbmVyaWNCZW5j aG1hcmtCdWlsZGVyLmNsZWFuKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci5f X2luaXRfXyk6CisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuZXhlY3V0ZSk6CisgICAgICAgIChC ZW5jaG1hcmtSdW5uZXIpOgorICAgICAgICAoQmVuY2htYXJrUnVubmVyLmNsZWFudXApOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9nZW5lcmljX2ZhY3Rvcnku cHk6CisgICAgICAgIChHZW5lcmljRmFjdG9yeS5pdGVyYXRlR2V0SXRlbSk6CisgICAgICAgIChH ZW5lcmljRmFjdG9yeS5jcmVhdGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci91dGlscy5weToKKyAgICAgICAgKGxvYWRNb2R1bGUpOgorICAgICAgICAobG9h ZEpTT05Gcm9tRmlsZSk6CisgICAgICAgIChmb3JjZVJlbW92ZSk6CisKKzIwMTUtMDYtMDIgIFN0 ZXBoYW5pZSBMZXdpcyAgPHNsZXdpc0BhcHBsZS5jb20+CisKICAgICAgICAgU3RyZWFtbGluZSBy dW4tYmVuY2htYXJrIGJyb3dzZXIKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyayBiL1Rvb2xzL1Njcmlw dHMvcnVuLWJlbmNobWFyawppbmRleCAxNjI1NWRhLi4wNjkyMjM4IDEwMDc1NQotLS0gYS9Ub29s cy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tYmVuY2htYXJr CkBAIC0zNiw4ICszNiwxMSBAQCBkZWYgbWFpbigpOgogICAgIF9sb2cuZGVidWcoJ1x0b3V0cHV0 IGZpbGUgbmFtZVx0OiAlcycgJSBhcmdzLm91dHB1dCkKICAgICBfbG9nLmRlYnVnKCdcdGJ1aWxk IGRpcmVjdG9yeVx0OiAlcycgJSBhcmdzLmJ1aWxkRGlyKQogICAgIF9sb2cuZGVidWcoJ1x0cGxh biBuYW1lXHQ6ICVzJywgYXJncy5wbGFuKQotICAgIHJ1bm5lciA9IEJlbmNobWFya1J1bm5lcihh cmdzLnBsYW4sIGFyZ3MubG9jYWxDb3B5LCBhcmdzLmNvdW50T3ZlcnJpZGUsIGFyZ3MuYnVpbGRE aXIsIGFyZ3Mub3V0cHV0LCBhcmdzLnBsYXRmb3JtLCBhcmdzLmJyb3dzZXIpCi0gICAgcmV0dXJu IHJ1bm5lci5leGVjdXRlKCkKKyAgICB0cnk6CisgICAgICAgIHJ1bm5lciA9IEJlbmNobWFya1J1 bm5lcihhcmdzLnBsYW4sIGFyZ3MubG9jYWxDb3B5LCBhcmdzLmNvdW50T3ZlcnJpZGUsIGFyZ3Mu YnVpbGREaXIsIGFyZ3Mub3V0cHV0LCBhcmdzLnBsYXRmb3JtLCBhcmdzLmJyb3dzZXIpCisgICAg ICAgIHJ1bm5lci5leGVjdXRlKCkKKyAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAg IHN5cy5leGl0KCJFcnJvciBvY2N1cnJlZCBydW5uaW5nIHRoZSBiZW5jaG1hcms6ICVzIiAlIGUp CiAKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfYnVpbGRlci9nZW5lcmljX2Jl bmNobWFya19idWlsZGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2JlbmNobWFya19idWlsZGVyL2dlbmVyaWNfYmVuY2htYXJrX2J1aWxkZXIucHkKaW5kZXgg MDEwY2Q5OS4uN2UzYWY4NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2JlbmNobWFya19idWlsZGVyL2dlbmVyaWNfYmVuY2htYXJrX2J1aWxkZXIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFy a19idWlsZGVyL2dlbmVyaWNfYmVuY2htYXJrX2J1aWxkZXIucHkKQEAgLTMxLDkgKzMxLDkgQEAg Y2xhc3MgR2VuZXJpY0JlbmNobWFya0J1aWxkZXIob2JqZWN0KToKICAgICAgICAgICAgIGlmIGNy ZWF0ZVNjcmlwdDoKICAgICAgICAgICAgICAgICBzZWxmLl9ydW5DcmVhdGVTY3JpcHQoY3JlYXRl U2NyaXB0KQogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2FwcGx5UGF0Y2gocGF0Y2gpCi0gICAg ICAgIGV4Y2VwdDoKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAg c2VsZi5jbGVhbigpCi0gICAgICAgICAgICByYWlzZQorICAgICAgICAgICAgcmFpc2UgZQogCiAg ICAgZGVmIF9ydW5DcmVhdGVTY3JpcHQoc2VsZiwgY3JlYXRlU2NyaXB0KToKICAgICAgICAgb2xk V29ya2luZ0RpcmVjdG9yeSA9IG9zLmdldGN3ZCgpCkBAIC00Miw3ICs0Miw3IEBAIGNsYXNzIEdl bmVyaWNCZW5jaG1hcmtCdWlsZGVyKG9iamVjdCk6CiAgICAgICAgIGVycm9yQ29kZSA9IHN1YnBy b2Nlc3MuY2FsbChjcmVhdGVTY3JpcHQpCiAgICAgICAgIG9zLmNoZGlyKG9sZFdvcmtpbmdEaXJl Y3RvcnkpCiAgICAgICAgIGlmIGVycm9yQ29kZToKLSAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlv bignQ2Fubm90IGNyZWF0ZSB0aGUgYmVuY2htYXJrJywgZXJyb3JDb2RlKQorICAgICAgICAgICAg cmFpc2UgRXhjZXB0aW9uKCdDYW5ub3QgY3JlYXRlIHRoZSBiZW5jaG1hcmsgLSBFcnJvcjogJXMn ICUgZXJyb3JDb2RlLCBlcnJvckNvZGUpCiAKICAgICBkZWYgX2NvcHlCZW5jaG1hcmtUb1RlbXBE aXIoc2VsZiwgYmVuY2htYXJrUGF0aCk6CiAgICAgICAgIHNodXRpbC5jb3B5dHJlZShnZXRQYXRo RnJvbVByb2plY3RSb290KGJlbmNobWFya1BhdGgpLCBzZWxmLmRlc3QpCkBAIC03MCwxMCArNzAs MTAgQEAgY2xhc3MgR2VuZXJpY0JlbmNobWFya0J1aWxkZXIob2JqZWN0KToKICAgICAgICAgZXJy b3JDb2RlID0gc3VicHJvY2Vzcy5jYWxsKFsncGF0Y2gnLCAnLXAxJywgJy1mJywgJy1pJywgZ2V0 UGF0aEZyb21Qcm9qZWN0Um9vdChwYXRjaCldKQogICAgICAgICBvcy5jaGRpcihvbGRXb3JraW5n RGlyZWN0b3J5KQogICAgICAgICBpZiBlcnJvckNvZGU6Ci0gICAgICAgICAgICByYWlzZSBFeGNl cHRpb24oJ0Nhbm5vdCBhcHBseSBwYXRjaCwgd2lsbCBza2lwIGN1cnJlbnQgYmVuY2htYXJrUGF0 aCcpCisgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0Nhbm5vdCBhcHBseSBwYXRjaCwgd2ls bCBza2lwIGN1cnJlbnQgYmVuY2htYXJrUGF0aCAtIEVycm9yOiAlcycgJSBlcnJvckNvZGUpCiAg ICAgICAgIHJldHVybiBzZWxmLndlYlJvb3QKIAogICAgIGRlZiBjbGVhbihzZWxmKToKLSAgICAg ICAgX2xvZy5pbmZvKCdDbGVhbm5pbmcgQmVuY2htYXJrJykKKyAgICAgICAgX2xvZy5pbmZvKCdD bGVhbmluZyBCZW5jaG1hcmsnKQogICAgICAgICBpZiBzZWxmLndlYlJvb3Q6CiAgICAgICAgICAg ICBmb3JjZVJlbW92ZShzZWxmLndlYlJvb3QpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IGZh ZWI4NTIuLmYzZTgwODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2ht YXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC01LDYgKzUsNyBAQCBp bXBvcnQgbG9nZ2luZwogaW1wb3J0IHNodXRpbAogaW1wb3J0IHNpZ25hbAogaW1wb3J0IHN1YnBy b2Nlc3MKK2ltcG9ydCBzeXMKIGltcG9ydCB0ZW1wZmlsZQogaW1wb3J0IHRpbWUKIGltcG9ydCB0 eXBlcwpAQCAtMzgsMTIgKzM5LDEyIEBAIGNsYXNzIEJlbmNobWFya1J1bm5lcihvYmplY3QpOgog ICAgICAgICAgICAgICAgIHNlbGYuaHR0cFNlcnZlckRyaXZlciA9IEhUVFBTZXJ2ZXJEcml2ZXJG YWN0b3J5LmNyZWF0ZShbc2VsZi5wbGFuWydodHRwX3NlcnZlcl9kcml2ZXInXV0pCiAgICAgICAg ICAgICAgICAgc2VsZi5idWlsZERpciA9IG9zLnBhdGguYWJzcGF0aChidWlsZERpcikgaWYgYnVp bGREaXIgZWxzZSBOb25lCiAgICAgICAgICAgICAgICAgc2VsZi5vdXRwdXRGaWxlID0gb3V0cHV0 RmlsZQotICAgICAgICBleGNlcHQgSU9FcnJvcjoKLSAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0Nh biBub3Qgb3BlbiBwbGFuIGZpbGU6ICVzJyAlIHBsYW5GaWxlKQotICAgICAgICAgICAgcmFpc2UK LSAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3I6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCdQbGFu IGZpbGU6JXMgbWF5IG5vdCBmb2xsb3cgSlNPTiBmb3JtYXQnICUgcGxhbkZpbGUpCi0gICAgICAg ICAgICByYWlzZQorICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlOgorICAgICAgICAgICAgX2xv Zy5lcnJvcignQ2FuIG5vdCBvcGVuIHBsYW4gZmlsZTogJXMgLSBFcnJvciAlcycgJSBwbGFuRmls ZSwgZSkKKyAgICAgICAgICAgIHJhaXNlIGUKKyAgICAgICAgZXhjZXB0IFZhbHVlRXJyb3IgYXMg ZToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1BsYW4gZmlsZTogJXMgbWF5IG5vdCBmb2xsb3cg SlNPTiBmb3JtYXQgLSBFcnJvciAlcycgJSBwbGFuRmlsZSwgZSkKKyAgICAgICAgICAgIHJhaXNl IGUKIAogICAgIGRlZiBfZmluZFBsYW5GaWxlKHNlbGYsIHBsYW5GaWxlKToKICAgICAgICAgaWYg bm90IG9zLnBhdGguZXhpc3RzKHBsYW5GaWxlKToKQEAgLTYwLDEzICs2MSwxMyBAQCBjbGFzcyBC ZW5jaG1hcmtSdW5uZXIob2JqZWN0KToKICAgICAgICAgX2xvZy5pbmZvKCdTdGFydCB0byBleGVj dXRlIHRoZSBwbGFuJykKICAgICAgICAgX2xvZy5pbmZvKCdTdGFydCBhIG5ldyBiZW5jaG1hcmsn KQogICAgICAgICByZXN1bHRzID0gW10KLSAgICAgICAgYmVuY2htYXJrQnVpbGRlciA9IEJlbmNo bWFya0J1aWxkZXJGYWN0b3J5LmNyZWF0ZShbc2VsZi5wbGFuWydiZW5jaG1hcmtfYnVpbGRlcidd XSkKKyAgICAgICAgc2VsZi5iZW5jaG1hcmtCdWlsZGVyID0gQmVuY2htYXJrQnVpbGRlckZhY3Rv cnkuY3JlYXRlKFtzZWxmLnBsYW5bJ2JlbmNobWFya19idWlsZGVyJ11dKQogCiAgICAgICAgIGlm IG5vdCBzZWxmLnBsYW4uZ2V0KCdsb2NhbF9jb3B5JykgYW5kIG5vdCBzZWxmLnBsYW4uZ2V0KCdy ZW1vdGVfYXJjaGl2ZScpOgogICAgICAgICAgICAgX2xvZy5lcnJvcignRWl0aGVyIGxvY2FsX2Nv cHkgb3IgcmVtb3RlX2FyY2hpdmUgbXVzdCBiZSBzcGVjaWZpZWQgaW4gdGhlIHBsYW4nKQotICAg ICAgICAgICAgcmV0dXJuIDIKKyAgICAgICAgICAgIHN5cy5leGl0KDIpCiAKLSAgICAgICAgd2Vi Um9vdCA9IGJlbmNobWFya0J1aWxkZXIucHJlcGFyZShzZWxmLnBsYW5OYW1lLCBzZWxmLnBsYW4u Z2V0KCdsb2NhbF9jb3B5JyksIHNlbGYucGxhbi5nZXQoJ3JlbW90ZV9hcmNoaXZlJyksCisgICAg ICAgIHdlYlJvb3QgPSBzZWxmLmJlbmNobWFya0J1aWxkZXIucHJlcGFyZShzZWxmLnBsYW5OYW1l LCBzZWxmLnBsYW4uZ2V0KCdsb2NhbF9jb3B5JyksIHNlbGYucGxhbi5nZXQoJ3JlbW90ZV9hcmNo aXZlJyksCiAgICAgICAgICAgICBzZWxmLnBsYW4uZ2V0KCdiZW5jaG1hcmtfcGF0Y2gnKSwgc2Vs Zi5wbGFuLmdldCgnY3JlYXRlX3NjcmlwdCcpKQogICAgICAgICBmb3IgeCBpbiB4cmFuZ2UoaW50 KHNlbGYucGxhblsnY291bnQnXSkpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCdTdGFydCB0aGUg aXRlcmF0aW9uICVkIG9mIGN1cnJlbnQgYmVuY2htYXJrJyAlICh4ICsgMSkpCkBAIC03NiwyMyAr NzcsMzAgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxm LmJyb3dzZXJEcml2ZXIubGF1bmNoVXJsKHVybCwgc2VsZi5idWlsZERpcikKICAgICAgICAgICAg IHRyeToKICAgICAgICAgICAgICAgICB3aXRoIHRpbWVvdXQoc2VsZi5wbGFuWyd0aW1lb3V0J10p OgotICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBqc29uLmxvYWRzKHNlbGYuaHR0cFNlcnZl ckRyaXZlci5mZXRjaFJlc3VsdCgpKQorICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBzZWxm Lmh0dHBTZXJ2ZXJEcml2ZXIuZmV0Y2hSZXN1bHQoKQogICAgICAgICAgICAgICAgIGFzc2VydChu b3Qgc2VsZi5odHRwU2VydmVyRHJpdmVyLmdldFJldHVybkNvZGUoKSkKICAgICAgICAgICAgICAg ICBhc3NlcnQocmVzdWx0KQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IGpzb24ubG9hZHMocmVz dWx0KQogICAgICAgICAgICAgICAgIHJlc3VsdHMuYXBwZW5kKHJlc3VsdCkKLSAgICAgICAgICAg IGV4Y2VwdDoKLSAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdObyByZXN1bHQgb3Igc2VydmVy IGNyYXNoZXMuIFNvbWV0aGluZyB3ZW50IHdyb25nLiBXaWxsIHNraXAgY3VycmVudCBiZW5jaG1h cmsuJykKLSAgICAgICAgICAgICAgICBzZWxmLmJyb3dzZXJEcml2ZXIuY2xvc2VCcm93c2Vycygp Ci0gICAgICAgICAgICAgICAgc2VsZi5odHRwU2VydmVyRHJpdmVyLmtpbGxTZXJ2ZXIoKQotICAg ICAgICAgICAgICAgIGJlbmNobWFya0J1aWxkZXIuY2xlYW4oKQotICAgICAgICAgICAgICAgIHJl dHVybiAxCisgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAgICAg ICAgX2xvZy5lcnJvcignTm8gcmVzdWx0IG9yIHRoZSBzZXJ2ZXIgY3Jhc2hlZC4gU29tZXRoaW5n IHdlbnQgd3JvbmcuIFdpbGwgc2tpcCBjdXJyZW50IGJlbmNobWFyay5cbkVycm9yOiAlcywgU2Vy dmVyIHJldHVybiBjb2RlOiAlZCwgcmVzdWx0OiAlcycgJSAoZSwgbm90IHNlbGYuaHR0cFNlcnZl ckRyaXZlci5nZXRSZXR1cm5Db2RlKCksIHJlc3VsdCkpCisgICAgICAgICAgICAgICAgc2VsZi5j bGVhbnVwKCkKKyAgICAgICAgICAgICAgICBzeXMuZXhpdCgxKQogICAgICAgICAgICAgZmluYWxs eToKICAgICAgICAgICAgICAgICBzZWxmLmJyb3dzZXJEcml2ZXIuY2xvc2VCcm93c2VycygpCiAg ICAgICAgICAgICAgICAgX2xvZy5pbmZvKCdFbmQgb2YgJWQgaXRlcmF0aW9uIG9mIGN1cnJlbnQg YmVuY2htYXJrJyAlICh4ICsgMSkpCiAgICAgICAgIHJlc3VsdHMgPSBzZWxmLndyYXAocmVzdWx0 cykKICAgICAgICAgc2VsZi5kdW1wKHJlc3VsdHMsIHNlbGYub3V0cHV0RmlsZSBpZiBzZWxmLm91 dHB1dEZpbGUgZWxzZSBzZWxmLnBsYW5bJ291dHB1dF9maWxlJ10pCi0gICAgICAgIGJlbmNobWFy a0J1aWxkZXIuY2xlYW4oKQotICAgICAgICByZXR1cm4gMAorICAgICAgICBzZWxmLmJlbmNobWFy a0J1aWxkZXIuY2xlYW4oKQorICAgICAgICBzeXMuZXhpdCgpCisKKyAgICBkZWYgY2xlYW51cChz ZWxmKToKKyAgICAgICAgaWYgc2VsZi5icm93c2VyRHJpdmVyOgorICAgICAgICAgICAgc2VsZi5i cm93c2VyRHJpdmVyLmNsb3NlQnJvd3NlcnMoKQorICAgICAgICBpZiBzZWxmLmh0dHBTZXJ2ZXJE cml2ZXI6CisgICAgICAgICAgICBzZWxmLmh0dHBTZXJ2ZXJEcml2ZXIua2lsbFNlcnZlcigpCisg ICAgICAgIGlmIHNlbGYuYmVuY2htYXJrQnVpbGRlcjoKKyAgICAgICAgICAgIHNlbGYuYmVuY2ht YXJrQnVpbGRlci5jbGVhbigpCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgZHVtcChjbHMs IHJlc3VsdHMsIG91dHB1dEZpbGUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2dlbmVyaWNfZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9nZW5lcmljX2ZhY3RvcnkucHkKaW5kZXggZDcxMGQ0YS4u NTlkNTMyZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2dlbmVyaWNfZmFjdG9yeS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvZ2VuZXJpY19mYWN0b3J5LnB5CkBAIC0xOSwxMyArMTksMTMgQEAgY2xhc3Mg R2VuZXJpY0ZhY3Rvcnkob2JqZWN0KToKICAgICAgICAgZm9yIGtleSBpbiBrZXlzOgogICAgICAg ICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHJldCA9IHJldC5fX2dldGl0ZW1fXyhrZXkpCi0g ICAgICAgICAgICBleGNlcHQgS2V5RXJyb3I6Ci0gICAgICAgICAgICAgICAgcmFpc2UKKyAgICAg ICAgICAgIGV4Y2VwdCBLZXlFcnJvciBhcyBlOgorICAgICAgICAgICAgICAgIHJhaXNlIGUKICAg ICAgICAgcmV0dXJuIHJldAogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGNyZWF0ZShjbHMs IGRlc2NyaXB0aW9ucyk6CiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHJldHVybiBsb2FkTW9k dWxlKGNscy5pdGVyYXRlR2V0SXRlbShjbHMucHJvZHVjdHMsIGRlc2NyaXB0aW9ucykpKCkKLSAg ICAgICAgZXhjZXB0OgotICAgICAgICAgICAgcmFpc2UKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biBhcyBlOgorICAgICAgICAgICAgcmFpc2UgZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL3V0aWxzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL3V0aWxzLnB5CmluZGV4IGQ4ZDA1NWMuLjYwN2E0ZjUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci91dGlscy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvdXRpbHMucHkKQEAg LTE5LDcgKzE5LDcgQEAgZGVmIGxvYWRNb2R1bGUobW9kdWxlRGVzYyk6CiAgICAgICAgIHJldCA9 IGdldGF0dHIoX19pbXBvcnRfXyhtb2R1bGVEZXNjWydmaWxlUGF0aCddLCBnbG9iYWxzKCksIGxv Y2FscygpLCBtb2R1bGVEZXNjWydtb2R1bGVOYW1lJ10sIC0xKSwgbW9kdWxlRGVzY1snbW9kdWxl TmFtZSddKQogICAgICAgICByZXR1cm4gcmV0CiAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgot ICAgICAgICByYWlzZSBNb2R1bGVOb3RGb3VuZEVycm9yKCdNb2R1bGUgKCVzKSB3aXRoIHBhdGgo JXMpIGlzIG5vdCBmb3VuZCcgJSAobW9kdWxlRGVzY1snbW9kdWxlTmFtZSddLCBtb2R1bGVEZXNj WydmaWxlUGF0aCddKSkKKyAgICAgICAgcmFpc2UgTW9kdWxlTm90Rm91bmRFcnJvcignRXJyb3Ig bG9hZGluZyBtb2R1bGUgKCVzKSB3aXRoIHBhdGgoJXMpOiB7JXN9JyAlIChtb2R1bGVEZXNjWydt b2R1bGVOYW1lJ10sIG1vZHVsZURlc2NbJ2ZpbGVQYXRoJ10sIGUpKQogCiAKIGRlZiBnZXRQYXRo RnJvbVByb2plY3RSb290KHJlbGF0aXZlUGF0aFRvUHJvamVjdFJvb3QpOgpAQCAtMzQsMTUgKzM0 LDE2IEBAIGRlZiBsb2FkSlNPTkZyb21GaWxlKGZpbGVQYXRoKToKICAgICAgICAganNvbk9iamVj dCA9IGpzb24ubG9hZChvcGVuKGZpbGVQYXRoLCAncicpKQogICAgICAgICBhc3NlcnQoanNvbk9i amVjdCkKICAgICAgICAgcmV0dXJuIGpzb25PYmplY3QKLSAgICBleGNlcHQ6Ci0gICAgICAgIHJh aXNlIEV4Y2VwdGlvbigiSW52YWxpZCBqc29uIGZvcm1hdCBvciBlbXB0eSBqc29uIHdhcyBmb3Vu ZCBpbiAlcyIgJSAoZmlsZVBhdGgpKQorICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKKyAgICAg ICAgcmFpc2UgRXhjZXB0aW9uKCJJbnZhbGlkIGpzb24gZm9ybWF0IG9yIGVtcHR5IGpzb24gd2Fz IGZvdW5kIGluICVzIC0gRXJyb3IgJXMiICUgKGZpbGVQYXRoLCBlKSkKIAogCiBkZWYgZm9yY2VS ZW1vdmUocGF0aCk6CiAgICAgdHJ5OgogICAgICAgICBzaHV0aWwucm10cmVlKHBhdGgpCi0gICAg ZXhjZXB0OgorICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgIyBEaXJlY3Rvcnkv ZmlsZSBkb2VzIG5vdCBleGlzdCBvciBwcml2aWxlZ2UgaXNzdWUsIGp1c3QgaWdub3JlIGl0Cisg ICAgICAgIF9sb2cuaW5mbygiRXJyb3IgcmVtb3ZpbmcgJXM6ICVzIiAlIChwYXRoLCBlKSkKICAg ICAgICAgcGFzcwogCiAjIEJvcnJvdyB0aGlzIGNvZGUgZnJvbQotLSAKMi4zLjQgKEFwcGxlIEdp dC01NikKCg==