179208 2017-11-02 15:52:38 -0700 Layout Test js/intl-datetimeformat.html is failing on High Sierra (GMT vs. UTC) 2017-11-20 17:26:03 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jlewis3 andy andy ap commit-queue darin lforschler pvollan ryanhaddad webkit-bug-importer oldest_to_newest 1367601 0 jlewis3 2017-11-02 15:52:38 -0700 js/intl-datetimeformat.html is failing on High Sierra according to the dashboard: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=js%2Fintl-datetimeformat.html While the test started failing on this build: https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK2%20(Tests)/builds/888 it is most likely the cause. I have been able to reproduce the issue with revisions much farther back than the revisions associated with it. Diff: --- /Volumes/Data/slave/highsierra-release-tests-wk2/build/layout-test-results/js/intl-datetimeformat-expected.txt +++ /Volumes/Data/slave/highsierra-release-tests-wk2/build/layout-test-results/js/intl-datetimeformat-actual.txt @@ -375,9 +375,9 @@ PASS Intl.DateTimeFormat('en', { timeZoneName:'name' }) threw exception RangeError: timeZoneName must be "short" or "long". PASS Intl.DateTimeFormat('en').resolvedOptions().timeZoneName is undefined PASS Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short' }).resolvedOptions().timeZoneName is 'short' -PASS Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'UTC' }).format(0) is '12:00 AM GMT' +FAIL Intl.DateTimeFormat('en', { minute:'2-digit', hour:'numeric', timeZoneName:'short', timeZone: 'UTC' }).format(0) should be 12:00 AM GMT. Was 12:00 AM UTC. PASS Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long' }).resolvedOptions().timeZoneName is 'long' -PASS ['00:00 GMT','00:00 Horário do Meridiano de Greenwich'].includes(Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'UTC' }).format(0)) is true +FAIL ['00:00 GMT','00:00 Horário do Meridiano de Greenwich'].includes(Intl.DateTimeFormat('pt-BR', { minute:'2-digit', hour:'numeric', timeZoneName:'long', timeZone: 'UTC' }).format(0)) should be true. Was false. PASS var options = { weekday: "short", year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric" }; var resolved = Intl.DateTimeFormat("ar", options).resolvedOptions(); @@ -2178,22 +2178,13 @@ PASS new Intl.DateTimeFormat().formatToParts(Infinity) threw exception RangeError: date value is not finite in DateTimeFormat formatToParts(). PASS new Intl.DateTimeFormat().formatToParts(-Infinity) threw exception RangeError: date value is not finite in DateTimeFormat formatToParts(). PASS new Intl.DateTimeFormat().formatToParts(new Date(NaN)) threw exception RangeError: date value is not finite in DateTimeFormat formatToParts(). -PASS JSON.stringify( +FAIL JSON.stringify( Intl.DateTimeFormat("pt-BR", { hour: "numeric", minute: "numeric", second: "numeric", year: "numeric", month: "numeric", day: "numeric", timeZoneName: "short", era: "short", timeZone: "UTC" }).formatToParts(0).filter((part) => (part.type !== "literal")) -) is JSON.stringify([ - {"type":"day","value":"1"}, - {"type":"month","value":"1"}, - {"type":"year","value":"1970"}, - {"type":"era","value":"d.C."}, - {"type":"hour","value":"00"}, - {"type":"minute","value":"00"}, - {"type":"second","value":"00"}, - {"type":"timeZoneName","value":"GMT"} -]) +) should be [{"type":"day","value":"1"},{"type":"month","value":"1"},{"type":"year","value":"1970"},{"type":"era","value":"d.C."},{"type":"hour","value":"00"},{"type":"minute","value":"00"},{"type":"second","value":"00"},{"type":"timeZoneName","value":"GMT"}]. Was [{"type":"day","value":"1"},{"type":"month","value":"1"},{"type":"year","value":"1970"},{"type":"era","value":"d.C."},{"type":"hour","value":"00"},{"type":"minute","value":"00"},{"type":"second","value":"00"},{"type":"timeZoneName","value":"UTC"}]. PASS Intl.DateTimeFormat("ar", { weekday: "short", year: "numeric", month: "short", day: "numeric", hour: "numeric", minute: "numeric", second: "numeric" }).formatToParts() is an instance of Array PASS Intl.DateTimeFormat("ar", { weekday: "short", year: "numeric", month: "short", day: "numeric" }).formatToParts() is an instance of Array PASS Intl.DateTimeFormat("ar", { year: "numeric", month: "long", day: "numeric" }).formatToParts() is an instance of Array @@ -2551,33 +2542,13 @@ PASS Intl.DateTimeFormat("zh-TW", { month: "long", day: "numeric" }).formatToParts() is an instance of Array PASS Intl.DateTimeFormat("zh-TW", { hour: "numeric", minute: "numeric", second: "numeric" }).formatToParts() is an instance of Array PASS Intl.DateTimeFormat("zh-TW", { hour: "numeric", minute: "numeric" }).formatToParts() is an instance of Array -PASS JSON.stringify( +FAIL JSON.stringify( Intl.DateTimeFormat('en-US', { hour: "numeric", minute: "numeric", second: "numeric", year: "numeric", month: "long", day: "numeric", weekday: "long", timeZoneName: "short", era: "long", timeZone: "UTC" }).formatToParts(0) -) is JSON.stringify([ - {"type":"weekday","value":"Thursday"}, - {"type":"literal","value":", "}, - {"type":"month","value":"January"}, - {"type":"literal","value":" "}, - {"type":"day","value":"1"}, - {"type":"literal","value":", "}, - {"type":"year","value":"1970"}, - {"type":"literal","value":" "}, - {"type":"era","value":"Anno Domini"}, - {"type":"literal","value":", "}, - {"type":"hour","value":"12"}, - {"type":"literal","value":":"}, - {"type":"minute","value":"00"}, - {"type":"literal","value":":"}, - {"type":"second","value":"00"}, - {"type":"literal","value":" "}, - {"type":"dayPeriod","value":"AM"}, - {"type":"literal","value":" "}, - {"type":"timeZoneName","value":"GMT"} -]) +) should be [{"type":"weekday","value":"Thursday"},{"type":"literal","value":", "},{"type":"month","value":"January"},{"type":"literal","value":" "},{"type":"day","value":"1"},{"type":"literal","value":", "},{"type":"year","value":"1970"},{"type":"literal","value":" "},{"type":"era","value":"Anno Domini"},{"type":"literal","value":", "},{"type":"hour","value":"12"},{"type":"literal","value":":"},{"type":"minute","value":"00"},{"type":"literal","value":":"},{"type":"second","value":"00"},{"type":"literal","value":" "},{"type":"dayPeriod","value":"AM"},{"type":"literal","value":" "},{"type":"timeZoneName","value":"GMT"}]. Was [{"type":"weekday","value":"Thursday"},{"type":"literal","value":", "},{"type":"month","value":"January"},{"type":"literal","value":" "},{"type":"day","value":"1"},{"type":"literal","value":", "},{"type":"year","value":"1970"},{"type":"literal","value":" "},{"type":"era","value":"Anno Domini"},{"type":"literal","value":", "},{"type":"hour","value":"12"},{"type":"literal","value":":"},{"type":"minute","value":"00"},{"type":"literal","value":":"},{"type":"second","value":"00"},{"type":"literal","value":" "},{"type":"dayPeriod","value":"AM"},{"type":"literal","value":" "},{"type":"timeZoneName","value":"UTC"}]. PASS successfullyParsed is true TEST COMPLETE 1368042 1 jlewis3 2017-11-03 11:49:36 -0700 Marked as failing for now on High Sierra: https://trac.webkit.org/changeset/224411/webkit/ 1369904 2 ap 2017-11-09 09:21:50 -0800 This is the expected result going forward, updated in 2017c.1.0 time zone asset. We'll be getting this result in macOS High Sierra and in iOS 10+ whenever the update is installed (not sure if this works in simulator). Eventually, this data will be part of TZ data installed with the OS of course. Cf. <rdar://problem/35415193> 1372708 3 ryanhaddad 2017-11-16 10:53:27 -0800 This test also runs as part of jsc-layout-tests, where I don't think we can add platform-specific expectation files. 1373133 4 ap 2017-11-17 10:23:50 -0800 A couple ideas: - The test can be modified to accept either GMT or UTC. - It can be skipped as a JSC test, I don't think that it provides much vakue being run twice. Normally, JSC tests are good to run as such because of all the different modes, but this one is unlikely to run differently in different modes. 1373140 5 andy 2017-11-17 10:29:25 -0800 Both should be considered correct. I think the test should be updated to accept either GMT or UTC. 1373802 6 327368 andy 2017-11-20 10:35:29 -0800 Created attachment 327368 Avoid testing against UTC text name since it can be ambiguous. 1373803 7 327368 andy 2017-11-20 10:42:44 -0800 Comment on attachment 327368 Avoid testing against UTC text name since it can be ambiguous. When I got into updating the test it seemed like it would be harder to understand allowing both GMT and UTC variations. I thought it would be less fragile if we test against time zones that are less ambiguous. 1373877 8 327368 darin 2017-11-20 17:05:16 -0800 Comment on attachment 327368 Avoid testing against UTC text name since it can be ambiguous. Seems OK. Too bad that the change in the operating system name for the time zone is visible as a difference in web browser behavior. Not great. 1373883 9 327368 commit-queue 2017-11-20 17:24:41 -0800 Comment on attachment 327368 Avoid testing against UTC text name since it can be ambiguous. Clearing flags on attachment: 327368 Committed r225059: <https://trac.webkit.org/changeset/225059> 1373884 10 commit-queue 2017-11-20 17:24:42 -0800 All reviewed patches have been landed. Closing bug. 1373887 11 webkit-bug-importer 2017-11-20 17:26:03 -0800 <rdar://problem/35650610> 327368 2017-11-20 10:35:29 -0800 2017-11-20 17:24:41 -0800 Avoid testing against UTC text name since it can be ambiguous. bug-179208-20171120123528.patch text/plain 10102 andy U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1MDUxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTY3N2RhMjcxNWFmYTJmODRlNjY0 MmY2NWVkYzk4MTY5YTc1Y2FiMS4uYzAzMzA1NWJiNGY3ODYwZDZlMWNjYTRjY2UxMjY0YWJlOTZl MzFiZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTExLTIwICBBbmR5IFZhbldhZ29uZXIg IDxhbmR5QHRoZXRhbGVjcmFmdGVyLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBqcy9pbnRs LWRhdGV0aW1lZm9ybWF0Lmh0bWwgaXMgZmFpbGluZyBvbiBIaWdoIFNpZXJyYSAoR01UIHZzLiBV VEMpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzky MDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ug dGltZSB6b25lcyB0aGF0IGFyZSB1bmFtYmlndW91cyBpbiBkYXRldGltZWZvcm1hdCB0ZXN0cy4K KworICAgICAgICAqIGpzL2ludGwtZGF0ZXRpbWVmb3JtYXQtZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIGpzL3NjcmlwdC10ZXN0cy9pbnRsLWRhdGV0aW1lZm9ybWF0LmpzOgorICAgICAgICAqIHBs YXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE3LTExLTE5ICBNczJnZXIgIDxNczJn ZXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBFbmFibGUgdGhlIFhNTEh0dHBSZXF1ZXN0 LyBkaXJlY3Rvcnkgb2Ygd2ViLXBsYXRmb3JtLXRlc3RzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvanMvaW50bC1kYXRldGltZWZvcm1hdC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9qcy9p bnRsLWRhdGV0aW1lZm9ybWF0LWV4cGVjdGVkLnR4dAppbmRleCA5YTY3YmJkNGFiNWViM2NjNzVm M2U2YjY5MWNiMGM5ZTQ0NThlMzA2Li45YWZhMTFkMjhmYzdjZTgxNTNjMWE2YTRmNWJkMGJjODdk ZTBkMTY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9qcy9pbnRsLWRhdGV0aW1lZm9ybWF0LWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9qcy9pbnRsLWRhdGV0aW1lZm9ybWF0LWV4cGVj dGVkLnR4dApAQCAtMzc1LDkgKzM3NSw5IEBAIFBBU1MgSW50bC5EYXRlVGltZUZvcm1hdCgnZW4n LCB7IHRpbWVab25lTmFtZTogeyB0b1N0cmluZygpIHsgdGhyb3cgJ3RpbWVab25lTmFtCiBQQVNT IEludGwuRGF0ZVRpbWVGb3JtYXQoJ2VuJywgeyB0aW1lWm9uZU5hbWU6J25hbWUnIH0pIHRocmV3 IGV4Y2VwdGlvbiBSYW5nZUVycm9yOiB0aW1lWm9uZU5hbWUgbXVzdCBiZSAic2hvcnQiIG9yICJs b25nIi4KIFBBU1MgSW50bC5EYXRlVGltZUZvcm1hdCgnZW4nKS5yZXNvbHZlZE9wdGlvbnMoKS50 aW1lWm9uZU5hbWUgaXMgdW5kZWZpbmVkCiBQQVNTIEludGwuRGF0ZVRpbWVGb3JtYXQoJ2VuJywg eyBtaW51dGU6JzItZGlnaXQnLCBob3VyOidudW1lcmljJywgdGltZVpvbmVOYW1lOidzaG9ydCcg fSkucmVzb2x2ZWRPcHRpb25zKCkudGltZVpvbmVOYW1lIGlzICdzaG9ydCcKLVBBU1MgSW50bC5E YXRlVGltZUZvcm1hdCgnZW4nLCB7IG1pbnV0ZTonMi1kaWdpdCcsIGhvdXI6J251bWVyaWMnLCB0 aW1lWm9uZU5hbWU6J3Nob3J0JywgdGltZVpvbmU6ICdVVEMnIH0pLmZvcm1hdCgwKSBpcyAnMTI6 MDAgQU0gR01UJworUEFTUyBJbnRsLkRhdGVUaW1lRm9ybWF0KCdlbicsIHsgbWludXRlOicyLWRp Z2l0JywgaG91cjonbnVtZXJpYycsIHRpbWVab25lTmFtZTonc2hvcnQnLCB0aW1lWm9uZTogJ0Ft ZXJpY2EvTG9zX0FuZ2VsZXMnIH0pLmZvcm1hdCgwKSBpcyAnNDowMCBQTSBQU1QnCiBQQVNTIElu dGwuRGF0ZVRpbWVGb3JtYXQoJ3B0LUJSJywgeyBtaW51dGU6JzItZGlnaXQnLCBob3VyOidudW1l cmljJywgdGltZVpvbmVOYW1lOidsb25nJyB9KS5yZXNvbHZlZE9wdGlvbnMoKS50aW1lWm9uZU5h bWUgaXMgJ2xvbmcnCi1QQVNTIFsnMDA6MDAgR01UJywnMDA6MDAgSG9yw6FyaW8gZG8gTWVyaWRp YW5vIGRlIEdyZWVud2ljaCddLmluY2x1ZGVzKEludGwuRGF0ZVRpbWVGb3JtYXQoJ3B0LUJSJywg eyBtaW51dGU6JzItZGlnaXQnLCBob3VyOidudW1lcmljJywgdGltZVpvbmVOYW1lOidsb25nJywg dGltZVpvbmU6ICdVVEMnIH0pLmZvcm1hdCgwKSkgaXMgdHJ1ZQorUEFTUyBJbnRsLkRhdGVUaW1l Rm9ybWF0KCdwdC1CUicsIHsgbWludXRlOicyLWRpZ2l0JywgaG91cjonbnVtZXJpYycsIHRpbWVa b25lTmFtZTonbG9uZycsIHRpbWVab25lOiAnYW1lcmljYS9zYW9fcGF1bG8nIH0pLmZvcm1hdCgw KSBpcyAnMjE6MDAgSG9yw6FyaW8gUGFkcsOjbyBkZSBCcmFzw61saWEnCiBQQVNTIAogICAgIHZh ciBvcHRpb25zID0geyB3ZWVrZGF5OiAic2hvcnQiLCB5ZWFyOiAibnVtZXJpYyIsIG1vbnRoOiAi c2hvcnQiLCBkYXk6ICJudW1lcmljIiwgaG91cjogIm51bWVyaWMiLCBtaW51dGU6ICJudW1lcmlj Iiwgc2Vjb25kOiAibnVtZXJpYyIgfTsKICAgICB2YXIgcmVzb2x2ZWQgPSBJbnRsLkRhdGVUaW1l Rm9ybWF0KCJhciIsIG9wdGlvbnMpLnJlc29sdmVkT3B0aW9ucygpOwpAQCAtMjE4MiwxNyArMjE4 MiwxNyBAQCBQQVNTIEpTT04uc3RyaW5naWZ5KAogICBJbnRsLkRhdGVUaW1lRm9ybWF0KCJwdC1C UiIsIHsKICAgICBob3VyOiAibnVtZXJpYyIsIG1pbnV0ZTogIm51bWVyaWMiLCBzZWNvbmQ6ICJu dW1lcmljIiwKICAgICB5ZWFyOiAibnVtZXJpYyIsIG1vbnRoOiAibnVtZXJpYyIsIGRheTogIm51 bWVyaWMiLAotICAgIHRpbWVab25lTmFtZTogInNob3J0IiwgZXJhOiAic2hvcnQiLCB0aW1lWm9u ZTogIlVUQyIKKyAgICB0aW1lWm9uZU5hbWU6ICJzaG9ydCIsIGVyYTogInNob3J0IiwgdGltZVpv bmU6ICJBbWVyaWNhL1Nhb19QYXVsbyIKICAgfSkuZm9ybWF0VG9QYXJ0cygwKS5maWx0ZXIoKHBh cnQpID0+IChwYXJ0LnR5cGUgIT09ICJsaXRlcmFsIikpCiApIGlzIEpTT04uc3RyaW5naWZ5KFsK LSAgeyJ0eXBlIjoiZGF5IiwidmFsdWUiOiIxIn0sCi0gIHsidHlwZSI6Im1vbnRoIiwidmFsdWUi OiIxIn0sCi0gIHsidHlwZSI6InllYXIiLCJ2YWx1ZSI6IjE5NzAifSwKKyAgeyJ0eXBlIjoiZGF5 IiwidmFsdWUiOiIzMSJ9LAorICB7InR5cGUiOiJtb250aCIsInZhbHVlIjoiMTIifSwKKyAgeyJ0 eXBlIjoieWVhciIsInZhbHVlIjoiMTk2OSJ9LAogICB7InR5cGUiOiJlcmEiLCJ2YWx1ZSI6ImQu Qy4ifSwKLSAgeyJ0eXBlIjoiaG91ciIsInZhbHVlIjoiMDAifSwKKyAgeyJ0eXBlIjoiaG91ciIs InZhbHVlIjoiMjEifSwKICAgeyJ0eXBlIjoibWludXRlIiwidmFsdWUiOiIwMCJ9LAogICB7InR5 cGUiOiJzZWNvbmQiLCJ2YWx1ZSI6IjAwIn0sCi0gIHsidHlwZSI6InRpbWVab25lTmFtZSIsInZh bHVlIjoiR01UIn0KKyAgeyJ0eXBlIjoidGltZVpvbmVOYW1lIiwidmFsdWUiOiJCUlQifQogXSkK IFBBU1MgSW50bC5EYXRlVGltZUZvcm1hdCgiYXIiLCB7IHdlZWtkYXk6ICJzaG9ydCIsIHllYXI6 ICJudW1lcmljIiwgbW9udGg6ICJzaG9ydCIsIGRheTogIm51bWVyaWMiLCBob3VyOiAibnVtZXJp YyIsIG1pbnV0ZTogIm51bWVyaWMiLCBzZWNvbmQ6ICJudW1lcmljIiB9KS5mb3JtYXRUb1BhcnRz KCkgaXMgYW4gaW5zdGFuY2Ugb2YgQXJyYXkKIFBBU1MgSW50bC5EYXRlVGltZUZvcm1hdCgiYXIi LCB7IHdlZWtkYXk6ICJzaG9ydCIsIHllYXI6ICJudW1lcmljIiwgbW9udGg6ICJzaG9ydCIsIGRh eTogIm51bWVyaWMiIH0pLmZvcm1hdFRvUGFydHMoKSBpcyBhbiBpbnN0YW5jZSBvZiBBcnJheQpA QCAtMjU1NSwyOCArMjU1NSwyOCBAQCBQQVNTIEpTT04uc3RyaW5naWZ5KAogICBJbnRsLkRhdGVU aW1lRm9ybWF0KCdlbi1VUycsIHsKICAgICBob3VyOiAibnVtZXJpYyIsIG1pbnV0ZTogIm51bWVy aWMiLCBzZWNvbmQ6ICJudW1lcmljIiwKICAgICB5ZWFyOiAibnVtZXJpYyIsIG1vbnRoOiAibG9u ZyIsIGRheTogIm51bWVyaWMiLCB3ZWVrZGF5OiAibG9uZyIsCi0gICAgdGltZVpvbmVOYW1lOiAi c2hvcnQiLCBlcmE6ICJsb25nIiwgdGltZVpvbmU6ICJVVEMiCisgICAgdGltZVpvbmVOYW1lOiAi bG9uZyIsIGVyYTogImxvbmciLCB0aW1lWm9uZTogIkFtZXJpY2EvTG9zX0FuZ2VsZXMiCiAgIH0p LmZvcm1hdFRvUGFydHMoMCkKICkgaXMgSlNPTi5zdHJpbmdpZnkoWwotICB7InR5cGUiOiJ3ZWVr ZGF5IiwidmFsdWUiOiJUaHVyc2RheSJ9LAorICB7InR5cGUiOiJ3ZWVrZGF5IiwidmFsdWUiOiJX ZWRuZXNkYXkifSwKICAgeyJ0eXBlIjoibGl0ZXJhbCIsInZhbHVlIjoiLCAifSwKLSAgeyJ0eXBl IjoibW9udGgiLCJ2YWx1ZSI6IkphbnVhcnkifSwKKyAgeyJ0eXBlIjoibW9udGgiLCJ2YWx1ZSI6 IkRlY2VtYmVyIn0sCiAgIHsidHlwZSI6ImxpdGVyYWwiLCJ2YWx1ZSI6IiAifSwKLSAgeyJ0eXBl IjoiZGF5IiwidmFsdWUiOiIxIn0sCisgIHsidHlwZSI6ImRheSIsInZhbHVlIjoiMzEifSwKICAg eyJ0eXBlIjoibGl0ZXJhbCIsInZhbHVlIjoiLCAifSwKLSAgeyJ0eXBlIjoieWVhciIsInZhbHVl IjoiMTk3MCJ9LAorICB7InR5cGUiOiJ5ZWFyIiwidmFsdWUiOiIxOTY5In0sCiAgIHsidHlwZSI6 ImxpdGVyYWwiLCJ2YWx1ZSI6IiAifSwKICAgeyJ0eXBlIjoiZXJhIiwidmFsdWUiOiJBbm5vIERv bWluaSJ9LAogICB7InR5cGUiOiJsaXRlcmFsIiwidmFsdWUiOiIsICJ9LAotICB7InR5cGUiOiJo b3VyIiwidmFsdWUiOiIxMiJ9LAorICB7InR5cGUiOiJob3VyIiwidmFsdWUiOiI0In0sCiAgIHsi dHlwZSI6ImxpdGVyYWwiLCJ2YWx1ZSI6IjoifSwKICAgeyJ0eXBlIjoibWludXRlIiwidmFsdWUi OiIwMCJ9LAogICB7InR5cGUiOiJsaXRlcmFsIiwidmFsdWUiOiI6In0sCiAgIHsidHlwZSI6InNl Y29uZCIsInZhbHVlIjoiMDAifSwKICAgeyJ0eXBlIjoibGl0ZXJhbCIsInZhbHVlIjoiICJ9LAot ICB7InR5cGUiOiJkYXlQZXJpb2QiLCJ2YWx1ZSI6IkFNIn0sCisgIHsidHlwZSI6ImRheVBlcmlv ZCIsInZhbHVlIjoiUE0ifSwKICAgeyJ0eXBlIjoibGl0ZXJhbCIsInZhbHVlIjoiICJ9LAotICB7 InR5cGUiOiJ0aW1lWm9uZU5hbWUiLCJ2YWx1ZSI6IkdNVCJ9CisgIHsidHlwZSI6InRpbWVab25l TmFtZSIsInZhbHVlIjoiUGFjaWZpYyBTdGFuZGFyZCBUaW1lIn0KIF0pCiBQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2pzL3NjcmlwdC10 ZXN0cy9pbnRsLWRhdGV0aW1lZm9ybWF0LmpzIGIvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3Rz L2ludGwtZGF0ZXRpbWVmb3JtYXQuanMKaW5kZXggMDZkOTUxYjZhNDgxZjMzMTc3Njk1M2RmZjg4 ZTYxNGI5OGEwZmU1Yi4uY2JlZWM2Y2FjZmFhZDM3OTgwYjI4MzYwOTY1NWRjNDIwNWYxMGNiNyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3RzL2ludGwtZGF0ZXRpbWVmb3Jt YXQuanMKKysrIGIvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3RzL2ludGwtZGF0ZXRpbWVmb3Jt YXQuanMKQEAgLTQ1OSw5ICs0NTksOSBAQCBzaG91bGRUaHJvdygiSW50bC5EYXRlVGltZUZvcm1h dCgnZW4nLCB7IHRpbWVab25lTmFtZTogeyB0b1N0cmluZygpIHsgdGhyb3cgJ3RpbQogc2hvdWxk VGhyb3coIkludGwuRGF0ZVRpbWVGb3JtYXQoJ2VuJywgeyB0aW1lWm9uZU5hbWU6J25hbWUnIH0p IiwgJ1wnUmFuZ2VFcnJvcjogdGltZVpvbmVOYW1lIG11c3QgYmUgInNob3J0IiBvciAibG9uZyJc JycpOwogc2hvdWxkQmUoIkludGwuRGF0ZVRpbWVGb3JtYXQoJ2VuJykucmVzb2x2ZWRPcHRpb25z KCkudGltZVpvbmVOYW1lIiwgInVuZGVmaW5lZCIpOwogc2hvdWxkQmUoIkludGwuRGF0ZVRpbWVG b3JtYXQoJ2VuJywgeyBtaW51dGU6JzItZGlnaXQnLCBob3VyOidudW1lcmljJywgdGltZVpvbmVO YW1lOidzaG9ydCcgfSkucmVzb2x2ZWRPcHRpb25zKCkudGltZVpvbmVOYW1lIiwgIidzaG9ydCci KTsKLXNob3VsZEJlKCJJbnRsLkRhdGVUaW1lRm9ybWF0KCdlbicsIHsgbWludXRlOicyLWRpZ2l0 JywgaG91cjonbnVtZXJpYycsIHRpbWVab25lTmFtZTonc2hvcnQnLCB0aW1lWm9uZTogJ1VUQycg fSkuZm9ybWF0KDApIiwgIicxMjowMCBBTSBHTVQnIik7CitzaG91bGRCZSgiSW50bC5EYXRlVGlt ZUZvcm1hdCgnZW4nLCB7IG1pbnV0ZTonMi1kaWdpdCcsIGhvdXI6J251bWVyaWMnLCB0aW1lWm9u ZU5hbWU6J3Nob3J0JywgdGltZVpvbmU6ICdBbWVyaWNhL0xvc19BbmdlbGVzJyB9KS5mb3JtYXQo MCkiLCAiJzQ6MDAgUE0gUFNUJyIpOwogc2hvdWxkQmUoIkludGwuRGF0ZVRpbWVGb3JtYXQoJ3B0 LUJSJywgeyBtaW51dGU6JzItZGlnaXQnLCBob3VyOidudW1lcmljJywgdGltZVpvbmVOYW1lOids b25nJyB9KS5yZXNvbHZlZE9wdGlvbnMoKS50aW1lWm9uZU5hbWUiLCAiJ2xvbmcnIik7Ci1zaG91 bGRCZVRydWUoIlsnMDA6MDAgR01UJywnMDA6MDAgSG9yw6FyaW8gZG8gTWVyaWRpYW5vIGRlIEdy ZWVud2ljaCddLmluY2x1ZGVzKEludGwuRGF0ZVRpbWVGb3JtYXQoJ3B0LUJSJywgeyBtaW51dGU6 JzItZGlnaXQnLCBob3VyOidudW1lcmljJywgdGltZVpvbmVOYW1lOidsb25nJywgdGltZVpvbmU6 ICdVVEMnIH0pLmZvcm1hdCgwKSkiKTsKK3Nob3VsZEJlKCJJbnRsLkRhdGVUaW1lRm9ybWF0KCdw dC1CUicsIHsgbWludXRlOicyLWRpZ2l0JywgaG91cjonbnVtZXJpYycsIHRpbWVab25lTmFtZTon bG9uZycsIHRpbWVab25lOiAnYW1lcmljYS9zYW9fcGF1bG8nIH0pLmZvcm1hdCgwKSIsICInMjE6 MDAgSG9yw6FyaW8gUGFkcsOjbyBkZSBCcmFzw61saWEnIik7CiAKIGxldCBsb2NhbGVzU2FtcGxl ID0gWwogICAiYXIiLCAiYXItU0EiLCAiYmUiLCAiY2EiLCAiY3MiLCAiZGEiLCAiZGUiLCAiZGUt Q0giLCAiZW4iLCAiZW4tQVUiLCAiZW4tR0IiLApAQCAtNTQyLDE3ICs1NDIsMTcgQEAgc2hvdWxk QmUoYEpTT04uc3RyaW5naWZ5KAogICBJbnRsLkRhdGVUaW1lRm9ybWF0KCJwdC1CUiIsIHsKICAg ICBob3VyOiAibnVtZXJpYyIsIG1pbnV0ZTogIm51bWVyaWMiLCBzZWNvbmQ6ICJudW1lcmljIiwK ICAgICB5ZWFyOiAibnVtZXJpYyIsIG1vbnRoOiAibnVtZXJpYyIsIGRheTogIm51bWVyaWMiLAot ICAgIHRpbWVab25lTmFtZTogInNob3J0IiwgZXJhOiAic2hvcnQiLCB0aW1lWm9uZTogIlVUQyIK KyAgICB0aW1lWm9uZU5hbWU6ICJzaG9ydCIsIGVyYTogInNob3J0IiwgdGltZVpvbmU6ICJBbWVy aWNhL1Nhb19QYXVsbyIKICAgfSkuZm9ybWF0VG9QYXJ0cygwKS5maWx0ZXIoKHBhcnQpID0+IChw YXJ0LnR5cGUgIT09ICJsaXRlcmFsIikpCiApYCwgYEpTT04uc3RyaW5naWZ5KFsKLSAgeyJ0eXBl IjoiZGF5IiwidmFsdWUiOiIxIn0sCi0gIHsidHlwZSI6Im1vbnRoIiwidmFsdWUiOiIxIn0sCi0g IHsidHlwZSI6InllYXIiLCJ2YWx1ZSI6IjE5NzAifSwKKyAgeyJ0eXBlIjoiZGF5IiwidmFsdWUi OiIzMSJ9LAorICB7InR5cGUiOiJtb250aCIsInZhbHVlIjoiMTIifSwKKyAgeyJ0eXBlIjoieWVh ciIsInZhbHVlIjoiMTk2OSJ9LAogICB7InR5cGUiOiJlcmEiLCJ2YWx1ZSI6ImQuQy4ifSwKLSAg eyJ0eXBlIjoiaG91ciIsInZhbHVlIjoiMDAifSwKKyAgeyJ0eXBlIjoiaG91ciIsInZhbHVlIjoi MjEifSwKICAgeyJ0eXBlIjoibWludXRlIiwidmFsdWUiOiIwMCJ9LAogICB7InR5cGUiOiJzZWNv bmQiLCJ2YWx1ZSI6IjAwIn0sCi0gIHsidHlwZSI6InRpbWVab25lTmFtZSIsInZhbHVlIjoiR01U In0KKyAgeyJ0eXBlIjoidGltZVpvbmVOYW1lIiwidmFsdWUiOiJCUlQifQogXSlgKTsKIAogZm9y IChsZXQgbG9jYWxlIG9mIGxvY2FsZXNTYW1wbGUpIHsKQEAgLTU3OCwyNyArNTc4LDI3IEBAIHNo b3VsZEJlKGBKU09OLnN0cmluZ2lmeSgKICAgSW50bC5EYXRlVGltZUZvcm1hdCgnZW4tVVMnLCB7 CiAgICAgaG91cjogIm51bWVyaWMiLCBtaW51dGU6ICJudW1lcmljIiwgc2Vjb25kOiAibnVtZXJp YyIsCiAgICAgeWVhcjogIm51bWVyaWMiLCBtb250aDogImxvbmciLCBkYXk6ICJudW1lcmljIiwg d2Vla2RheTogImxvbmciLAotICAgIHRpbWVab25lTmFtZTogInNob3J0IiwgZXJhOiAibG9uZyIs IHRpbWVab25lOiAiVVRDIgorICAgIHRpbWVab25lTmFtZTogImxvbmciLCBlcmE6ICJsb25nIiwg dGltZVpvbmU6ICJBbWVyaWNhL0xvc19BbmdlbGVzIgogICB9KS5mb3JtYXRUb1BhcnRzKDApCiAp YCwgYEpTT04uc3RyaW5naWZ5KFsKLSAgeyJ0eXBlIjoid2Vla2RheSIsInZhbHVlIjoiVGh1cnNk YXkifSwKKyAgeyJ0eXBlIjoid2Vla2RheSIsInZhbHVlIjoiV2VkbmVzZGF5In0sCiAgIHsidHlw ZSI6ImxpdGVyYWwiLCJ2YWx1ZSI6IiwgIn0sCi0gIHsidHlwZSI6Im1vbnRoIiwidmFsdWUiOiJK YW51YXJ5In0sCisgIHsidHlwZSI6Im1vbnRoIiwidmFsdWUiOiJEZWNlbWJlciJ9LAogICB7InR5 cGUiOiJsaXRlcmFsIiwidmFsdWUiOiIgIn0sCi0gIHsidHlwZSI6ImRheSIsInZhbHVlIjoiMSJ9 LAorICB7InR5cGUiOiJkYXkiLCJ2YWx1ZSI6IjMxIn0sCiAgIHsidHlwZSI6ImxpdGVyYWwiLCJ2 YWx1ZSI6IiwgIn0sCi0gIHsidHlwZSI6InllYXIiLCJ2YWx1ZSI6IjE5NzAifSwKKyAgeyJ0eXBl IjoieWVhciIsInZhbHVlIjoiMTk2OSJ9LAogICB7InR5cGUiOiJsaXRlcmFsIiwidmFsdWUiOiIg In0sCiAgIHsidHlwZSI6ImVyYSIsInZhbHVlIjoiQW5ubyBEb21pbmkifSwKICAgeyJ0eXBlIjoi bGl0ZXJhbCIsInZhbHVlIjoiLCAifSwKLSAgeyJ0eXBlIjoiaG91ciIsInZhbHVlIjoiMTIifSwK KyAgeyJ0eXBlIjoiaG91ciIsInZhbHVlIjoiNCJ9LAogICB7InR5cGUiOiJsaXRlcmFsIiwidmFs dWUiOiI6In0sCiAgIHsidHlwZSI6Im1pbnV0ZSIsInZhbHVlIjoiMDAifSwKICAgeyJ0eXBlIjoi bGl0ZXJhbCIsInZhbHVlIjoiOiJ9LAogICB7InR5cGUiOiJzZWNvbmQiLCJ2YWx1ZSI6IjAwIn0s CiAgIHsidHlwZSI6ImxpdGVyYWwiLCJ2YWx1ZSI6IiAifSwKLSAgeyJ0eXBlIjoiZGF5UGVyaW9k IiwidmFsdWUiOiJBTSJ9LAorICB7InR5cGUiOiJkYXlQZXJpb2QiLCJ2YWx1ZSI6IlBNIn0sCiAg IHsidHlwZSI6ImxpdGVyYWwiLCJ2YWx1ZSI6IiAifSwKLSAgeyJ0eXBlIjoidGltZVpvbmVOYW1l IiwidmFsdWUiOiJHTVQifQorICB7InR5cGUiOiJ0aW1lWm9uZU5hbWUiLCJ2YWx1ZSI6IlBhY2lm aWMgU3RhbmRhcmQgVGltZSJ9CiBdKWApCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggMzU4YTk4M2FkMDJlYWVkZWRmYjQ3ZjliNGZkNjBmNWM4MDVhN2Nj ZS4uYjU5YjBiOGVmZjk2MWM3MjBlYmQ4ZjM3NTc3NzZhZGM2ZDZiZmYxNyAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE3NDUsOCArMTc0NSw2IEBAIHdl YmtpdC5vcmcvYi8xNzkzNDIgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcmVnaXN0cmF0aW9u LXRhc2stcXVldWUtc2NoZWR1bGluCiBbIEVsQ2FwaXRhbiBTaWVycmEgXSBwbGF0Zm9ybS9tYWMv bWVkaWEvZW5jcnlwdGVkLW1lZGlhL2Zwcy1jcmVhdGVNZWRpYUtleXMuaHRtbCBbIFNraXAgXQog WyBFbENhcGl0YW4gU2llcnJhIF0gcGxhdGZvcm0vbWFjL21lZGlhL2VuY3J5cHRlZC1tZWRpYS9m cHMtcmVxdWVzdE1lZGlhS2V5U3lzdGVtQWNjZXNzLmh0bWwgWyBTa2lwIF0KIAotd2Via2l0Lm9y Zy9iLzE3OTIwOCBbIEhpZ2hTaWVycmErIF0ganMvaW50bC1kYXRldGltZWZvcm1hdC5odG1sIFsg RmFpbHVyZSBdCi0KICMgcmRhcjovL3Byb2JsZW0vMzUzOTU0MzcKIFsgSGlnaFNpZXJyYSsgXSBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL21lZGlhLXNvdXJjZS9tZWRpYXNvdXJjZS1w bGF5Lmh0bWwgWyBGYWlsdXJlIF0KIFsgSGlnaFNpZXJyYSsgXSBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL21lZGlhLXNvdXJjZS9tZWRpYXNvdXJjZS1yZWR1bmRhbnQtc2Vlay5odG1s IFsgRmFpbHVyZSBdCg==