196243 2019-03-25 23:07:33 -0700 Primary cluster of measurement set should always contain latest point. 2019-03-26 12:19:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu rniwa oldest_to_newest 1521223 0 dewei_zhu 2019-03-25 23:07:33 -0700 Primary cluster of measurement set should always contain latest point. 1521225 1 365948 dewei_zhu 2019-03-25 23:09:49 -0700 Created attachment 365948 Patch 1521367 2 365948 rniwa 2019-03-26 11:33:27 -0700 Comment on attachment 365948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365948&action=review > Websites/perf.webkit.org/server-tests/api-measurement-set-tests.js:468 > + const currentRows = response['configurations']['current']; Can we also check that these times are earlier than the cluster start time, etc...? 1521370 3 rniwa 2019-03-26 11:35:09 -0700 That is to make sure that the last data point was actually not within the time range of the primary cluster. This is to prevent the test case from being broken in the future when someone refractors it modifies the test for something else. 1521392 4 dewei_zhu 2019-03-26 12:19:42 -0700 Tracked in <rdar://problem/49285265>. Landed in r243510. 365948 2019-03-25 23:09:49 -0700 2019-03-26 11:33:27 -0700 Patch bug-196243-20190325230948.patch text/plain 10686 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDg2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0MDFjZDc4ZDhjM2E0ZDc5YTZjYzAzYjJlZjg1YWVkYjc4NzVlZDUyLi4yM2I3ZWRjMGI0 Y2QwNDNjNzEwYjYxZjRhN2RlZTRlZjc4MzlmZTFlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxOS0wMy0yNSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBQcmltYXJ5IGNsdXN0ZXIgb2YgbWVhc3VyZW1lbnQgc2V0 IHNob3VsZCBhbHdheXMgY29udGFpbiBsYXRlc3QgcG9pbnQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTYyNDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYSBidWcgaW4gbWVhc3VyZW1lbnQtc2V0 IGFwaSB0aGF0IHByaW1hcnkgY2x1c3RlciBtYXkgbm90IGNvbnRhaW4gbGF0ZXN0IGRhdGEgcG9p bnQgYXMKKyAgICAgICAgJ2NhcnJ5X292ZXInIHJvdyBtYXkgbm90IGJlIHVwZGF0ZWQuCisKKyAg ICAgICAgKiBwdWJsaWMvYXBpL21lYXN1cmVtZW50LXNldC5waHA6IFNob3VsZCBhbHdheXMga2Vl cCAnY2Fycnlfb3ZlcicgZGF0YSBwb2ludHMgdXAgdG8gZGF0ZS4KKyAgICAgICAgKiBzZXJ2ZXIt dGVzdHMvYXBpLW1lYXN1cmVtZW50LXNldC10ZXN0cy5qczogQWRkZWQgYW4gdW5pdCB0ZXN0IGZv ciB0aGlzIGNoYW5nZS4KKyAgICAgICAgRml4ZWQgYSB0eXBvLgorCiAyMDE5LTAzLTIxICBEZXdl aSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgogCiAgICAgICAgICdjdXN0b20tY29uZmlndXJh dGlvbi10ZXN0LWdyb3VwLWZvcm0nIHNob3VsZCB1cGRhdGUgdGVzdCBuYW1lIHdoZW4gc2VsZWN0 ZWQgdGVzdCBvciBwbGF0Zm9ybSBjaGFuZ2VzLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3B1YmxpYy9hcGkvbWVhc3VyZW1lbnQtc2V0LnBocCBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvYXBpL21lYXN1cmVtZW50LXNldC5waHAKaW5kZXggZGQ5NTRmNWMw N2U2YzY5ZGE4YmFkNGM3MDg1YjBiNTc5YmYwMjlmZi4uOGU5NTY3ZTIwODk0NmFlMWMzYzIwNDc2 ZGVkZjc4NDMyNGQ1YTliYiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy9hcGkvbWVhc3VyZW1lbnQtc2V0LnBocAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL2FwaS9tZWFzdXJlbWVudC1zZXQucGhwCkBAIC0xNTMsOSArMTUzLDcgQEAgY2xh c3MgTWVhc3VyZW1lbnRTZXRGZXRjaGVyIHsKICAgICAgICAgICAgICRyZWFjaGVkX2VuZCA9ICEk cm93OwogICAgICAgICAgICAgaWYgKCRyZWFjaGVkX2VuZCkKICAgICAgICAgICAgICAgICAkdGhp cy0+cXVlcmllc1skbmFtZV0gPSBOVUxMOwotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAg ICAgICAgJHRoaXMtPm5leHRfY2x1c3Rlcl9yZXN1bHRzWyRuYW1lXSA9IGFycmF5X3NsaWNlKCRy ZXN1bHRzX2J5X2NvbmZpZ1skbmFtZV0sIC0yKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICR0aGlzLT5uZXh0X2NsdXN0ZXJfcmVzdWx0c1skbmFtZV0gPSBhcnJheV9zbGljZSgkcmVzdWx0 c19ieV9jb25maWdbJG5hbWVdLCAtMik7CiAgICAgICAgIH0KIAogICAgICAgICByZXR1cm4gYXJy YXkoCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2Fw aS1tZWFzdXJlbWVudC1zZXQtdGVzdHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2Vy dmVyLXRlc3RzL2FwaS1tZWFzdXJlbWVudC1zZXQtdGVzdHMuanMKaW5kZXggNmM1OTRjMTBmZGRi ZTJkYzBkM2RkZWIzNmQ4MzdkNTUzOWExMTI4Yi4uMjhkOTU5MzBkZDI2ZmM4ZDZhMTE1ZWFlNDJm NzY3ZGU1ZTBhZmQyYiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZl ci10ZXN0cy9hcGktbWVhc3VyZW1lbnQtc2V0LXRlc3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLW1lYXN1cmVtZW50LXNldC10ZXN0cy5qcwpAQCAt MTA3LDcgKzEwNyw3IEBAIGRlc2NyaWJlKCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9u ICgpIHsKICAgICAgICAgICAgIH0sCiAgICAgICAgIH19XTsKIAotICAgIGNvbnN0IHJlcG9ydFdp dGhBbmNlbnRSZXZpc2lvbiA9IFt7CisgICAgY29uc3QgcmVwb3J0V2l0aEFuY2llbnRSZXZpc2lv biA9IFt7CiAgICAgICAgICJidWlsZE51bWJlciI6ICIxMjYiLAogICAgICAgICAiYnVpbGRUaW1l IjogIjIwMTMtMDItMjhUMjM6MDc6MjVaIiwKICAgICAgICAgInJldmlzaW9ucyI6IHsKQEAgLTEy OSw2ICsxMjksMTE2IEBAIGRlc2NyaWJlKCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9u ICgpIHsKICAgICAgICAgICAgIH0sCiAgICAgICAgIH19XTsKIAorICAgIGNvbnN0IHNlY29uZFJl cG9ydFdpdGhSZXZpc2lvbiA9IFt7CisgICAgICAgICJidWlsZE51bWJlciI6ICIxMjciLAorICAg ICAgICAiYnVpbGRUaW1lIjogIjIwMTMtMDItMjhUMjM6MDc6MjVaIiwKKyAgICAgICAgInJldmlz aW9ucyI6IHsKKyAgICAgICAgICAgICJXZWJLaXQiOiB7CisgICAgICAgICAgICAgICAgInJldmlz aW9uIjogIjEzNzc5NCIsCisgICAgICAgICAgICAgICAgInRpbWVzdGFtcCI6IGNsdXN0ZXJUaW1l KDExLjEpLnRvSVNPU3RyaW5nKCkKKyAgICAgICAgICAgIH0sCisgICAgICAgIH0sCisgICAgICAg ICJidWlsZGVyTmFtZSI6ICJzb21lQnVpbGRlciIsCisgICAgICAgICJidWlsZGVyUGFzc3dvcmQi OiAic29tZVBhc3N3b3JkIiwKKyAgICAgICAgInBsYXRmb3JtIjogIk1vdW50YWluIExpb24iLAor ICAgICAgICAidGVzdHMiOiB7CisgICAgICAgICAgICAiU3VpdGUiOiB7CisgICAgICAgICAgICAg ICAgInRlc3RzIjogeworICAgICAgICAgICAgICAgICAgICAidGVzdDEiOiB7CisgICAgICAgICAg ICAgICAgICAgICAgICAibWV0cmljcyI6IHsiVGltZSI6IHsgImN1cnJlbnQiOiBbMjEsIDIyLCAy MywgMjQsIDI1XSB9fQorICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfSwKKyAgICAgICAgfX1dOworCisgICAgY29uc3QgdGhpcmRSZXBvcnRXaXRo UmV2aXNpb24gPSBbeworICAgICAgICAiYnVpbGROdW1iZXIiOiAiMTI4IiwKKyAgICAgICAgImJ1 aWxkVGltZSI6ICIyMDEzLTAyLTI4VDIzOjA3OjI1WiIsCisgICAgICAgICJyZXZpc2lvbnMiOiB7 CisgICAgICAgICAgICAiV2ViS2l0IjogeworICAgICAgICAgICAgICAgICJyZXZpc2lvbiI6ICIx Mzc3OTUiLAorICAgICAgICAgICAgICAgICJ0aW1lc3RhbXAiOiBjbHVzdGVyVGltZSgxMS4yKS50 b0lTT1N0cmluZygpCisgICAgICAgICAgICB9LAorICAgICAgICB9LAorICAgICAgICAiYnVpbGRl ck5hbWUiOiAic29tZUJ1aWxkZXIiLAorICAgICAgICAiYnVpbGRlclBhc3N3b3JkIjogInNvbWVQ YXNzd29yZCIsCisgICAgICAgICJwbGF0Zm9ybSI6ICJNb3VudGFpbiBMaW9uIiwKKyAgICAgICAg InRlc3RzIjogeworICAgICAgICAgICAgIlN1aXRlIjogeworICAgICAgICAgICAgICAgICJ0ZXN0 cyI6IHsKKyAgICAgICAgICAgICAgICAgICAgInRlc3QxIjogeworICAgICAgICAgICAgICAgICAg ICAgICAgIm1ldHJpY3MiOiB7IlRpbWUiOiB7ICJjdXJyZW50IjogWzIxLCAyMiwgMjMsIDI0LCAy NV0gfX0KKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIH0sCisgICAgICAgIH19XTsKKworICAgIGNvbnN0IHJlcG9ydEJhc2VsaW5lV2l0aFJldmlz aW9uID0gW3sKKyAgICAgICAgImJ1aWxkTnVtYmVyIjogIjEyOSIsCisgICAgICAgICJidWlsZFRp bWUiOiAiMjAxMy0wMi0yOFQxNTozNTo1MVoiLAorICAgICAgICAicmV2aXNpb25zIjogeworICAg ICAgICAgICAgIldlYktpdCI6IHsKKyAgICAgICAgICAgICAgICAicmV2aXNpb24iOiAiMTQ0MDAx IiwKKyAgICAgICAgICAgICAgICAidGltZXN0YW1wIjogY2x1c3RlclRpbWUoMTMuMzU2NDUzNjQ1 MzcpLnRvSVNPU3RyaW5nKCksCisgICAgICAgICAgICB9LAorICAgICAgICB9LAorICAgICAgICAi YnVpbGRlck5hbWUiOiAic29tZUJ1aWxkZXIiLAorICAgICAgICAiYnVpbGRlclBhc3N3b3JkIjog InNvbWVQYXNzd29yZCIsCisgICAgICAgICJwbGF0Zm9ybSI6ICJNb3VudGFpbiBMaW9uIiwKKyAg ICAgICAgInRlc3RzIjogeworICAgICAgICAgICAgIlN1aXRlIjogeworICAgICAgICAgICAgICAg ICJ0ZXN0cyI6IHsKKyAgICAgICAgICAgICAgICAgICAgInRlc3QxIjogeworICAgICAgICAgICAg ICAgICAgICAgICAgIm1ldHJpY3MiOiB7IlRpbWUiOiB7ICJiYXNlbGluZSI6IFsxMSwgMTIsIDEz LCAxNCwgMTVdIH19CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICB9LAorICAgICAgICB9fV07CisKKyAgICBjb25zdCBzZWNvbmRSZXBvcnRCYXNl bGluZVdpdGhSZXZpc2lvbiA9IFt7CisgICAgICAgICJidWlsZE51bWJlciI6ICIxMzAiLAorICAg ICAgICAiYnVpbGRUaW1lIjogIjIwMTMtMDItMjhUMjM6MDE6MjVaIiwKKyAgICAgICAgInJldmlz aW9ucyI6IHsKKyAgICAgICAgICAgICJXZWJLaXQiOiB7CisgICAgICAgICAgICAgICAgInJldmlz aW9uIjogIjEzNzc4NCIsCisgICAgICAgICAgICAgICAgInRpbWVzdGFtcCI6IGNsdXN0ZXJUaW1l KDExLjEyKS50b0lTT1N0cmluZygpCisgICAgICAgICAgICB9LAorICAgICAgICB9LAorICAgICAg ICAiYnVpbGRlck5hbWUiOiAic29tZUJ1aWxkZXIiLAorICAgICAgICAiYnVpbGRlclBhc3N3b3Jk IjogInNvbWVQYXNzd29yZCIsCisgICAgICAgICJwbGF0Zm9ybSI6ICJNb3VudGFpbiBMaW9uIiwK KyAgICAgICAgInRlc3RzIjogeworICAgICAgICAgICAgIlN1aXRlIjogeworICAgICAgICAgICAg ICAgICJ0ZXN0cyI6IHsKKyAgICAgICAgICAgICAgICAgICAgInRlc3QxIjogeworICAgICAgICAg ICAgICAgICAgICAgICAgIm1ldHJpY3MiOiB7IlRpbWUiOiB7ICJiYXNlbGluZSI6IFsyMSwgMjIs IDIzLCAyNCwgMjVdIH19CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICB9LAorICAgICAgICB9fV07CisKKyAgICBjb25zdCB0aGlyZFJlcG9ydEJh c2VsaW5lV2l0aFJldmlzaW9uID0gW3sKKyAgICAgICAgImJ1aWxkTnVtYmVyIjogIjEzMSIsCisg ICAgICAgICJidWlsZFRpbWUiOiAiMjAxMy0wMi0yOFQyMzowMToyNVoiLAorICAgICAgICAicmV2 aXNpb25zIjogeworICAgICAgICAgICAgIldlYktpdCI6IHsKKyAgICAgICAgICAgICAgICAicmV2 aXNpb24iOiAiMTM3ODg0IiwKKyAgICAgICAgICAgICAgICAidGltZXN0YW1wIjogY2x1c3RlclRp bWUoMTEuMjIpLnRvSVNPU3RyaW5nKCkKKyAgICAgICAgICAgIH0sCisgICAgICAgIH0sCisgICAg ICAgICJidWlsZGVyTmFtZSI6ICJzb21lQnVpbGRlciIsCisgICAgICAgICJidWlsZGVyUGFzc3dv cmQiOiAic29tZVBhc3N3b3JkIiwKKyAgICAgICAgInBsYXRmb3JtIjogIk1vdW50YWluIExpb24i LAorICAgICAgICAidGVzdHMiOiB7CisgICAgICAgICAgICAiU3VpdGUiOiB7CisgICAgICAgICAg ICAgICAgInRlc3RzIjogeworICAgICAgICAgICAgICAgICAgICAidGVzdDEiOiB7CisgICAgICAg ICAgICAgICAgICAgICAgICAibWV0cmljcyI6IHsiVGltZSI6IHsgImJhc2VsaW5lIjogWzIxLCAy MiwgMjMsIDI0LCAyNV0gfX0KKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgIH0sCisgICAgICAgIH19XTsKKwogICAgIGl0KCJzaG91bGQgcmVqZWN0 IHdoZW4gcGxhdGZvcm0gSUQgaXMgbWlzc2luZyIsICgpID0+IHsKICAgICAgICAgcmV0dXJuIGFk ZEJ1aWxkZXJGb3JSZXBvcnQocmVwb3J0V2l0aEJ1aWxkVGltZVswXSkudGhlbigoKSA9PiB7CiAg ICAgICAgICAgICByZXR1cm4gVGVzdFNlcnZlci5yZW1vdGVBUEkoKS5wb3N0SlNPTignL2FwaS9y ZXBvcnQvJywgcmVwb3J0V2l0aEJ1aWxkVGltZSk7CkBAIC0zNDIsNiArNDUyLDMwIEBAIGRlc2Ny aWJlKCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgfSk7CiAg ICAgfSk7CiAKKyAgICBpdCgic2hvdWxkIGtlZXAgJ2NhcnJ5X292ZXInIHBvaW50cyB1cCB0byBk YXRlIiwgYXN5bmMgKCkgPT4geworICAgICAgICBjb25zdCByZW1vdGUgPSBUZXN0U2VydmVyLnJl bW90ZUFQSSgpOworICAgICAgICBhd2FpdCBhZGRCdWlsZGVyRm9yUmVwb3J0KHJlcG9ydFdpdGhS ZXZpc2lvblswXSk7CisgICAgICAgIGF3YWl0IHJlbW90ZS5wb3N0SlNPTignL2FwaS9yZXBvcnQv JywgcmVwb3J0V2l0aFJldmlzaW9uKTsKKyAgICAgICAgYXdhaXQgcmVtb3RlLnBvc3RKU09OKCcv YXBpL3JlcG9ydC8nLCBzZWNvbmRSZXBvcnRXaXRoUmV2aXNpb24pOworICAgICAgICBhd2FpdCBy ZW1vdGUucG9zdEpTT04oJy9hcGkvcmVwb3J0LycsIHRoaXJkUmVwb3J0V2l0aFJldmlzaW9uKTsK KyAgICAgICAgYXdhaXQgcmVtb3RlLnBvc3RKU09OKCcvYXBpL3JlcG9ydC8nLCByZXBvcnRCYXNl bGluZVdpdGhSZXZpc2lvbik7CisgICAgICAgIGF3YWl0IHJlbW90ZS5wb3N0SlNPTignL2FwaS9y ZXBvcnQvJywgc2Vjb25kUmVwb3J0QmFzZWxpbmVXaXRoUmV2aXNpb24pOworICAgICAgICBhd2Fp dCByZW1vdGUucG9zdEpTT04oJy9hcGkvcmVwb3J0LycsIHRoaXJkUmVwb3J0QmFzZWxpbmVXaXRo UmV2aXNpb24pOworICAgICAgICBjb25zdCByZXN1bHQgPSBhd2FpdCBxdWVyeVBsYXRmb3JtQW5k TWV0cmljV2l0aFJlcG9zaXRvcnkoJ01vdW50YWluIExpb24nLCAnVGltZScsICdXZWJLaXQnKTsK KworICAgICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IHJlbW90ZS5nZXRKU09OV2l0aFN0YXR1 cyhgL2FwaS9tZWFzdXJlbWVudC1zZXQvP3BsYXRmb3JtPSR7cmVzdWx0LnBsYXRmb3JtSWR9Jm1l dHJpYz0ke3Jlc3VsdC5tZXRyaWNJZH1gKTsKKworICAgICAgICBjb25zdCBjdXJyZW50Um93cyA9 IHJlc3BvbnNlWydjb25maWd1cmF0aW9ucyddWydjdXJyZW50J107CisgICAgICAgIGFzc2VydC5l cXVhbChjdXJyZW50Um93cy5sZW5ndGgsIDIpOworICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKGZv cm1hdChyZXNwb25zZVsnZm9ybWF0TWFwJ10sIGN1cnJlbnRSb3dzWzBdKS5idWlsZE51bWJlciwg MTI3KTsKKyAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChmb3JtYXQocmVzcG9uc2VbJ2Zvcm1hdE1h cCddLCBjdXJyZW50Um93c1sxXSkuYnVpbGROdW1iZXIsIDEyOCk7CisKKyAgICAgICAgY29uc3Qg YmFzZWxpbmVSb3dzID0gcmVzcG9uc2VbJ2NvbmZpZ3VyYXRpb25zJ11bJ2Jhc2VsaW5lJ107Cisg ICAgICAgIGFzc2VydC5lcXVhbChiYXNlbGluZVJvd3MubGVuZ3RoLCAyKTsKKyAgICAgICAgYXNz ZXJ0LmRlZXBFcXVhbChmb3JtYXQocmVzcG9uc2VbJ2Zvcm1hdE1hcCddLCBiYXNlbGluZVJvd3Nb MF0pLmJ1aWxkTnVtYmVyLCAxMzEpOworICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKGZvcm1hdChy ZXNwb25zZVsnZm9ybWF0TWFwJ10sIGJhc2VsaW5lUm93c1sxXSkuYnVpbGROdW1iZXIsIDEyOSk7 CisgICAgfSk7CisKICAgICBpdCgic2hvdWxkIG9yZGVyIHJlc3VsdHMgYnkgYnVpbGQgdGltZSB3 aGVuIGNvbW1pdCB0aW1lcyBhcmUgbWlzc2luZyIsICgpID0+IHsKICAgICAgICAgY29uc3QgcmVt b3RlID0gVGVzdFNlcnZlci5yZW1vdGVBUEkoKTsKICAgICAgICAgbGV0IHJlcG9zaXRvcnlJZDsK QEAgLTQxOCw3ICs1NTIsNyBAQCBkZXNjcmliZSgiL2FwaS9tZWFzdXJlbWVudC1zZXQiLCBmdW5j dGlvbiAoKSB7CiAgICAgaXQoInNob3VsZCBpbmNsdWRlIG9uZSBkYXRhIHBvaW50IGFmdGVyIHRo ZSBjdXJyZW50IHRpbWUgcmFuZ2UiLCAoKSA9PiB7CiAgICAgICAgIGNvbnN0IHJlbW90ZSA9IFRl c3RTZXJ2ZXIucmVtb3RlQVBJKCk7CiAgICAgICAgIHJldHVybiBhZGRCdWlsZGVyRm9yUmVwb3J0 KHJlcG9ydFdpdGhCdWlsZFRpbWVbMF0pLnRoZW4oKCkgPT4gewotICAgICAgICAgICAgcmV0dXJu IHJlbW90ZS5wb3N0SlNPTignL2FwaS9yZXBvcnQvJywgcmVwb3J0V2l0aEFuY2VudFJldmlzaW9u KTsKKyAgICAgICAgICAgIHJldHVybiByZW1vdGUucG9zdEpTT04oJy9hcGkvcmVwb3J0LycsIHJl cG9ydFdpdGhBbmNpZW50UmV2aXNpb24pOwogICAgICAgICB9KS50aGVuKCgpID0+IHsKICAgICAg ICAgICAgIHJldHVybiByZW1vdGUucG9zdEpTT04oJy9hcGkvcmVwb3J0LycsIHJlcG9ydFdpdGhO ZXdSZXZpc2lvbik7CiAgICAgICAgIH0pLnRoZW4oKCkgPT4gewpAQCAtNDI5LDcgKzU2Myw3IEBA IGRlc2NyaWJlKCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAg ICAgIGFzc2VydC5lcXVhbChyZXNwb25zZVsnc3RhdHVzJ10sICdPSycpOwogICAgICAgICAgICAg YXNzZXJ0LmVxdWFsKHJlc3BvbnNlWydjbHVzdGVyQ291bnQnXSwgMiwgJ3Nob3VsZCBoYXZlIHR3 byBjbHVzdGVycycpOwogICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChidWlsZE51bWJlcnMo cmVzcG9uc2UsICdjdXJyZW50JyksCi0gICAgICAgICAgICAgICAgW3JlcG9ydFdpdGhBbmNlbnRS ZXZpc2lvblswXVsnYnVpbGROdW1iZXInXSwgcmVwb3J0V2l0aE5ld1JldmlzaW9uWzBdWydidWls ZE51bWJlciddXSk7CisgICAgICAgICAgICAgICAgW3JlcG9ydFdpdGhBbmNpZW50UmV2aXNpb25b MF1bJ2J1aWxkTnVtYmVyJ10sIHJlcG9ydFdpdGhOZXdSZXZpc2lvblswXVsnYnVpbGROdW1iZXIn XV0pOwogICAgICAgICB9KTsKICAgICB9KTsKIApAQCAtNDM4LDcgKzU3Miw3IEBAIGRlc2NyaWJl KCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgcmV0dXJuIGFk ZEJ1aWxkZXJGb3JSZXBvcnQocmVwb3J0V2l0aEJ1aWxkVGltZVswXSkudGhlbigoKSA9PiB7CiAg ICAgICAgICAgICByZXR1cm4gcmVtb3RlLnBvc3RKU09OKCcvYXBpL3JlcG9ydC8nLCByZXBvcnRX aXRoQnVpbGRUaW1lKTsKICAgICAgICAgfSkudGhlbigoKSA9PiB7Ci0gICAgICAgICAgICByZXR1 cm4gcmVtb3RlLnBvc3RKU09OKCcvYXBpL3JlcG9ydC8nLCByZXBvcnRXaXRoQW5jZW50UmV2aXNp b24pOworICAgICAgICAgICAgcmV0dXJuIHJlbW90ZS5wb3N0SlNPTignL2FwaS9yZXBvcnQvJywg cmVwb3J0V2l0aEFuY2llbnRSZXZpc2lvbik7CiAgICAgICAgIH0pLnRoZW4oKCkgPT4gewogICAg ICAgICAgICAgcmV0dXJuIHF1ZXJ5UGxhdGZvcm1BbmRNZXRyaWMoJ01vdW50YWluIExpb24nLCAn VGltZScpOwogICAgICAgICB9KS50aGVuKChyZXN1bHQpID0+IHsKQEAgLTQ0Nyw3ICs1ODEsNyBA QCBkZXNjcmliZSgiL2FwaS9tZWFzdXJlbWVudC1zZXQiLCBmdW5jdGlvbiAoKSB7CiAgICAgICAg ICAgICBhc3NlcnQuZXF1YWwocmVzcG9uc2VbJ2NsdXN0ZXJDb3VudCddLCAyLCAnc2hvdWxkIGhh dmUgdHdvIGNsdXN0ZXJzJyk7CiAgICAgICAgICAgICBsZXQgY3VycmVudFJvd3MgPSByZXNwb25z ZVsnY29uZmlndXJhdGlvbnMnXVsnY3VycmVudCddOwogICAgICAgICAgICAgYXNzZXJ0LmVxdWFs KGN1cnJlbnRSb3dzLmxlbmd0aCwgMiwgJ3Nob3VsZCBjb250YWluIHR3byBkYXRhIHBvaW50cycp OwotICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChidWlsZE51bWJlcnMocmVzcG9uc2UsICdj dXJyZW50JyksIFtyZXBvcnRXaXRoQW5jZW50UmV2aXNpb25bMF1bJ2J1aWxkTnVtYmVyJ10sIHJl cG9ydFdpdGhCdWlsZFRpbWVbMF1bJ2J1aWxkTnVtYmVyJ11dKTsKKyAgICAgICAgICAgIGFzc2Vy dC5kZWVwRXF1YWwoYnVpbGROdW1iZXJzKHJlc3BvbnNlLCAnY3VycmVudCcpLCBbcmVwb3J0V2l0 aEFuY2llbnRSZXZpc2lvblswXVsnYnVpbGROdW1iZXInXSwgcmVwb3J0V2l0aEJ1aWxkVGltZVsw XVsnYnVpbGROdW1iZXInXV0pOwogICAgICAgICB9KTsKICAgICB9KTsKIApAQCAtNDU1LDcgKzU4 OSw3IEBAIGRlc2NyaWJlKCIvYXBpL21lYXN1cmVtZW50LXNldCIsIGZ1bmN0aW9uICgpIHsKICAg ICAgICAgY29uc3QgcmVtb3RlID0gVGVzdFNlcnZlci5yZW1vdGVBUEkoKTsKICAgICAgICAgbGV0 IGNhY2hlUHJlZml4OwogICAgICAgICByZXR1cm4gYWRkQnVpbGRlckZvclJlcG9ydChyZXBvcnRX aXRoQnVpbGRUaW1lWzBdKS50aGVuKCgpID0+IHsKLSAgICAgICAgICAgIHJldHVybiByZW1vdGUu cG9zdEpTT04oJy9hcGkvcmVwb3J0LycsIHJlcG9ydFdpdGhBbmNlbnRSZXZpc2lvbik7CisgICAg ICAgICAgICByZXR1cm4gcmVtb3RlLnBvc3RKU09OKCcvYXBpL3JlcG9ydC8nLCByZXBvcnRXaXRo QW5jaWVudFJldmlzaW9uKTsKICAgICAgICAgfSkudGhlbigoKSA9PiB7CiAgICAgICAgICAgICBy ZXR1cm4gcmVtb3RlLnBvc3RKU09OKCcvYXBpL3JlcG9ydC8nLCByZXBvcnRXaXRoUmV2aXNpb24p OwogICAgICAgICB9KS50aGVuKCgpID0+IHsK