233944 2021-12-07 11:49:22 -0800 [CSS Cascade Layers] Unflake and fix web-platform-tests/css/css-cascade/layer-statement-before-import.html 2021-12-13 08:52:22 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://github.com/web-platform-tests/wpt/pull/32029 InRadar P2 Normal --- 220779 1 koivisto koivisto clopez esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard ntim simon.fraser webkit-bug-importer youennf oldest_to_newest 1821144 0 koivisto 2021-12-07 11:49:22 -0800 Newly imported imported/w3c/web-platform-tests/css/css-cascade/layer-statement-before-import.html is flaky. 1823471 1 446987 koivisto 2021-12-13 04:56:40 -0800 Created attachment 446987 Patch 1823472 2 koivisto 2021-12-13 04:57:08 -0800 Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/32029 1823473 3 ews-watchlist 2021-12-13 04:58:27 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1823491 4 446987 ntim 2021-12-13 05:32:16 -0800 Comment on attachment 446987 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446987&action=review > LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/layer-statement-before-import.html:170 > + await new Promise(resolve => { > + styleElement.onload = resolve; > + styleElement.onerror = resolve; Shouldn't we reject on error? ``` await new Promise((resolve, reject) => { styleElement.onload = resolve; styleElement.onerror = reject; }); ``` or alternatively: ``` await new Promise(resolve => { styleElement.onload = resolve; styleElement.onerror = t.unreached_func("Style element should load"); }); ``` 1823493 5 koivisto 2021-12-13 05:44:14 -0800 doesn't really matter for this test? 1823538 6 446987 simon.fraser 2021-12-13 08:27:06 -0800 Comment on attachment 446987 Patch r+ but address Tim's test issue if appropriate. 1823548 7 ews-feeder 2021-12-13 08:51:17 -0800 Committed r286949 (245174@main): <https://commits.webkit.org/245174@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446987. 1823549 8 webkit-bug-importer 2021-12-13 08:52:22 -0800 <rdar://problem/86414213> 446987 2021-12-13 04:56:40 -0800 2021-12-13 08:51:20 -0800 Patch bug-233944-20211213145639.patch text/plain 9663 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkNjBiOWJiMjJiNTU2 ZTZlOWVjM2FhZGU1NmIxNzRkN2FmYTI0YS4uMDAzNmIxMDVjYzZiYjQ4ZGQwNTBlNTE5Yjk5MzIx YWY2MWQ5NjZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTEzICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5 ZXJzXSBVbmZsYWtlIGFuZCBmaXggd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9s YXllci1zdGF0ZW1lbnQtYmVmb3JlLWltcG9ydC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzM5NDQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnNlcnRpbmcgcnVsZXMgYmVmb3JlIGVhcmx5IGxh eWVyIHN0YXRlbWVudHMgbWF5IGJlIGxlZ2FsIGlmIHRoZXkgYXJlIG1vdmVkIHRvIHRoZSByZWd1 bGFyIHJ1bGUgbGlzdC4KKworICAgICAgICAqIGNzcy9TdHlsZVNoZWV0Q29udGVudHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldENvbnRlbnRzOjp3cmFwcGVySW5zZXJ0UnVsZSk6 CisKIDIwMjEtMTItMTEgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAog ICAgICAgICBTaGFyZWRCdWZmZXIgc2hvdWxkIHVzZSBXVEY6OkZpbGVTeXN0ZW0gd2hlbiBjcmVh dGluZyBmcm9tIGEgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlU2hl ZXRDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNw cAppbmRleCBhOTdmMzdhNzRjZDllMWQzNWY4MmYzNDIwMTI4ZGZkMjRkMWQ3ODc3Li5mZGU5MGZk NDQyNjE2MDkwYzUyZjQ3NDRjOWFiZTgyYTBjNTQ0MjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVTaGVldENvbnRlbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVTaGVldENvbnRlbnRzLmNwcApAQCAtMjM3LDcgKzIzNywyMCBAQCBib29sIFN0eWxlU2hl ZXRDb250ZW50czo6d3JhcHBlckluc2VydFJ1bGUoUmVmPFN0eWxlUnVsZUJhc2U+JiYgcnVsZSwg dW5zaWduZWQgaQogICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGluZGV4IDw9 IHJ1bGVDb3VudCgpKTsKICAgICAvLyBQYXJzZXI6OnBhcnNlUnVsZSBkb2Vzbid0IGN1cnJlbnRs eSBhbGxvdyBAY2hhcnNldCBzbyB3ZSBkb24ndCBuZWVkIHRvIGRlYWwgd2l0aCBpdC4KICAgICBB U1NFUlQoIXJ1bGUtPmlzQ2hhcnNldFJ1bGUoKSk7Ci0gICAgCisKKyAgICAvLyBNYXliZSB0aGUg aW5zZXJ0IHdpbGwgYmUgbGVnYWwgaWYgd2UgdHJlYXQgZWFybHkgbGF5ZXIgc3RhdGVtZW50IHJ1 bGVzIGFzIG5vcm1hbCBjaGlsZCBydWxlcz8KKyAgICBhdXRvIHNob3VsZE1vdmVMYXllclJ1bGVz QmVmb3JlSW1wb3J0VG9Ob3JtYWxDaGlsZFJ1bGVzID0gWyZdIHsKKyAgICAgICAgaWYgKGluZGV4 ID49IG1fbGF5ZXJSdWxlc0JlZm9yZUltcG9ydFJ1bGVzLnNpemUoKSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICAgICAgaWYgKCFtX2ltcG9ydFJ1bGVzLmlzRW1wdHkoKSB8fCAhbV9u YW1lc3BhY2VSdWxlcy5pc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIGJvb2wgaXNMYXllclN0YXRlbWVudCA9IGlzPFN0eWxlUnVsZUxheWVyPihydWxlKSAmJiBk b3duY2FzdDxTdHlsZVJ1bGVMYXllcj4ocnVsZS5nZXQoKSkuaXNTdGF0ZW1lbnQoKTsKKyAgICAg ICAgcmV0dXJuICFydWxlLT5pc0ltcG9ydFJ1bGUoKSAmJiAhcnVsZS0+aXNOYW1lc3BhY2VSdWxl KCkgJiYgIWlzTGF5ZXJTdGF0ZW1lbnQ7CisgICAgfTsKKworICAgIGlmIChzaG91bGRNb3ZlTGF5 ZXJSdWxlc0JlZm9yZUltcG9ydFRvTm9ybWFsQ2hpbGRSdWxlcygpKQorICAgICAgICBtX2NoaWxk UnVsZXMuaW5zZXJ0VmVjdG9yKDAsIHN0ZDo6ZXhjaGFuZ2UobV9sYXllclJ1bGVzQmVmb3JlSW1w b3J0UnVsZXMsIHsgfSkpOworCiAgICAgdW5zaWduZWQgY2hpbGRWZWN0b3JJbmRleCA9IGluZGV4 OwogICAgIGlmIChjaGlsZFZlY3RvckluZGV4IDwgbV9sYXllclJ1bGVzQmVmb3JlSW1wb3J0UnVs ZXMuc2l6ZSgpIHx8IChjaGlsZFZlY3RvckluZGV4ID09IG1fbGF5ZXJSdWxlc0JlZm9yZUltcG9y dFJ1bGVzLnNpemUoKSAmJiBpczxTdHlsZVJ1bGVMYXllcj4ocnVsZSkpKSB7CiAgICAgICAgIGlm ICghaXM8U3R5bGVSdWxlTGF5ZXI+KHJ1bGUpKQpAQCAtMjY4LDcgKzI4MSw3IEBAIGJvb2wgU3R5 bGVTaGVldENvbnRlbnRzOjp3cmFwcGVySW5zZXJ0UnVsZShSZWY8U3R5bGVSdWxlQmFzZT4mJiBy dWxlLCB1bnNpZ25lZCBpCiAgICAgY2hpbGRWZWN0b3JJbmRleCAtPSBtX2ltcG9ydFJ1bGVzLnNp emUoKTsKIAogICAgIGlmIChjaGlsZFZlY3RvckluZGV4IDwgbV9uYW1lc3BhY2VSdWxlcy5zaXpl KCkgfHwgKGNoaWxkVmVjdG9ySW5kZXggPT0gbV9uYW1lc3BhY2VSdWxlcy5zaXplKCkgJiYgcnVs ZS0+aXNOYW1lc3BhY2VSdWxlKCkpKSB7Ci0gICAgICAgIC8vIEluc2VydGluZyBub24tbmFtZXNw YWNlIHJ1bGVzIG90aGVyIHRoYW4gaW1wb3J0IHJ1bGUgYmVmb3JlIEBuYW1lc3BhY2UgaXMKKyAg ICAgICAgLy8gSW5zZXJ0aW5nIG5vbi1uYW1lc3BhY2UgcnVsZXMgb3RoZXIgdGhhbiBpbXBvcnQg YW5kIGxheWVyIHN0YXRlbWVudCBydWxlcyBiZWZvcmUgQG5hbWVzcGFjZSBpcwogICAgICAgICAv LyBub3QgYWxsb3dlZC4KICAgICAgICAgaWYgKCFpczxTdHlsZVJ1bGVOYW1lc3BhY2U+KHJ1bGUp KQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGNlNjQyYWFhMGI2ZGU2NWQ5Zjg4 Mjc5NTg4ZGJiMzQ1ODdmZGM3MWYuLmJhNmY4MGM2ZjY5NTI3NmY0ZTM2ZjIxODFmMDNjZDdiMzY0 MWEwMTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMi0xMyAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUyBDYXNjYWRlIExheWVyc10gVW5mbGFr ZSBhbmQgZml4IHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItc3RhdGVt ZW50LWJlZm9yZS1pbXBvcnQuaHRtbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjMzOTQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBUZXN0RXhwZWN0YXRpb25zOgorCiAyMDIxLTEyLTEyICBBbnRvaW5l IFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBhIHRlc3QgZm9yIGRv Y3VtZW50LnRpbWVsaW5lLm1heGltdW1GcmFtZVJhdGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdl TG9nCmluZGV4IDI4YmMxNTRkNzAwYzVkYTliZTc2NWZiYWQ1YzQyMzYyYWI4OTAzNzguLjgxMDI2 OTM0ZWM2YWViMTJkOTg2MGIyNTg4NjhmNzA4OWU5YWQ2ZGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTEzICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5ZXJzXSBVbmZsYWtl IGFuZCBmaXggd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1l bnQtYmVmb3JlLWltcG9ydC5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzM5NDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIt c3RhdGVtZW50LWJlZm9yZS1pbXBvcnQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHdlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItc3RhdGVtZW50LWJlZm9yZS1pbXBvcnQu aHRtbDoKKworICAgICAgICBEYXRhIFVSTHMgaW4gQGltcG9ydHMgYXJlIG5vdCBndWFyYW50ZWVk IHRvIGRlY29kZSBzeW5jaHJvbm91c2x5IHNvIG1ha2UgdGhlIHRlc3QgYXN5bmMuCisgICAgICAg IEFsc28gY2F0Y2ggZXhjZXB0aW9ucyBmcm9tIGFzc2VydHMgZm9yIGNsZWFudXAgc28gZmFpbHVy ZXMgZG9uJ3QgYWZmZWN0IG90aGVyIHN1YnRlc3RzLgorCiAyMDIxLTEyLTExICBBbnRvaW5lIFF1 aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIEV4cG9zZSBhIGZyYW1lUmF0ZSBw cm9wZXJ0eSB0byBXZWIgQW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMmFiYTY2YjA5 YzAxMjRmODg4OGFkN2QzMDU5ZDliNDYyZTkxNmZkZC4uYzU4NTdkODRkMTE5Y2VhZjNhODIzMzE3 ZWExMDUyYWNlODgzMTU2ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9u cworKysgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMTg1LDcgKzIxODUsNiBA QCB3ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1jYXNjYWRlL3JldmVydC1sYXllcgogd2Via2l0Lm9yZy9iLzIzMzkzNyBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9yZXZlcnQtbGF5ZXItMDEwLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMzM5MzcgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvcmV2ZXJ0LWxheWVyLTAxMS5odG1s IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjMzOTM3IGltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL3JldmVydC1sYXllci0wMTIuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIzMzk0NCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1lbnQtYmVmb3JlLWlt cG9ydC5odG1sIFsgUGFzcyBGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzE0ODgwMSBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29sb3IvdDQyMi1yZ2JhLW9uc2NyZWVu LWIueGh0IFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTQ4ODAxIGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb2xvci90NDIyLXJnYmEtb25zY3JlZW4t bXVsdGlwbGUtYm94ZXMtYy54aHQgWyBJbWFnZU9ubHlGYWlsdXJlIF0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRl L2xheWVyLXN0YXRlbWVudC1iZWZvcmUtaW1wb3J0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLXN0 YXRlbWVudC1iZWZvcmUtaW1wb3J0LWV4cGVjdGVkLnR4dAppbmRleCAyMzA0YzY4ZjllNDQxMmFi YzEzYWE2YjE5MGM2NGQ0YzkzZjUzY2I4Li5iZmEyZmI5NWNmNjI5ODcxOTdkZmUyNWViM2NlNjEx ZjRmODNjZGQ5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1lbnQtYmVmb3JlLWltcG9ydC1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItc3RhdGVtZW50LWJlZm9yZS1pbXBvcnQtZXhwZWN0 ZWQudHh0CkBAIC0xLDEyICsxLDEwIEBACi1DT05TT0xFIE1FU1NBR0U6IFR5cGVFcnJvcjogSWxs ZWdhbCBjb25zdHJ1Y3RvcgogCi1IYXJuZXNzIEVycm9yIChGQUlMKSwgbWVzc2FnZSA9IFR5cGVF cnJvcjogSWxsZWdhbCBjb25zdHJ1Y3RvcgotCi1GQUlMIGxlbmd0aCBhbmQgaXRlbSBhc3NlcnRf ZXF1YWxzOiBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigwLCAwLCAwKSIK LUZBSUwgaW5zZXJ0UnVsZSBiZWZvcmUgaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAi cmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigwLCAwLCAwKSIKLUZBSUwgaW5zZXJ0UnVsZSBh ZnRlciBpbXBvcnRzIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0 IGdvdCAicmdiKDAsIDAsIDApIgotRkFJTCBpbnNlcnQgb3RoZXIgcnVsZXMgdG8gcHJlLWltcG9y dCBsYXllciBzdGF0ZW1lbnRzIGZhaWxzIGFzc2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwg MTI4LCAwKSIgYnV0IGdvdCAicmdiKDAsIDAsIDApIgotRkFJTCBpbnNlcnQgb3RoZXIgcnVsZXMg YmVmb3JlIHRoZSBmaXJzdCBsYXllciBzdGF0ZW1lbnQgd2l0aG91dCBpbXBvcnRzIFRoZSBvcGVy YXRpb24gd291bGQgeWllbGQgYW4gaW5jb3JyZWN0IG5vZGUgdHJlZS4KLUZBSUwgZGVsZXRlUnVs ZSBiZWZvcmUgaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCki IGJ1dCBnb3QgInJnYigwLCAwLCAwKSIKLUZBSUwgZGVsZXRlUnVsZSBhZnRlciBpbXBvcnRzIGFz c2VydF9lcXVhbHM6IGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdiKDAsIDAs IDApIgorUEFTUyBsZW5ndGggYW5kIGl0ZW0KK1BBU1MgaW5zZXJ0UnVsZSBiZWZvcmUgaW1wb3J0 cworUEFTUyBpbnNlcnRSdWxlIGFmdGVyIGltcG9ydHMKK1BBU1MgaW5zZXJ0IG90aGVyIHJ1bGVz IHRvIHByZS1pbXBvcnQgbGF5ZXIgc3RhdGVtZW50cyBmYWlscworUEFTUyBpbnNlcnQgb3RoZXIg cnVsZXMgYmVmb3JlIHRoZSBmaXJzdCBsYXllciBzdGF0ZW1lbnQgd2l0aG91dCBpbXBvcnRzCitQ QVNTIGRlbGV0ZVJ1bGUgYmVmb3JlIGltcG9ydHMKK1BBU1MgZGVsZXRlUnVsZSBhZnRlciBpbXBv cnRzCitGQUlMIHJlcGxhY2VTeW5jIGNsZWFycyBzdGFsZSBsYXllciBzdGF0ZW1lbnRzIHByb21p c2VfdGVzdDogVW5oYW5kbGVkIHJlamVjdGlvbiB3aXRoIHZhbHVlOiBvYmplY3QgIlR5cGVFcnJv cjogSWxsZWdhbCBjb25zdHJ1Y3RvciIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItc3RhdGVtZW50 LWJlZm9yZS1pbXBvcnQuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvY3NzL2Nzcy1jYXNjYWRlL2xheWVyLXN0YXRlbWVudC1iZWZvcmUtaW1wb3J0Lmh0 bWwKaW5kZXggNWMzYWJlNTUxODhjMzcwNjliZWU2OTVhMGYzZWFkYjI0N2QxMmUwNy4uN2QwOTkz NjhkODZhNjI5YWE5YWYxMzg3NzVkZmMwNGRlMGFiMGQ5MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXIt c3RhdGVtZW50LWJlZm9yZS1pbXBvcnQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1zdGF0ZW1lbnQtYmVm b3JlLWltcG9ydC5odG1sCkBAIC0xNTksMjYgKzE1OSwzMiBAQCBjb25zdCB0YXJnZXQgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgndGFyZ2V0Jyk7CiBjb25zdCByZWZlcmVuY2UgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgncmVmZXJlbmNlJyk7CiAKIGZvciAobGV0IHRlc3RDYXNlIG9mIHRl c3RDYXNlcykgewotICBsZXQgc3R5bGVFbGVtZW50OwotICBsZXQgc2hlZXQ7Ci0gIGlmICghdGVz dENhc2UuY29uc3RydWN0ZWRTdHlsZVNoZWV0KSB7Ci0gICAgc3R5bGVFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgnc3R5bGUnKTsKLSAgICBzdHlsZUVsZW1lbnQudGV4dENvbnRlbnQg PSB0ZXN0Q2FzZS5zdHlsZTsKLSAgICBkb2N1bWVudC5oZWFkLmFwcGVuZChzdHlsZUVsZW1lbnQp OwotICAgIHNoZWV0ID0gc3R5bGVFbGVtZW50LnNoZWV0OwotICB9IGVsc2UgewotICAgIHNoZWV0 ID0gbmV3IENTU1N0eWxlU2hlZXQoKTsKLSAgICBzaGVldC5yZXBsYWNlU3luYyh0ZXN0Q2FzZS5z dHlsZSk7Ci0gICAgZG9jdW1lbnQuYWRvcHRlZFN0eWxlU2hlZXRzID0gW3NoZWV0XTsKLSAgfQot Ci0gIHRlc3QoKCkgPT4gewotICAgIHRlc3RDYXNlLm9wZXJhdGlvbnMoc2hlZXQpOwotICAgIGFz c2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZSh0YXJnZXQpLmNvbG9yLCBnZXRDb21wdXRlZFN0 eWxlKHJlZmVyZW5jZSkuY29sb3IpOwotICB9LHRlc3RDYXNlLnRpdGxlKTsKKyAgcHJvbWlzZV90 ZXN0KGFzeW5jIHQgPT4geworICAgIGxldCBzdHlsZUVsZW1lbnQ7CisgICAgbGV0IHNoZWV0Owor ICAgIGlmICghdGVzdENhc2UuY29uc3RydWN0ZWRTdHlsZVNoZWV0KSB7CisgICAgICBzdHlsZUVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzdHlsZScpOworICAgICAgc3R5bGVFbGVt ZW50LnRleHRDb250ZW50ID0gdGVzdENhc2Uuc3R5bGU7CisgICAgICBhd2FpdCBuZXcgUHJvbWlz ZShyZXNvbHZlID0+IHsKKyAgICAgICAgc3R5bGVFbGVtZW50Lm9ubG9hZCA9IHJlc29sdmU7Cisg ICAgICAgIHN0eWxlRWxlbWVudC5vbmVycm9yID0gcmVzb2x2ZTsKKyAgICAgICAgZG9jdW1lbnQu aGVhZC5hcHBlbmQoc3R5bGVFbGVtZW50KTsKKyAgICAgIH0pOworICAgICAgc2hlZXQgPSBzdHls ZUVsZW1lbnQuc2hlZXQ7CisgICAgfSBlbHNlIHsKKyAgICAgIHNoZWV0ID0gbmV3IENTU1N0eWxl U2hlZXQoKTsKKyAgICAgIHNoZWV0LnJlcGxhY2VTeW5jKHRlc3RDYXNlLnN0eWxlKTsKKyAgICAg IGRvY3VtZW50LmFkb3B0ZWRTdHlsZVNoZWV0cyA9IFtzaGVldF07CisgICAgfQogCi0gIGlmIChz dHlsZUVsZW1lbnQpCi0gICAgc3R5bGVFbGVtZW50LnJlbW92ZSgpOwotICBkb2N1bWVudC5hZG9w dGVkU3R5bGVTaGVldHMgPSBbXTsKKyAgICB0cnkgeworICAgICAgdGVzdENhc2Uub3BlcmF0aW9u cyhzaGVldCk7CisgICAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5bGUodGFyZ2V0KS5j b2xvciwgZ2V0Q29tcHV0ZWRTdHlsZShyZWZlcmVuY2UpLmNvbG9yKTsKKyAgICB9IGZpbmFsbHkg eworICAgICAgaWYgKHN0eWxlRWxlbWVudCkKKyAgICAgICAgc3R5bGVFbGVtZW50LnJlbW92ZSgp OworICAgICAgZG9jdW1lbnQuYWRvcHRlZFN0eWxlU2hlZXRzID0gW107CisgICAgfQorICB9LCB0 ZXN0Q2FzZS50aXRsZSk7CiB9CiA8L3NjcmlwdD4K