92887 2012-08-01 10:49:02 -0700 run-perf-tests throws an exception when the output json is malformed 2012-08-01 11:23:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77037 1 rniwa rniwa abarth dpranke oldest_to_newest 684309 0 rniwa 2012-08-01 10:49:02 -0700 run-perf-tests throws an exception when the output json is malformed 684320 1 155843 rniwa 2012-08-01 10:58:23 -0700 Created attachment 155843 Patch 684326 2 155843 dpranke 2012-08-01 11:03:21 -0700 Comment on attachment 155843 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155843&action=review > Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:56 > + _EXIT_CODE_BAD_PREPARATION = -5 Nit: the leading underscore makes these look like they're supposed to be private, but you return them from run(); should they be public (and have no leading underscore)? 684350 3 rniwa 2012-08-01 11:20:15 -0700 (In reply to comment #2) > (From update of attachment 155843 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155843&action=review > > > Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py:56 > > + _EXIT_CODE_BAD_PREPARATION = -5 > > Nit: the leading underscore makes these look like they're supposed to be private, but you return them from run(); should they be public (and have no leading underscore)? Yeah, I should get rid of underscores. Will do. Thanks. 684359 4 rniwa 2012-08-01 11:23:32 -0700 Committed r124349: <http://trac.webkit.org/changeset/124349> 155843 2012-08-01 10:58:23 -0700 2012-08-01 11:03:21 -0700 Patch bug-92887-20120801105806.patch text/plain 14256 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyNDM0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEyLTA4LTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIHJ1bi1wZXJmLXRlc3RzIHRocm93cyBhbiBleGNlcHRpb24gd2hlbiB0aGUgb3V0 cHV0IGpzb24gaXMgbWFsZm9ybWVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05Mjg4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIENhdGNoIGV4Y2VwdGlvbnMgYW5kIGdyYWNlZnVsbHkgZmFpbC4gQWxzbyBz cGxpdCBfZ2VuZXJhdGVfanNvbiBpbnRvIHNtYWxsZXIgbWV0aG9kcy4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAg ICAgICAoUGVyZlRlc3RzUnVubmVyKToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5ydW4pOgor ICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9nZW5lcmF0ZV9vdXRwdXQpOiBFeHRyYWN0ZWQgZnJv bSBfZ2VuZXJhdGVfanNvbi4KKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5fbWVyZ2Vfc291cmNl X2pzb24pOiBEaXR0bzsgY2F0Y2ggYWxsIGV4Y2VwdGlvbnMgc2luY2UgdGhleSBhcmUgdG9vIG1h bnkKKyAgICAgICAgZXhjZXB0aW9ucyB0byBjb25zZGVyIGhlcmUuCisgICAgICAgIChQZXJmVGVz dHNSdW5uZXIuX21lcmdlX291dHB1dHMpOiBEaXR0by4KKyAgICAgICAgKFBlcmZUZXN0c1J1bm5l ci5fZ2VuZXJhdGVfb3V0cHV0X2ZpbGVzKTogRXh0cmFjdGVkIGZyb20gX2dlbmVyYXRlX2pzb24u CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNy dW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChfdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dCk6 IERvbid0IGFzc2VydCBsb2dzIHdoZW4gd2UgZXhjZXB0IGFuIG5vbi16ZXJvIGV4aXQgY29kZS4K KyAgICAgICAgKGNyZWF0ZV9ydW5uZXJfYW5kX3NldHVwX3Jlc3VsdHNfdGVtcGxhdGUpOiBFeHRy YWN0ZWQgZnJvbSB0ZXN0X3J1bl9nZW5lcmF0ZXNfcmVzdWx0c19wYWdlLgorICAgICAgICAodGVz dF9ydW5fZ2VuZXJhdGVzX3Jlc3VsdHNfcGFnZSk6CisgICAgICAgICh0ZXN0X3J1bl93aXRoX2Jh ZF9vdXRwdXRfanNvbik6IEFkZGVkLgorICAgICAgICAodGVzdF9ydW5fd2l0aF9iYWRfanNvbl9z b3VyY2UpOiBBZGRlZC4KKyAgICAgICAgKHRlc3RfcnVuX3dpdGhfdXBsb2FkX2pzb24pOgorCiAy MDEyLTA4LTAxICBBcm5hdWQgUmVuZXZpZXIgIDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+ CiAKICAgICAgICAga2V5cmluZy5nZXRfcGFzc3dvcmQgbWF5IHJhaXNlIGFuIGV4Y2VwdGlvbi4K SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3Rz cnVubmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFu Y2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CShyZXZpc2lvbiAxMjQzMzgpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQkod29y a2luZyBjb3B5KQpAQCAtNTAsOSArNTAsMTAgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9f bmFtZV9fKQogY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgX2RlZmF1bHRfYnJh bmNoID0gJ3dlYmtpdC10cnVuaycKICAgICBfRVhJVF9DT0RFX0JBRF9CVUlMRCA9IC0xCi0gICAg X0VYSVRfQ09ERV9CQURfSlNPTiA9IC0yCi0gICAgX0VYSVRfQ09ERV9GQUlMRURfVVBMT0FESU5H ID0gLTMKLSAgICBfRVhJVF9DT0RFX0JBRF9QUkVQQVJBVElPTiA9IC00CisgICAgX0VYSVRfQ09E RV9CQURfU09VUkNFX0pTT04gPSAtMgorICAgIF9FWElUX0NPREVfQkFEX01FUkdFID0gLTMKKyAg ICBfRVhJVF9DT0RFX0ZBSUxFRF9VUExPQURJTkcgPSAtNAorICAgIF9FWElUX0NPREVfQkFEX1BS RVBBUkFUSU9OID0gLTUKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBhcmdzPU5vbmUsIHBvcnQ9 Tm9uZSk6CiAgICAgICAgIHNlbGYuX29wdGlvbnMsIHNlbGYuX2FyZ3MgPSBQZXJmVGVzdHNSdW5u ZXIuX3BhcnNlX2FyZ3MoYXJncykKQEAgLTE1Nyw1NyArMTU4LDYyIEBAIGNsYXNzIFBlcmZUZXN0 c1J1bm5lcihvYmplY3QpOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm91dHB1dF9qc29uX3Bh dGg6CiAgICAgICAgICAgICAjIEZJWE1FOiBBZGQgLS1icmFuY2ggb3IgYXV0by1kZXRlY3QgdGhl IGJyYW5jaCB3ZSdyZSBpbgogICAgICAgICAgICAgdGVzdF9yZXN1bHRzX3NlcnZlciA9IG9wdGlv bnMudGVzdF9yZXN1bHRzX3NlcnZlcgotICAgICAgICAgICAgYnJhbmNoID0gc2VsZi5fZGVmYXVs dF9icmFuY2ggaWYgdGVzdF9yZXN1bHRzX3NlcnZlciBlbHNlIE5vbmUKLSAgICAgICAgICAgIGJ1 aWxkX251bWJlciA9IGludChvcHRpb25zLmJ1aWxkX251bWJlcikgaWYgb3B0aW9ucy5idWlsZF9u dW1iZXIgZWxzZSBOb25lCiAKLSAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9nZW5lcmF0ZV9qc29u KHNlbGYuX3RpbWVzdGFtcCwgb3B0aW9ucy5vdXRwdXRfanNvbl9wYXRoLCBvcHRpb25zLnNvdXJj ZV9qc29uX3BhdGgsCi0gICAgICAgICAgICAgICAgbm90IHRlc3RfcmVzdWx0c19zZXJ2ZXIsCi0g ICAgICAgICAgICAgICAgYnJhbmNoLCBvcHRpb25zLnBsYXRmb3JtLCBvcHRpb25zLmJ1aWxkZXJf bmFtZSwgYnVpbGRfbnVtYmVyKSBhbmQgbm90IHVuZXhwZWN0ZWQ6Ci0gICAgICAgICAgICAgICAg cmV0dXJuIHNlbGYuX0VYSVRfQ09ERV9CQURfSlNPTgorICAgICAgICAgICAgb3V0cHV0ID0gc2Vs Zi5fZ2VuZXJhdGVfb3V0cHV0KHNlbGYuX3RpbWVzdGFtcCwgb3B0aW9ucy5wbGF0Zm9ybSwgb3B0 aW9ucy5idWlsZGVyX25hbWUsIG9wdGlvbnMuYnVpbGRfbnVtYmVyKQorCisgICAgICAgICAgICBp ZiBvcHRpb25zLnNvdXJjZV9qc29uX3BhdGg6CisgICAgICAgICAgICAgICAgb3V0cHV0ID0gc2Vs Zi5fbWVyZ2Vfc291cmNlX2pzb24ob3B0aW9ucy5zb3VyY2VfanNvbl9wYXRoLCBvdXRwdXQpCisg ICAgICAgICAgICAgICAgaWYgbm90IG91dHB1dDoKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHNlbGYuX0VYSVRfQ09ERV9CQURfU09VUkNFX0pTT04KKworICAgICAgICAgICAgaWYgbm90IHRl c3RfcmVzdWx0c19zZXJ2ZXI6CisgICAgICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5fbWVyZ2Vf b3V0cHV0cyhzZWxmLl9vcHRpb25zLm91dHB1dF9qc29uX3BhdGgsIG91dHB1dCkKKyAgICAgICAg ICAgICAgICBpZiBub3Qgb3V0cHV0OgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5f RVhJVF9DT0RFX0JBRF9NRVJHRQorCisgICAgICAgICAgICBzZWxmLl9nZW5lcmF0ZV9vdXRwdXRf ZmlsZXMoc2VsZi5fb3B0aW9ucy5vdXRwdXRfanNvbl9wYXRoLCBvdXRwdXQsIG5vdCB0ZXN0X3Jl c3VsdHNfc2VydmVyKQogCiAgICAgICAgICAgICBpZiB0ZXN0X3Jlc3VsdHNfc2VydmVyIGFuZCBu b3Qgc2VsZi5fdXBsb2FkX2pzb24odGVzdF9yZXN1bHRzX3NlcnZlciwgb3B0aW9ucy5vdXRwdXRf anNvbl9wYXRoKToKICAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5fRVhJVF9DT0RFX0ZBSUxF RF9VUExPQURJTkcKIAogICAgICAgICByZXR1cm4gdW5leHBlY3RlZAogCi0gICAgZGVmIF9nZW5l cmF0ZV9qc29uKHNlbGYsIHRpbWVzdGFtcCwgb3V0cHV0X2pzb25fcGF0aCwgc291cmNlX2pzb25f cGF0aCwgc2hvdWxkX2dlbmVyYXRlX3Jlc3VsdHNfcGFnZSwKLSAgICAgICAgYnJhbmNoLCBwbGF0 Zm9ybSwgYnVpbGRlcl9uYW1lLCBidWlsZF9udW1iZXIpOgotCi0gICAgICAgIGNvbnRlbnRzID0g eyd0aW1lc3RhbXAnOiBpbnQodGltZXN0YW1wKSwgJ3Jlc3VsdHMnOiBzZWxmLl9yZXN1bHRzfQor ICAgIGRlZiBfZ2VuZXJhdGVfb3V0cHV0KHNlbGYsIHRpbWVzdGFtcCwgcGxhdGZvcm0sIGJ1aWxk ZXJfbmFtZSwgYnVpbGRfbnVtYmVyKToKKyAgICAgICAgY29udGVudHMgPSB7J3Jlc3VsdHMnOiBz ZWxmLl9yZXN1bHRzfQogICAgICAgICBmb3IgKG5hbWUsIHBhdGgpIGluIHNlbGYuX3BvcnQucmVw b3NpdG9yeV9wYXRocygpOgogICAgICAgICAgICAgY29udGVudHNbbmFtZSArICctcmV2aXNpb24n XSA9IHNlbGYuX2hvc3Quc2NtKCkuc3ZuX3JldmlzaW9uKHBhdGgpCiAKLSAgICAgICAgZm9yIGtl eSwgdmFsdWUgaW4geydicmFuY2gnOiBicmFuY2gsICdwbGF0Zm9ybSc6IHBsYXRmb3JtLCAnYnVp bGRlci1uYW1lJzogYnVpbGRlcl9uYW1lLCAnYnVpbGQtbnVtYmVyJzogYnVpbGRfbnVtYmVyfS5p dGVtcygpOgorICAgICAgICBmb3Iga2V5LCB2YWx1ZSBpbiB7J3RpbWVzdGFtcCc6IGludCh0aW1l c3RhbXApLCAnYnJhbmNoJzogc2VsZi5fZGVmYXVsdF9icmFuY2gsICdwbGF0Zm9ybSc6IHBsYXRm b3JtLAorICAgICAgICAgICAgJ2J1aWxkZXItbmFtZSc6IGJ1aWxkZXJfbmFtZSwgJ2J1aWxkLW51 bWJlcic6IGludChidWlsZF9udW1iZXIpIGlmIGJ1aWxkX251bWJlciBlbHNlIE5vbmV9Lml0ZW1z KCk6CiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAgICAgICAgICBjb250ZW50c1trZXld ID0gdmFsdWUKIAotICAgICAgICBmaWxlc3lzdGVtID0gc2VsZi5faG9zdC5maWxlc3lzdGVtCi0g ICAgICAgIHN1Y2NlZWRlZCA9IEZhbHNlCi0gICAgICAgIGlmIHNvdXJjZV9qc29uX3BhdGg6Ci0g ICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgc291cmNlX2pzb25fZmlsZSA9IGZpbGVz eXN0ZW0ub3Blbl90ZXh0X2ZpbGVfZm9yX3JlYWRpbmcoc291cmNlX2pzb25fcGF0aCkKLSAgICAg ICAgICAgICAgICBzb3VyY2VfanNvbiA9IGpzb24ubG9hZChzb3VyY2VfanNvbl9maWxlKQotICAg ICAgICAgICAgICAgIGNvbnRlbnRzID0gZGljdChzb3VyY2VfanNvbi5pdGVtcygpICsgY29udGVu dHMuaXRlbXMoKSkKLSAgICAgICAgICAgICAgICBzdWNjZWVkZWQgPSBUcnVlCi0gICAgICAgICAg ICBleGNlcHQgSU9FcnJvciwgZXJyb3I6Ci0gICAgICAgICAgICAgICAgX2xvZy5lcnJvcigiRmFp bGVkIHRvIHJlYWQgJXM6ICVzIiAlIChzb3VyY2VfanNvbl9wYXRoLCBlcnJvcikpCi0gICAgICAg ICAgICBleGNlcHQgVmFsdWVFcnJvciwgZXJyb3I6Ci0gICAgICAgICAgICAgICAgX2xvZy5lcnJv cigiRmFpbGVkIHRvIHBhcnNlICVzOiAlcyIgJSAoc291cmNlX2pzb25fcGF0aCwgZXJyb3IpKQot ICAgICAgICAgICAgZXhjZXB0IFR5cGVFcnJvciwgZXJyb3I6Ci0gICAgICAgICAgICAgICAgX2xv Zy5lcnJvcigiRmFpbGVkIHRvIG1lcmdlIEpTT04gZmlsZXM6ICVzIiAlIGVycm9yKQotICAgICAg ICAgICAgaWYgbm90IHN1Y2NlZWRlZDoKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAg ICAgICAgcmV0dXJuIGNvbnRlbnRzCiAKLSAgICAgICAgaWYgc2hvdWxkX2dlbmVyYXRlX3Jlc3Vs dHNfcGFnZToKLSAgICAgICAgICAgIGlmIGZpbGVzeXN0ZW0uaXNmaWxlKG91dHB1dF9qc29uX3Bh dGgpOgotICAgICAgICAgICAgICAgIGV4aXN0aW5nX2NvbnRlbnRzID0ganNvbi5sb2FkcyhmaWxl c3lzdGVtLnJlYWRfdGV4dF9maWxlKG91dHB1dF9qc29uX3BhdGgpKQotICAgICAgICAgICAgICAg IGV4aXN0aW5nX2NvbnRlbnRzLmFwcGVuZChjb250ZW50cykKLSAgICAgICAgICAgICAgICBjb250 ZW50cyA9IGV4aXN0aW5nX2NvbnRlbnRzCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAg ICAgIGNvbnRlbnRzID0gW2NvbnRlbnRzXQorICAgIGRlZiBfbWVyZ2Vfc291cmNlX2pzb24oc2Vs Ziwgc291cmNlX2pzb25fcGF0aCwgb3V0cHV0KToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAg c291cmNlX2pzb25fZmlsZSA9IHNlbGYuX2hvc3QuZmlsZXN5c3RlbS5vcGVuX3RleHRfZmlsZV9m b3JfcmVhZGluZyhzb3VyY2VfanNvbl9wYXRoKQorICAgICAgICAgICAgc291cmNlX2pzb24gPSBq c29uLmxvYWQoc291cmNlX2pzb25fZmlsZSkKKyAgICAgICAgICAgIHJldHVybiBkaWN0KHNvdXJj ZV9qc29uLml0ZW1zKCkgKyBvdXRwdXQuaXRlbXMoKSkKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biwgZXJyb3I6CisgICAgICAgICAgICBfbG9nLmVycm9yKCJGYWlsZWQgdG8gbWVyZ2Ugc291cmNl IEpTT04gZmlsZSAlczogJXMiICUgKHNvdXJjZV9qc29uX3BhdGgsIGVycm9yKSkKKyAgICAgICAg cmV0dXJuIE5vbmUKIAotICAgICAgICBzZXJpYWxpemVkX2NvbnRlbnRzID0ganNvbi5kdW1wcyhj b250ZW50cykKLSAgICAgICAgZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUob3V0cHV0X2pzb25f cGF0aCwgc2VyaWFsaXplZF9jb250ZW50cykKKyAgICBkZWYgX21lcmdlX291dHB1dHMoc2VsZiwg b3V0cHV0X2pzb25fcGF0aCwgb3V0cHV0KToKKyAgICAgICAgaWYgbm90IHNlbGYuX2hvc3QuZmls ZXN5c3RlbS5pc2ZpbGUob3V0cHV0X2pzb25fcGF0aCk6CisgICAgICAgICAgICByZXR1cm4gW291 dHB1dF0KKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgZXhpc3Rpbmdfb3V0cHV0cyA9IGpzb24u bG9hZHMoc2VsZi5faG9zdC5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKG91dHB1dF9qc29uX3Bh dGgpKQorICAgICAgICAgICAgcmV0dXJuIGV4aXN0aW5nX291dHB1dHMgKyBbb3V0cHV0XQorICAg ICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnJvcjoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoIkZh aWxlZCB0byBtZXJnZSBvdXRwdXQgSlNPTiBmaWxlICVzOiAlcyIgJSAob3V0cHV0X2pzb25fcGF0 aCwgZXJyb3IpKQorICAgICAgICByZXR1cm4gTm9uZQorCisgICAgZGVmIF9nZW5lcmF0ZV9vdXRw dXRfZmlsZXMoc2VsZiwgb3V0cHV0X2pzb25fcGF0aCwgb3V0cHV0LCBzaG91bGRfZ2VuZXJhdGVf cmVzdWx0c19wYWdlKToKKyAgICAgICAgZmlsZXN5c3RlbSA9IHNlbGYuX2hvc3QuZmlsZXN5c3Rl bQorCisgICAgICAgIGpzb25fb3V0cHV0ID0ganNvbi5kdW1wcyhvdXRwdXQpCisgICAgICAgIGZp bGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKG91dHB1dF9qc29uX3BhdGgsIGpzb25fb3V0cHV0KQog CiAgICAgICAgIGlmIHNob3VsZF9nZW5lcmF0ZV9yZXN1bHRzX3BhZ2U6CiAgICAgICAgICAgICBq cXVlcnlfcGF0aCA9IGZpbGVzeXN0ZW0uam9pbihzZWxmLl9wb3J0LnBlcmZfdGVzdHNfZGlyKCks ICdEcm9tYWVvL3Jlc291cmNlcy9kcm9tYWVvL3dlYi9saWIvanF1ZXJ5LTEuNi40LmpzJykKQEAg LTIxNywxMiArMjIzLDEwIEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAg ICAgICAgdGVtcGxhdGUgPSBmaWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHRlbXBsYXRlX3BhdGgp CiAKICAgICAgICAgICAgIHJlc3VsdHNfcGFnZSA9IHRlbXBsYXRlLnJlcGxhY2UoJzw/V2ViS2l0 UGVyZlRlc3RSdW5uZXJJbnNlcnRpb25Qb2ludD8+JywKLSAgICAgICAgICAgICAgICAnPHNjcmlw dD4lczwvc2NyaXB0PjxzY3JpcHQgaWQ9Impzb24iPiVzPC9zY3JpcHQ+JyAlIChqcXVlcnksIHNl cmlhbGl6ZWRfY29udGVudHMpKQorICAgICAgICAgICAgICAgICc8c2NyaXB0PiVzPC9zY3JpcHQ+ PHNjcmlwdCBpZD0ianNvbiI+JXM8L3NjcmlwdD4nICUgKGpxdWVyeSwganNvbl9vdXRwdXQpKQog CiAgICAgICAgICAgICBmaWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShmaWxlc3lzdGVtLnNwbGl0 ZXh0KG91dHB1dF9qc29uX3BhdGgpWzBdICsgJy5odG1sJywgcmVzdWx0c19wYWdlKQogCi0gICAg ICAgIHJldHVybiBUcnVlCi0KICAgICBkZWYgX3VwbG9hZF9qc29uKHNlbGYsIHRlc3RfcmVzdWx0 c19zZXJ2ZXIsIGpzb25fcGF0aCwgZmlsZV91cGxvYWRlcj1GaWxlVXBsb2FkZXIpOgogICAgICAg ICB1cGxvYWRlciA9IGZpbGVfdXBsb2FkZXIoImh0dHBzOi8vJXMvYXBpL3Rlc3QvcmVwb3J0IiAl IHRlc3RfcmVzdWx0c19zZXJ2ZXIsIDEyMCkKICAgICAgICAgdHJ5OgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHkJKHJldmlzaW9uIDEyNDMzOCkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNDYsMTYgKzI0NiwxNyBAQCBtYXggMTEyMAogICAg ICAgICBmaW5hbGx5OgogICAgICAgICAgICAgc3Rkb3V0LCBzdGRlcnIsIGxvZ3MgPSBvdXRwdXRf Y2FwdHVyZS5yZXN0b3JlX291dHB1dCgpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2dz LCAnXG4nLmpvaW4oWwotICAgICAgICAgICAgJ1J1bm5pbmcgMiB0ZXN0cycsCi0gICAgICAgICAg ICAnUnVubmluZyBCaW5kaW5ncy9ldmVudC10YXJnZXQtd3JhcHBlci5odG1sICgxIG9mIDIpJywK LSAgICAgICAgICAgICdSRVNVTFQgQmluZGluZ3M6IGV2ZW50LXRhcmdldC13cmFwcGVyPSAxNDg5 LjA1IG1zJywKLSAgICAgICAgICAgICdtZWRpYW49IDE0ODcuMCBtcywgc3RkZXY9IDE0LjQ2IG1z LCBtaW49IDE0NzEuMCBtcywgbWF4PSAxNTEwLjAgbXMnLAotICAgICAgICAgICAgJycsCi0gICAg ICAgICAgICAnUnVubmluZyBpbnNwZWN0b3IvcGFzcy5odG1sICgyIG9mIDIpJywKLSAgICAgICAg ICAgICdSRVNVTFQgZ3JvdXBfbmFtZTogdGVzdF9uYW1lPSA0MiBtcycsCi0gICAgICAgICAgICAn JywKLSAgICAgICAgICAgICcnXSkpCisgICAgICAgIGlmIG5vdCBleHBlY3RlZF9leGl0X2NvZGU6 CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvZ3MsICdcbicuam9pbihbCisgICAgICAg ICAgICAgICAgJ1J1bm5pbmcgMiB0ZXN0cycsCisgICAgICAgICAgICAgICAgJ1J1bm5pbmcgQmlu ZGluZ3MvZXZlbnQtdGFyZ2V0LXdyYXBwZXIuaHRtbCAoMSBvZiAyKScsCisgICAgICAgICAgICAg ICAgJ1JFU1VMVCBCaW5kaW5nczogZXZlbnQtdGFyZ2V0LXdyYXBwZXI9IDE0ODkuMDUgbXMnLAor ICAgICAgICAgICAgICAgICdtZWRpYW49IDE0ODcuMCBtcywgc3RkZXY9IDE0LjQ2IG1zLCBtaW49 IDE0NzEuMCBtcywgbWF4PSAxNTEwLjAgbXMnLAorICAgICAgICAgICAgICAgICcnLAorICAgICAg ICAgICAgICAgICdSdW5uaW5nIGluc3BlY3Rvci9wYXNzLmh0bWwgKDIgb2YgMiknLAorICAgICAg ICAgICAgICAgICdSRVNVTFQgZ3JvdXBfbmFtZTogdGVzdF9uYW1lPSA0MiBtcycsCisgICAgICAg ICAgICAgICAgJycsCisgICAgICAgICAgICAgICAgJyddKSkKIAogICAgICAgICByZXR1cm4gdXBs b2FkZWRbMF0KIApAQCAtMjY5LDE5ICsyNzAsMjEgQEAgbWF4IDExMjAKICAgICAgICAgICAgICJp bnNwZWN0b3IvcGFzcy5odG1sOmdyb3VwX25hbWU6dGVzdF9uYW1lIjogNDJ9LAogICAgICAgICAg ICAgIndlYmtpdC1yZXZpc2lvbiI6IDU2NzgsICJicmFuY2giOiAid2Via2l0LXRydW5rIn0pCiAK LSAgICBkZWYgdGVzdF9ydW5fZ2VuZXJhdGVzX3Jlc3VsdHNfcGFnZShzZWxmKToKLSAgICAgICAg cnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyKGFyZ3M9WyctLW91dHB1dC1qc29uLXBh dGg9L21vY2stY2hlY2tvdXQvb3V0cHV0Lmpzb24nXSkKKyAgICBkZWYgY3JlYXRlX3J1bm5lcl9h bmRfc2V0dXBfcmVzdWx0c190ZW1wbGF0ZShzZWxmLCBhcmdzKToKKyAgICAgICAgcnVubmVyLCBw b3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyKGFyZ3MpCiAgICAgICAgIGZpbGVzeXN0ZW0gPSBwb3J0 Lmhvc3QuZmlsZXN5c3RlbQotICAgICAgICBmaWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShydW5u ZXIuX2Jhc2VfcGF0aCArICcvcmVzb3VyY2VzL3Jlc3VsdHMtdGVtcGxhdGUuaHRtbCcsCi0gICAg ICAgICAgICAnQkVHSU48P1dlYktpdFBlcmZUZXN0UnVubmVySW5zZXJ0aW9uUG9pbnQ/PkVORCcp Ci0gICAgICAgIGZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHJ1bm5lci5fYmFzZV9wYXRoICsg Jy9Ecm9tYWVvL3Jlc291cmNlcy9kcm9tYWVvL3dlYi9saWIvanF1ZXJ5LTEuNi40LmpzJywKLSAg ICAgICAgICAgICdqcXVlcnkgY29udGVudCcpCisgICAgICAgIGZpbGVzeXN0ZW0ud3JpdGVfdGV4 dF9maWxlKHJ1bm5lci5fYmFzZV9wYXRoICsgJy9yZXNvdXJjZXMvcmVzdWx0cy10ZW1wbGF0ZS5o dG1sJywgJ0JFR0lOPD9XZWJLaXRQZXJmVGVzdFJ1bm5lckluc2VydGlvblBvaW50Pz5FTkQnKQor ICAgICAgICBmaWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShydW5uZXIuX2Jhc2VfcGF0aCArICcv RHJvbWFlby9yZXNvdXJjZXMvZHJvbWFlby93ZWIvbGliL2pxdWVyeS0xLjYuNC5qcycsICdqcXVl cnkgY29udGVudCcpCisgICAgICAgIHJldHVybiBydW5uZXIsIHBvcnQKIAorICAgIGRlZiB0ZXN0 X3J1bl9nZW5lcmF0ZXNfcmVzdWx0c19wYWdlKHNlbGYpOgorICAgICAgICBydW5uZXIsIHBvcnQg PSBzZWxmLmNyZWF0ZV9ydW5uZXJfYW5kX3NldHVwX3Jlc3VsdHNfdGVtcGxhdGUoYXJncz1bJy0t b3V0cHV0LWpzb24tcGF0aD0vbW9jay1jaGVja291dC9vdXRwdXQuanNvbiddKQorICAgICAgICBm aWxlc3lzdGVtID0gcG9ydC5ob3N0LmZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5fdGVzdF9ydW5f d2l0aF9qc29uX291dHB1dChydW5uZXIsIGZpbGVzeXN0ZW0pCiAKICAgICAgICAgZXhwZWN0ZWRf ZW50cnkgPSB7InRpbWVzdGFtcCI6IDEyMzQ1Njc4OSwgInJlc3VsdHMiOiB7IkJpbmRpbmdzL2V2 ZW50LXRhcmdldC13cmFwcGVyIjoKICAgICAgICAgICAgIHsibWF4IjogMTUxMCwgImF2ZyI6IDE0 ODkuMDUsICJtZWRpYW4iOiAxNDg3LCAibWluIjogMTQ3MSwgInN0ZGV2IjogMTQuNDYsICJ1bml0 IjogIm1zIn0sCi0gICAgICAgICAgICAiaW5zcGVjdG9yL3Bhc3MuaHRtbDpncm91cF9uYW1lOnRl c3RfbmFtZSI6IDQyfSwgIndlYmtpdC1yZXZpc2lvbiI6IDU2Nzh9CisgICAgICAgICAgICAiaW5z cGVjdG9yL3Bhc3MuaHRtbDpncm91cF9uYW1lOnRlc3RfbmFtZSI6IDQyfSwgIndlYmtpdC1yZXZp c2lvbiI6IDU2NzgsICJicmFuY2giOiAid2Via2l0LXRydW5rIn0KIAogICAgICAgICBzZWxmLm1h eERpZmYgPSBOb25lCiAgICAgICAgIGpzb25fb3V0cHV0ID0gcG9ydC5ob3N0LmZpbGVzeXN0ZW0u cmVhZF90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L291dHB1dC5qc29uJykKQEAgLTI5NSw2ICsy OTgsMTMgQEAgbWF4IDExMjAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmaWxlc3lzdGVtLnJl YWRfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9vdXRwdXQuaHRtbCcpLAogICAgICAgICAgICAg J0JFR0lOPHNjcmlwdD5qcXVlcnkgY29udGVudDwvc2NyaXB0PjxzY3JpcHQgaWQ9Impzb24iPicg KyBqc29uX291dHB1dCArICc8L3NjcmlwdD5FTkQnKQogCisgICAgZGVmIHRlc3RfcnVuX3dpdGhf YmFkX291dHB1dF9qc29uKHNlbGYpOgorICAgICAgICBydW5uZXIsIHBvcnQgPSBzZWxmLmNyZWF0 ZV9ydW5uZXJfYW5kX3NldHVwX3Jlc3VsdHNfdGVtcGxhdGUoYXJncz1bJy0tb3V0cHV0LWpzb24t cGF0aD0vbW9jay1jaGVja291dC9vdXRwdXQuanNvbiddKQorICAgICAgICBwb3J0Lmhvc3QuZmls ZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L291dHB1dC5qc29uJywgJ2Jh ZCBqc29uJykKKyAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIs IHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVy Ll9FWElUX0NPREVfQkFEX01FUkdFKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0 ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L291dHB1dC5qc29uJywgJ3siYW5vdGhlciBiYWQg anNvbiI6ICIxIn0nKQorICAgICAgICBzZWxmLl90ZXN0X3J1bl93aXRoX2pzb25fb3V0cHV0KHJ1 bm5lciwgcG9ydC5ob3N0LmZpbGVzeXN0ZW0sIGV4cGVjdGVkX2V4aXRfY29kZT1QZXJmVGVzdHNS dW5uZXIuX0VYSVRfQ09ERV9CQURfTUVSR0UpCisKICAgICBkZWYgdGVzdF9ydW5fd2l0aF9qc29u X3NvdXJjZShzZWxmKToKICAgICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVubmVy KGFyZ3M9WyctLW91dHB1dC1qc29uLXBhdGg9L21vY2stY2hlY2tvdXQvb3V0cHV0Lmpzb24nLAog ICAgICAgICAgICAgJy0tc291cmNlLWpzb24tcGF0aD0vbW9jay1jaGVja291dC9zb3VyY2UuanNv bicsICctLXRlc3QtcmVzdWx0cy1zZXJ2ZXI9c29tZS5ob3N0J10pCkBAIC0zMDcsNiArMzE3LDE1 IEBAIG1heCAxMTIwCiAgICAgICAgICAgICAid2Via2l0LXJldmlzaW9uIjogNTY3OCwgImJyYW5j aCI6ICJ3ZWJraXQtdHJ1bmsiLAogICAgICAgICAgICAgImtleSI6ICJ2YWx1ZSJ9KQogCisgICAg ZGVmIHRlc3RfcnVuX3dpdGhfYmFkX2pzb25fc291cmNlKHNlbGYpOgorICAgICAgICBydW5uZXIs IHBvcnQgPSBzZWxmLmNyZWF0ZV9ydW5uZXIoYXJncz1bJy0tb3V0cHV0LWpzb24tcGF0aD0vbW9j ay1jaGVja291dC9vdXRwdXQuanNvbicsCisgICAgICAgICAgICAnLS1zb3VyY2UtanNvbi1wYXRo PS9tb2NrLWNoZWNrb3V0L3NvdXJjZS5qc29uJywgJy0tdGVzdC1yZXN1bHRzLXNlcnZlcj1zb21l Lmhvc3QnXSkKKyAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIs IHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVy Ll9FWElUX0NPREVfQkFEX1NPVVJDRV9KU09OKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3Rl bS53cml0ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L3NvdXJjZS5qc29uJywgJ2JhZCBqc29u JykKKyAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQu aG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVyLl9FWElU X0NPREVfQkFEX1NPVVJDRV9KU09OKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS53cml0 ZV90ZXh0X2ZpbGUoJy9tb2NrLWNoZWNrb3V0L3NvdXJjZS5qc29uJywgJ1siYW5vdGhlciBiYWQg anNvbiJdJykKKyAgICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIs IHBvcnQuaG9zdC5maWxlc3lzdGVtLCBleHBlY3RlZF9leGl0X2NvZGU9UGVyZlRlc3RzUnVubmVy Ll9FWElUX0NPREVfQkFEX1NPVVJDRV9KU09OKQorCiAgICAgZGVmIHRlc3RfcnVuX3dpdGhfbXVs dGlwbGVfcmVwb3NpdG9yaWVzKHNlbGYpOgogICAgICAgICBydW5uZXIsIHBvcnQgPSBzZWxmLmNy ZWF0ZV9ydW5uZXIoYXJncz1bJy0tb3V0cHV0LWpzb24tcGF0aD0vbW9jay1jaGVja291dC9vdXRw dXQuanNvbicsCiAgICAgICAgICAgICAnLS10ZXN0LXJlc3VsdHMtc2VydmVyPXNvbWUuaG9zdCdd KQpAQCAtMzI4LDcgKzM0Nyw3IEBAIG1heCAxMTIwCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo Z2VuZXJhdGVkX2pzb25bJ2J1aWxkZXItbmFtZSddLCAnYnVpbGRlcjEnKQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGdlbmVyYXRlZF9qc29uWydidWlsZC1udW1iZXInXSwgMTIzKQogCi0gICAg ICAgIHNlbGYuX3Rlc3RfcnVuX3dpdGhfanNvbl9vdXRwdXQocnVubmVyLCBwb3J0Lmhvc3QuZmls ZXN5c3RlbSwgdXBsb2FkX3N1Y2VlZHM9RmFsc2UsIGV4cGVjdGVkX2V4aXRfY29kZT0tMykKKyAg ICAgICAgc2VsZi5fdGVzdF9ydW5fd2l0aF9qc29uX291dHB1dChydW5uZXIsIHBvcnQuaG9zdC5m aWxlc3lzdGVtLCB1cGxvYWRfc3VjZWVkcz1GYWxzZSwgZXhwZWN0ZWRfZXhpdF9jb2RlPVBlcmZU ZXN0c1J1bm5lci5fRVhJVF9DT0RFX0ZBSUxFRF9VUExPQURJTkcpCiAKICAgICBkZWYgdGVzdF91 cGxvYWRfanNvbihzZWxmKToKICAgICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVu bmVyKCkK