183171 2018-02-27 12:29:28 -0800 Rename samplePendingBuild to samplePendingBuildRequest 2018-02-28 13:55:42 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain commit-queue lforschler rniwa webkit-bug-importer oldest_to_newest 1402389 0 aakash_jain 2018-02-27 12:29:28 -0800 Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js contains methods samplePendingBuild and samplePendingBuildDeprecated. These are poorly named functions as they actually represent a pending buildrequest. We should rename them to samplePendingBuildRequest and samplePendingBuildRequestDeprecated. 1402390 1 334700 aakash_jain 2018-02-27 12:31:30 -0800 Created attachment 334700 Proposed patch 1402548 2 334700 rniwa 2018-02-28 01:50:25 -0800 Comment on attachment 334700 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=334700&action=review > Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js:318 > +function samplePendingBuildRequest(buildRequestId, buildTime, builderName) Should be samplePendingBuildRequests since this function returns a list of build requests even though it always contains one. 1402687 3 334757 aakash_jain 2018-02-28 12:16:42 -0800 Created attachment 334757 Patch for landing 1402688 4 aakash_jain 2018-02-28 12:17:39 -0800 > Should be samplePendingBuildRequests since this function returns a list of > build requests even though it always contains one. ok. Renamed. 1402715 5 334757 commit-queue 2018-02-28 13:55:01 -0800 Comment on attachment 334757 Patch for landing Clearing flags on attachment: 334757 Committed r229101: <https://trac.webkit.org/changeset/229101> 1402716 6 commit-queue 2018-02-28 13:55:03 -0800 All reviewed patches have been landed. Closing bug. 1402717 7 webkit-bug-importer 2018-02-28 13:55:42 -0800 <rdar://problem/37999819> 334700 2018-02-27 12:31:30 -0800 2018-02-28 12:16:42 -0800 Proposed patch rename_samplePendingBuild.patch text/plain 6784 aakash_jain SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5MDY3KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE4LTAyLTI3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBSZW5hbWUgc2FtcGxlUGVuZGluZ0J1aWxkIHRvIHNhbXBsZVBlbmRpbmdC dWlsZFJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4MzE3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanM6CisgICAgICAgIChzYW1w bGVQZW5kaW5nQnVpbGRSZXF1ZXN0KTogUmVuYW1lZCBmcm9tIHNhbXBsZVBlbmRpbmdCdWlsZC4K KyAgICAgICAgKHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REZXByZWNhdGVkKTogUmVuYW1lZCBm cm9tIHNhbXBsZVBlbmRpbmdCdWlsZERlcHJlY2F0ZWQuCisgICAgICAgIChzYW1wbGVQZW5kaW5n QnVpbGQpOiBEZWxldGVkLgorICAgICAgICAoc2FtcGxlUGVuZGluZ0J1aWxkRGVwcmVjYXRlZCk6 IERlbGV0ZWQuCisKIDIwMTgtMDItMDIgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUu Y29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciBzdWJtaXR0aW5nIGJ1aWxkIHJlcXVlc3Qg dG8gQnVpbGRib3QgMC45IHNlcnZlciBpbiBCdWlsZGJvdFN5bmNlcgpJbmRleDogV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2J1aWxkYm90LXN5 bmNlci10ZXN0cy5qcwkocmV2aXNpb24gMjI5MDY3KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCSh3b3JraW5nIGNvcHkpCkBA IC0yOTcsNyArMjk3LDcgQEAgZnVuY3Rpb24gY3JlYXRlU2FtcGxlQnVpbGRSZXF1ZXN0V2l0aE93 bgogICAgICAgICAnY29tbWl0U2V0JzogY29tbWl0U2V0LCAnc3RhdHVzJzogJ3BlbmRpbmcnLCAn cGxhdGZvcm0nOiBwbGF0Zm9ybSwgJ3Rlc3QnOiB0ZXN0LCAnb3JkZXInOiBvcmRlcn0pOwogfQog Ci1mdW5jdGlvbiBzYW1wbGVQZW5kaW5nQnVpbGREYXRhKGJ1aWxkUmVxdWVzdElkLCBidWlsZFRp bWUsIGJ1aWxkZXJJZCkKK2Z1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REYXRhKGJ1 aWxkUmVxdWVzdElkLCBidWlsZFRpbWUsIGJ1aWxkZXJJZCkKIHsKICAgICByZXR1cm4gewogICAg ICAgICAiYnVpbGRlcmlkIjogYnVpbGRlcklkIHx8IDEwMiwKQEAgLTMxNSwxMCArMzE1LDEwIEBA IGZ1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZERhdGEoYnVpbGRSZXEKICAgICB9OwogfQogCi1m dW5jdGlvbiBzYW1wbGVQZW5kaW5nQnVpbGQoYnVpbGRSZXF1ZXN0SWQsIGJ1aWxkVGltZSwgYnVp bGRlck5hbWUpCitmdW5jdGlvbiBzYW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0KGJ1aWxkUmVxdWVz dElkLCBidWlsZFRpbWUsIGJ1aWxkZXJOYW1lKQogewogICAgIHJldHVybiB7Ci0gICAgICAgICJi dWlsZHJlcXVlc3RzIiA6IFtzYW1wbGVQZW5kaW5nQnVpbGREYXRhKGJ1aWxkUmVxdWVzdElkLCBi dWlsZFRpbWUsIGJ1aWxkZXJOYW1lVG9JRE1hcCgpW2J1aWxkZXJOYW1lXSldCisgICAgICAgICJi dWlsZHJlcXVlc3RzIiA6IFtzYW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGF0YShidWlsZFJlcXVl c3RJZCwgYnVpbGRUaW1lLCBidWlsZGVyTmFtZVRvSURNYXAoKVtidWlsZGVyTmFtZV0pXQogICAg IH07CiB9CiAKQEAgLTM3MCw3ICszNzAsNyBAQCBmdW5jdGlvbiBzYW1wbGVGaW5pc2hlZEJ1aWxk KGJ1aWxkUmVxdWVzCiAgICAgfTsKIH0KIAotZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkRGVw cmVjYXRlZChidWlsZFJlcXVlc3RJZCwgYnVpbGRUaW1lLCBzbGF2ZU5hbWUpCitmdW5jdGlvbiBz YW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGVwcmVjYXRlZChidWlsZFJlcXVlc3RJZCwgYnVpbGRU aW1lLCBzbGF2ZU5hbWUpCiB7CiAgICAgcmV0dXJuIHsKICAgICAgICAgJ2J1aWxkZXJOYW1lJzog J0FCVGVzdC1pUGFkLVJ1bkJlbmNobWFyay1UZXN0cycsCkBAIC0xMjc1LDcgKzEyNzUsNyBAQCBk ZXNjcmliZSgnQnVpbGRib3RTeW5jZXInLCAoKSA9PiB7CiAgICAgZGVzY3JpYmUoJ0J1aWxkYm90 QnVpbGRFbnRyeScsICgpID0+IHsKICAgICAgICAgaXQoJ3Nob3VsZCBjcmVhdGUgQnVpbGRib3RC dWlsZEVudHJ5IGZvciBwZW5kaW5nIGJ1aWxkJywgKCkgPT4gewogICAgICAgICAgICAgbGV0IHN5 bmNlciA9IEJ1aWxkYm90U3luY2VyLl9sb2FkQ29uZmlnKE1vY2tSZW1vdGVBUEksIHNhbXBsZWlP U0NvbmZpZygpLCBidWlsZGVyTmFtZVRvSURNYXAoKSlbMV07Ci0gICAgICAgICAgICBjb25zdCBi dWlsZGJvdERhdGEgPSBzYW1wbGVQZW5kaW5nQnVpbGQoKTsKKyAgICAgICAgICAgIGNvbnN0IGJ1 aWxkYm90RGF0YSA9IHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3QoKTsKICAgICAgICAgICAgIGNv bnN0IHBlbmRpbmdFbnRyaWVzID0gYnVpbGRib3REYXRhLmJ1aWxkcmVxdWVzdHMubWFwKChlbnRy eSkgPT4gbmV3IEJ1aWxkYm90QnVpbGRFbnRyeShzeW5jZXIsIGVudHJ5KSk7CiAKICAgICAgICAg ICAgIGFzc2VydC5lcXVhbChwZW5kaW5nRW50cmllcy5sZW5ndGgsIDEpOwpAQCAtMTQ1Miw3ICsx NDUyLDcgQEAgZGVzY3JpYmUoJ0J1aWxkYm90U3luY2VyJywgKCkgPT4gewogICAgICAgICBpdCgn c2hvdWxkIGNyZWF0ZSBCdWlsZGJvdEJ1aWxkRW50cnkgZm9yIHBlbmRpbmcgYnVpbGRzJywgKCkg PT4gewogICAgICAgICAgICAgbGV0IHN5bmNlciA9IEJ1aWxkYm90U3luY2VyLl9sb2FkQ29uZmln KE1vY2tSZW1vdGVBUEksIHNhbXBsZWlPU0NvbmZpZygpLCBidWlsZGVyTmFtZVRvSURNYXAoKSlb MV07CiAgICAgICAgICAgICBsZXQgcHJvbWlzZSA9IHN5bmNlci5wdWxsQnVpbGRib3QoKTsKLSAg ICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBlbmRpbmdCdWlsZERlcHJlY2F0 ZWQoKV0pOworICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2ZShbc2FtcGxlUGVuZGluZ0J1 aWxkUmVxdWVzdERlcHJlY2F0ZWQoKV0pOwogICAgICAgICAgICAgcmV0dXJuIHByb21pc2UudGhl bigoZW50cmllcykgPT4gewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChlbnRyaWVzLmxl bmd0aCwgMSk7CiAgICAgICAgICAgICAgICAgbGV0IGVudHJ5ID0gZW50cmllc1swXTsKQEAgLTE1 MjEsNyArMTUyMSw3IEBAIGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAgICAg ICAgICAgIGxldCBwcm9taXNlID0gc3luY2VyLnB1bGxCdWlsZGJvdCg1KTsKICAgICAgICAgICAg IGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDEpOwogCi0gICAgICAgICAgICByZXF1ZXN0 c1swXS5yZXNvbHZlKFtzYW1wbGVQZW5kaW5nQnVpbGREZXByZWNhdGVkKDEyMyldKTsKKyAgICAg ICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REZXBy ZWNhdGVkKDEyMyldKTsKIAogICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZv clJlcXVlc3QoKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVx dWVzdHMubGVuZ3RoLCAyKTsKQEAgLTE1NjgsNyArMTU2OCw3IEBAIGRlc2NyaWJlKCdCdWlsZGJv dFN5bmNlcicsICgpID0+IHsKICAgICAgICAgICAgIGxldCBwcm9taXNlID0gc3luY2VyLnB1bGxC dWlsZGJvdCg1KTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDEp OwogCi0gICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKFtzYW1wbGVQZW5kaW5nQnVpbGRE ZXByZWNhdGVkKDQ1NiwgMiksIHNhbXBsZVBlbmRpbmdCdWlsZERlcHJlY2F0ZWQoMTIzLCAxKV0p OworICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2ZShbc2FtcGxlUGVuZGluZ0J1aWxkUmVx dWVzdERlcHJlY2F0ZWQoNDU2LCAyKSwgc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERlcHJlY2F0 ZWQoMTIzLCAxKV0pOwogCiAgICAgICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9y UmVxdWVzdCgpLnRoZW4oKCkgPT4gewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1 ZXN0cy5sZW5ndGgsIDIpOwpAQCAtMTYyNSw3ICsxNjI1LDcgQEAgZGVzY3JpYmUoJ0J1aWxkYm90 U3luY2VyJywgKCkgPT4gewogICAgICAgICAgICAgbGV0IHByb21pc2UgPSBzeW5jZXIucHVsbEJ1 aWxkYm90KDUpOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMSk7 CiAKLSAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBlbmRpbmdCdWlsZERl cHJlY2F0ZWQoKV0pOworICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2ZShbc2FtcGxlUGVu ZGluZ0J1aWxkUmVxdWVzdERlcHJlY2F0ZWQoKV0pOwogCiAgICAgICAgICAgICByZXR1cm4gTW9j a1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpLnRoZW4oKCkgPT4gewogICAgICAgICAgICAgICAg IGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDIpOwpAQCAtMTY1Miw3ICsxNjUyLDcgQEAg ZGVzY3JpYmUoJ0J1aWxkYm90U3luY2VyJywgKCkgPT4gewogICAgICAgICAgICAgbGV0IHByb21p c2UgPSBzeW5jZXIucHVsbEJ1aWxkYm90KDUpOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJl cXVlc3RzLmxlbmd0aCwgMSk7CiAKLSAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3Nh bXBsZVBlbmRpbmdCdWlsZERlcHJlY2F0ZWQoKV0pOworICAgICAgICAgICAgcmVxdWVzdHNbMF0u cmVzb2x2ZShbc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERlcHJlY2F0ZWQoKV0pOwogCiAgICAg ICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS53YWl0Rm9yUmVxdWVzdCgpLnRoZW4oKCkgPT4g ewogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDIpOwpAQCAt MTgwMSw3ICsxODAxLDcgQEAgZGVzY3JpYmUoJ0J1aWxkYm90U3luY2VyJywgKCkgPT4gewogICAg ICAgICBpdCgnc2hvdWxkIG5vdCBzY2hlZHVsZSBhIGJ1aWxkIGlmIGJ1aWxkZXIgaGFzIGEgcGVu ZGluZyBidWlsZCBvbiB0aGUgbWFjaGluZyBzbGF2ZScsICgpID0+IHsKICAgICAgICAgICAgIGxl dCBzeW5jZXIgPSBCdWlsZGJvdFN5bmNlci5fbG9hZENvbmZpZyhNb2NrUmVtb3RlQVBJLCBzYW1w bGVpT1NDb25maWcoKSwgYnVpbGRlck5hbWVUb0lETWFwKCkpWzFdOwogCi0gICAgICAgICAgICBw dWxsQnVpbGRib3RXaXRoQXNzZXJ0aW9uKHN5bmNlciwgW3NhbXBsZVBlbmRpbmdCdWlsZERlcHJl Y2F0ZWQoKV0sIHt9KS50aGVuKCgpID0+IHsKKyAgICAgICAgICAgIHB1bGxCdWlsZGJvdFdpdGhB c3NlcnRpb24oc3luY2VyLCBbc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERlcHJlY2F0ZWQoKV0s IHt9KS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAgICBjb25zdCByZXF1ZXN0ID0gY3JlYXRl U2FtcGxlQnVpbGRSZXF1ZXN0KE1vY2tNb2RlbHMuaXBhZCwgTW9ja01vZGVscy5zcGVlZG9tZXRl cik7CiAgICAgICAgICAgICAgICAgc3luY2VyLnNjaGVkdWxlUmVxdWVzdEluR3JvdXBJZkF2YWls YWJsZShyZXF1ZXN0LCBbcmVxdWVzdF0sIG51bGwpOwogICAgICAgICAgICAgICAgIGFzc2VydC5l cXVhbChyZXF1ZXN0cy5sZW5ndGgsIDApOwpAQCAtMTgxMSw3ICsxODExLDcgQEAgZGVzY3JpYmUo J0J1aWxkYm90U3luY2VyJywgKCkgPT4gewogICAgICAgICBpdCgnc2hvdWxkIHNjaGVkdWxlIGEg YnVpbGQgaWYgYnVpbGRlciBvbmx5IGhhcyBhIHBlbmRpbmcgYnVpbGQgb24gYSBub24tbWFjaGlu ZyBzbGF2ZScsICgpID0+IHsKICAgICAgICAgICAgIGxldCBzeW5jZXIgPSBCdWlsZGJvdFN5bmNl ci5fbG9hZENvbmZpZyhNb2NrUmVtb3RlQVBJLCBzYW1wbGVpT1NDb25maWcoKSwgYnVpbGRlck5h bWVUb0lETWFwKCkpWzFdOwogCi0gICAgICAgICAgICByZXR1cm4gcHVsbEJ1aWxkYm90V2l0aEFz c2VydGlvbihzeW5jZXIsIFtzYW1wbGVQZW5kaW5nQnVpbGREZXByZWNhdGVkKDEsIDEsICdhbm90 aGVyLXNsYXZlJyldLCB7fSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICByZXR1cm4gcHVsbEJ1 aWxkYm90V2l0aEFzc2VydGlvbihzeW5jZXIsIFtzYW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGVw cmVjYXRlZCgxLCAxLCAnYW5vdGhlci1zbGF2ZScpXSwge30pLnRoZW4oKCkgPT4gewogICAgICAg ICAgICAgICAgIGNvbnN0IHJlcXVlc3QgPSBjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3QoTW9ja01v ZGVscy5pcGFkLCBNb2NrTW9kZWxzLnNwZWVkb21ldGVyKTsKICAgICAgICAgICAgICAgICBzeW5j ZXIuc2NoZWR1bGVSZXF1ZXN0SW5Hcm91cElmQXZhaWxhYmxlKHJlcXVlc3QsIFtyZXF1ZXN0XSwg bnVsbCk7CiAgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzLmxlbmd0aCwgMSk7 Cg== 334757 2018-02-28 12:16:42 -0800 2018-02-28 13:55:01 -0800 Patch for landing rename_samplePendingBuild_v2.patch text/plain 6785 aakash_jain SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5MTAwKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE4LTAyLTI4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBSZW5hbWUgc2FtcGxlUGVuZGluZ0J1aWxkIHRvIHNhbXBsZVBlbmRpbmdC dWlsZFJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4MzE3MQorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAg ICAqIHVuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzOgorICAgICAgICAoc2FtcGxl UGVuZGluZ0J1aWxkUmVxdWVzdHMpOiBSZW5hbWVkIGZyb20gc2FtcGxlUGVuZGluZ0J1aWxkLgor ICAgICAgICAoc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERlcHJlY2F0ZWQpOiBSZW5hbWVkIGZy b20gc2FtcGxlUGVuZGluZ0J1aWxkRGVwcmVjYXRlZC4KKyAgICAgICAgKHNhbXBsZVBlbmRpbmdC dWlsZCk6IERlbGV0ZWQuCisgICAgICAgIChzYW1wbGVQZW5kaW5nQnVpbGREZXByZWNhdGVkKTog RGVsZXRlZC4KKwogMjAxOC0wMi0wMiAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5j b20+CiAKICAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHN1Ym1pdHRpbmcgYnVpbGQgcmVxdWVzdCB0 byBCdWlsZGJvdCAwLjkgc2VydmVyIGluIEJ1aWxkYm90U3luY2VyCkluZGV4OiBXZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanMKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3lu Y2VyLXRlc3RzLmpzCShyZXZpc2lvbiAyMjkwNjcpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanMJKHdvcmtpbmcgY29weSkKQEAg LTI5Nyw3ICsyOTcsNyBAQCBmdW5jdGlvbiBjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3RXaXRoT3du CiAgICAgICAgICdjb21taXRTZXQnOiBjb21taXRTZXQsICdzdGF0dXMnOiAncGVuZGluZycsICdw bGF0Zm9ybSc6IHBsYXRmb3JtLCAndGVzdCc6IHRlc3QsICdvcmRlcic6IG9yZGVyfSk7CiB9CiAK LWZ1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZERhdGEoYnVpbGRSZXF1ZXN0SWQsIGJ1aWxkVGlt ZSwgYnVpbGRlcklkKQorZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERhdGEoYnVp bGRSZXF1ZXN0SWQsIGJ1aWxkVGltZSwgYnVpbGRlcklkKQogewogICAgIHJldHVybiB7CiAgICAg ICAgICJidWlsZGVyaWQiOiBidWlsZGVySWQgfHwgMTAyLApAQCAtMzE1LDEwICszMTUsMTAgQEAg ZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkRGF0YShidWlsZFJlcQogICAgIH07CiB9CiAKLWZ1 bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZChidWlsZFJlcXVlc3RJZCwgYnVpbGRUaW1lLCBidWls ZGVyTmFtZSkKK2Z1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3RzKGJ1aWxkUmVxdWVz dElkLCBidWlsZFRpbWUsIGJ1aWxkZXJOYW1lKQogewogICAgIHJldHVybiB7Ci0gICAgICAgICJi dWlsZHJlcXVlc3RzIiA6IFtzYW1wbGVQZW5kaW5nQnVpbGREYXRhKGJ1aWxkUmVxdWVzdElkLCBi dWlsZFRpbWUsIGJ1aWxkZXJOYW1lVG9JRE1hcCgpW2J1aWxkZXJOYW1lXSldCisgICAgICAgICJi dWlsZHJlcXVlc3RzIiA6IFtzYW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGF0YShidWlsZFJlcXVl c3RJZCwgYnVpbGRUaW1lLCBidWlsZGVyTmFtZVRvSURNYXAoKVtidWlsZGVyTmFtZV0pXQogICAg IH07CiB9CiAKQEAgLTM3MCw3ICszNzAsNyBAQCBmdW5jdGlvbiBzYW1wbGVGaW5pc2hlZEJ1aWxk KGJ1aWxkUmVxdWVzCiAgICAgfTsKIH0KIAotZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkRGVw cmVjYXRlZChidWlsZFJlcXVlc3RJZCwgYnVpbGRUaW1lLCBzbGF2ZU5hbWUpCitmdW5jdGlvbiBz YW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGVwcmVjYXRlZChidWlsZFJlcXVlc3RJZCwgYnVpbGRU aW1lLCBzbGF2ZU5hbWUpCiB7CiAgICAgcmV0dXJuIHsKICAgICAgICAgJ2J1aWxkZXJOYW1lJzog J0FCVGVzdC1pUGFkLVJ1bkJlbmNobWFyay1UZXN0cycsCkBAIC0xMjc1LDcgKzEyNzUsNyBAQCBk ZXNjcmliZSgnQnVpbGRib3RTeW5jZXInLCAoKSA9PiB7CiAgICAgZGVzY3JpYmUoJ0J1aWxkYm90 QnVpbGRFbnRyeScsICgpID0+IHsKICAgICAgICAgaXQoJ3Nob3VsZCBjcmVhdGUgQnVpbGRib3RC dWlsZEVudHJ5IGZvciBwZW5kaW5nIGJ1aWxkJywgKCkgPT4gewogICAgICAgICAgICAgbGV0IHN5 bmNlciA9IEJ1aWxkYm90U3luY2VyLl9sb2FkQ29uZmlnKE1vY2tSZW1vdGVBUEksIHNhbXBsZWlP U0NvbmZpZygpLCBidWlsZGVyTmFtZVRvSURNYXAoKSlbMV07Ci0gICAgICAgICAgICBjb25zdCBi dWlsZGJvdERhdGEgPSBzYW1wbGVQZW5kaW5nQnVpbGQoKTsKKyAgICAgICAgICAgIGNvbnN0IGJ1 aWxkYm90RGF0YSA9IHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3RzKCk7CiAgICAgICAgICAgICBj b25zdCBwZW5kaW5nRW50cmllcyA9IGJ1aWxkYm90RGF0YS5idWlsZHJlcXVlc3RzLm1hcCgoZW50 cnkpID0+IG5ldyBCdWlsZGJvdEJ1aWxkRW50cnkoc3luY2VyLCBlbnRyeSkpOwogCiAgICAgICAg ICAgICBhc3NlcnQuZXF1YWwocGVuZGluZ0VudHJpZXMubGVuZ3RoLCAxKTsKQEAgLTE0NTIsNyAr MTQ1Miw3IEBAIGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAgICAgICAgaXQo J3Nob3VsZCBjcmVhdGUgQnVpbGRib3RCdWlsZEVudHJ5IGZvciBwZW5kaW5nIGJ1aWxkcycsICgp ID0+IHsKICAgICAgICAgICAgIGxldCBzeW5jZXIgPSBCdWlsZGJvdFN5bmNlci5fbG9hZENvbmZp ZyhNb2NrUmVtb3RlQVBJLCBzYW1wbGVpT1NDb25maWcoKSwgYnVpbGRlck5hbWVUb0lETWFwKCkp WzFdOwogICAgICAgICAgICAgbGV0IHByb21pc2UgPSBzeW5jZXIucHVsbEJ1aWxkYm90KCk7Ci0g ICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKFtzYW1wbGVQZW5kaW5nQnVpbGREZXByZWNh dGVkKCldKTsKKyAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBlbmRpbmdC dWlsZFJlcXVlc3REZXByZWNhdGVkKCldKTsKICAgICAgICAgICAgIHJldHVybiBwcm9taXNlLnRo ZW4oKGVudHJpZXMpID0+IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwoZW50cmllcy5s ZW5ndGgsIDEpOwogICAgICAgICAgICAgICAgIGxldCBlbnRyeSA9IGVudHJpZXNbMF07CkBAIC0x NTIxLDcgKzE1MjEsNyBAQCBkZXNjcmliZSgnQnVpbGRib3RTeW5jZXInLCAoKSA9PiB7CiAgICAg ICAgICAgICBsZXQgcHJvbWlzZSA9IHN5bmNlci5wdWxsQnVpbGRib3QoNSk7CiAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAxKTsKIAotICAgICAgICAgICAgcmVxdWVz dHNbMF0ucmVzb2x2ZShbc2FtcGxlUGVuZGluZ0J1aWxkRGVwcmVjYXRlZCgxMjMpXSk7CisgICAg ICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKFtzYW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGVw cmVjYXRlZCgxMjMpXSk7CiAKICAgICAgICAgICAgIHJldHVybiBNb2NrUmVtb3RlQVBJLndhaXRG b3JSZXF1ZXN0KCkudGhlbigoKSA9PiB7CiAgICAgICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJl cXVlc3RzLmxlbmd0aCwgMik7CkBAIC0xNTY4LDcgKzE1NjgsNyBAQCBkZXNjcmliZSgnQnVpbGRi b3RTeW5jZXInLCAoKSA9PiB7CiAgICAgICAgICAgICBsZXQgcHJvbWlzZSA9IHN5bmNlci5wdWxs QnVpbGRib3QoNSk7CiAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAx KTsKIAotICAgICAgICAgICAgcmVxdWVzdHNbMF0ucmVzb2x2ZShbc2FtcGxlUGVuZGluZ0J1aWxk RGVwcmVjYXRlZCg0NTYsIDIpLCBzYW1wbGVQZW5kaW5nQnVpbGREZXByZWNhdGVkKDEyMywgMSld KTsKKyAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBlbmRpbmdCdWlsZFJl cXVlc3REZXByZWNhdGVkKDQ1NiwgMiksIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REZXByZWNh dGVkKDEyMywgMSldKTsKIAogICAgICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZv clJlcXVlc3QoKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVx dWVzdHMubGVuZ3RoLCAyKTsKQEAgLTE2MjUsNyArMTYyNSw3IEBAIGRlc2NyaWJlKCdCdWlsZGJv dFN5bmNlcicsICgpID0+IHsKICAgICAgICAgICAgIGxldCBwcm9taXNlID0gc3luY2VyLnB1bGxC dWlsZGJvdCg1KTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDEp OwogCi0gICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKFtzYW1wbGVQZW5kaW5nQnVpbGRE ZXByZWNhdGVkKCldKTsKKyAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoW3NhbXBsZVBl bmRpbmdCdWlsZFJlcXVlc3REZXByZWNhdGVkKCldKTsKIAogICAgICAgICAgICAgcmV0dXJuIE1v Y2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgICAg ICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAyKTsKQEAgLTE2NTIsNyArMTY1Miw3IEBA IGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAgICAgICAgICAgIGxldCBwcm9t aXNlID0gc3luY2VyLnB1bGxCdWlsZGJvdCg1KTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChy ZXF1ZXN0cy5sZW5ndGgsIDEpOwogCi0gICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZlKFtz YW1wbGVQZW5kaW5nQnVpbGREZXByZWNhdGVkKCldKTsKKyAgICAgICAgICAgIHJlcXVlc3RzWzBd LnJlc29sdmUoW3NhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REZXByZWNhdGVkKCldKTsKIAogICAg ICAgICAgICAgcmV0dXJuIE1vY2tSZW1vdGVBUEkud2FpdEZvclJlcXVlc3QoKS50aGVuKCgpID0+ IHsKICAgICAgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAyKTsKQEAg LTE4MDEsNyArMTgwMSw3IEBAIGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAg ICAgICAgaXQoJ3Nob3VsZCBub3Qgc2NoZWR1bGUgYSBidWlsZCBpZiBidWlsZGVyIGhhcyBhIHBl bmRpbmcgYnVpbGQgb24gdGhlIG1hY2hpbmcgc2xhdmUnLCAoKSA9PiB7CiAgICAgICAgICAgICBs ZXQgc3luY2VyID0gQnVpbGRib3RTeW5jZXIuX2xvYWRDb25maWcoTW9ja1JlbW90ZUFQSSwgc2Ft cGxlaU9TQ29uZmlnKCksIGJ1aWxkZXJOYW1lVG9JRE1hcCgpKVsxXTsKIAotICAgICAgICAgICAg cHVsbEJ1aWxkYm90V2l0aEFzc2VydGlvbihzeW5jZXIsIFtzYW1wbGVQZW5kaW5nQnVpbGREZXBy ZWNhdGVkKCldLCB7fSkudGhlbigoKSA9PiB7CisgICAgICAgICAgICBwdWxsQnVpbGRib3RXaXRo QXNzZXJ0aW9uKHN5bmNlciwgW3NhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REZXByZWNhdGVkKCld LCB7fSkudGhlbigoKSA9PiB7CiAgICAgICAgICAgICAgICAgY29uc3QgcmVxdWVzdCA9IGNyZWF0 ZVNhbXBsZUJ1aWxkUmVxdWVzdChNb2NrTW9kZWxzLmlwYWQsIE1vY2tNb2RlbHMuc3BlZWRvbWV0 ZXIpOwogICAgICAgICAgICAgICAgIHN5bmNlci5zY2hlZHVsZVJlcXVlc3RJbkdyb3VwSWZBdmFp bGFibGUocmVxdWVzdCwgW3JlcXVlc3RdLCBudWxsKTsKICAgICAgICAgICAgICAgICBhc3NlcnQu ZXF1YWwocmVxdWVzdHMubGVuZ3RoLCAwKTsKQEAgLTE4MTEsNyArMTgxMSw3IEBAIGRlc2NyaWJl KCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAgICAgICAgaXQoJ3Nob3VsZCBzY2hlZHVsZSBh IGJ1aWxkIGlmIGJ1aWxkZXIgb25seSBoYXMgYSBwZW5kaW5nIGJ1aWxkIG9uIGEgbm9uLW1hY2hp bmcgc2xhdmUnLCAoKSA9PiB7CiAgICAgICAgICAgICBsZXQgc3luY2VyID0gQnVpbGRib3RTeW5j ZXIuX2xvYWRDb25maWcoTW9ja1JlbW90ZUFQSSwgc2FtcGxlaU9TQ29uZmlnKCksIGJ1aWxkZXJO YW1lVG9JRE1hcCgpKVsxXTsKIAotICAgICAgICAgICAgcmV0dXJuIHB1bGxCdWlsZGJvdFdpdGhB c3NlcnRpb24oc3luY2VyLCBbc2FtcGxlUGVuZGluZ0J1aWxkRGVwcmVjYXRlZCgxLCAxLCAnYW5v dGhlci1zbGF2ZScpXSwge30pLnRoZW4oKCkgPT4geworICAgICAgICAgICAgcmV0dXJuIHB1bGxC dWlsZGJvdFdpdGhBc3NlcnRpb24oc3luY2VyLCBbc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERl cHJlY2F0ZWQoMSwgMSwgJ2Fub3RoZXItc2xhdmUnKV0sIHt9KS50aGVuKCgpID0+IHsKICAgICAg ICAgICAgICAgICBjb25zdCByZXF1ZXN0ID0gY3JlYXRlU2FtcGxlQnVpbGRSZXF1ZXN0KE1vY2tN b2RlbHMuaXBhZCwgTW9ja01vZGVscy5zcGVlZG9tZXRlcik7CiAgICAgICAgICAgICAgICAgc3lu Y2VyLnNjaGVkdWxlUmVxdWVzdEluR3JvdXBJZkF2YWlsYWJsZShyZXF1ZXN0LCBbcmVxdWVzdF0s IG51bGwpOwogICAgICAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgsIDEp Owo=