202649 2019-10-07 13:10:49 -0700 Web Inspector: inspector/layers/layers-for-node.html and inspector/timeline/line-column.html are flaky 2019-10-19 17:28:25 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=137131 https://bugs.webkit.org/show_bug.cgi?id=203171 InRadar P2 Normal --- 1 yurys yurys commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1577449 0 yurys 2019-10-07 13:10:49 -0700 The two tests became very flaky after replacing Timer based queue with RunLoop one in https://trac.webkit.org/changeset/250655/webkit. The change seems to have revealed existing flaw in the tests as it essentially modified the timing of the event dispatches. inspector/layers/layers-for-node.html inspector/timeline/line-column.html History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=inspector%2Flayers%2Flayers-for-node.html%20inspector%2Ftimeline%2Fline-column.html Diff: https://build.webkit.org/results/Apple%20Mojave%20Release%20WK1%20(Tests)/r250672%20(8069)/inspector/layers/layers-for-node-diff.txt https://build.webkit.org/results/Apple%20Mojave%20Release%20WK1%20(Tests)/r250672%20(8069)/inspector/timeline/line-column-diff.txt 1577455 1 380350 yurys 2019-10-07 13:18:52 -0700 Created attachment 380350 Patch 1577489 2 380350 hi 2019-10-07 13:53:25 -0700 Comment on attachment 380350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380350&action=review rs=me > LayoutTests/inspector/layers/layers-for-node.html:25 > + layersChanged = InspectorProtocol.awaitEvent({event: "LayerTree.layerTreeDidChange"}) Frankly, given that `enableLayerTreeAgent` is called synchronously at the start of the test, perhaps we should just inline this at the top of `test` as a sort of "make sure we get at least one of these before continuing with the rest of the test". > LayoutTests/inspector/layers/layers-for-node.html:36 > + layersChanged.then(() => step({ Style: if the body of the arrow function is more than one line (or the value isn't intended as the return value), we add the `{ ... }` to the arrow function. ```js layersChanged.then(() => { step({ ... }); }); ``` 1577507 3 380361 yurys 2019-10-07 14:13:40 -0700 Created attachment 380361 Patch 1577509 4 380350 yurys 2019-10-07 14:14:24 -0700 Comment on attachment 380350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380350&action=review >> LayoutTests/inspector/layers/layers-for-node.html:25 >> + layersChanged = InspectorProtocol.awaitEvent({event: "LayerTree.layerTreeDidChange"}) > > Frankly, given that `enableLayerTreeAgent` is called synchronously at the start of the test, perhaps we should just inline this at the top of `test` as a sort of "make sure we get at least one of these before continuing with the rest of the test". Done. >> LayoutTests/inspector/layers/layers-for-node.html:36 >> + layersChanged.then(() => step({ > > Style: if the body of the arrow function is more than one line (or the value isn't intended as the return value), we add the `{ ... }` to the arrow function. > ```js > layersChanged.then(() => { > step({ > ... > }); > }); > ``` Moved this logic out of the method. 1577969 5 380361 hi 2019-10-08 15:01:32 -0700 Comment on attachment 380361 Patch rs=me 1577994 6 380361 commit-queue 2019-10-08 16:03:08 -0700 Comment on attachment 380361 Patch Clearing flags on attachment: 380361 Committed r250872: <https://trac.webkit.org/changeset/250872> 1577995 7 commit-queue 2019-10-08 16:03:10 -0700 All reviewed patches have been landed. Closing bug. 1577996 8 webkit-bug-importer 2019-10-08 16:04:21 -0700 <rdar://problem/56096739> 380350 2019-10-07 13:18:52 -0700 2019-10-07 14:13:39 -0700 Patch bug-202649-20191007131852.patch text/plain 7367 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNzQ2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzAyZGQ2NWZmNzIxZTRiNjI1Yjlk NzFhOTE3YmE2YmU0NDBjZmE1Mi4uMjBlYjVhY2RmNzRmODljY2FkZGJiYTgzNjllN2NmNmYxMDUz MWNhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEwLTA0ICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGluc3BlY3Rv ci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLmh0bWwgYW5kICBpbnNwZWN0b3IvdGltZWxpbmUvbGlu ZS1jb2x1bW4uaHRtbCBhcmUgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjY0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVuZmxha2UgYSBjb3VwbGUgb2YgaW5zcGVjdG9yIHByb3RvY29sIHRl c3RzLiByMjUwNjU1IHJlcGxhY2VkIFRpbWVyLWJhc2VkIHF1ZXVlCisgICAgICAgIHdpdGggUnVu TG9vcC1iYXNlZCBvbmUgZm9yIGluc3BlY3RvciBtZXNzYWdlIGRpc3BhdGNoaW5nLiBUaGUgdGVz dHMgYXBwYXJlbnRseSByZWxpZWQKKyAgICAgICAgb24gdGhlIHRpbWluZyBvZiB0aGUgbWVzc2Fn ZSBkZWxpdmVyeSBhbmQgaGFkIGJlZW4gbGVzcyBmbGFreSBiZWZvcmUuIFVwZGF0ZWQgdGhlIHRl c3RzCisgICAgICAgIHRvIHdhaXQgZm9yIGV4cGxpY2l0IHNpZ25hbHMgcmF0aGVyIHRoYW4gcmVs eWluZyBvbiBldmVudCB0aW1pbmcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvbGF5ZXJzL2xheWVy cy1mb3Itbm9kZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2xheWVycy9sYXll cnMtZm9yLW5vZGUuaHRtbDogVXBkYXRlZCB0aGUgdGVzdCB0byB3YWl0IGZvciB0aGUgZmlyc3QK KyAgICAgICAgTGF5ZXJUcmVlLmxheWVyVHJlZURpZENoYW5nZSBldmVudCBiZWZvcmUgcmVxdWVz dGluZyBpbml0aWFsIGxheWVyIHRyZWUuCisKKyAgICAgICAgQWxzbyBhZnRlciBhZGRpbmcgYSBu b2RlIHdhaXQgZm9yIG5leHQgUkFGIHRvIGF2b2lkIGZsYWtpbmVzcy4KKworICAgICAgICAqIGlu c3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5z cGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWw6IFRoZXJlIGEgc3R5bGUgcmVjYWxjIGV2 ZW50CisgICAgICAgIHdoaWNoIGFwcGVhcnMgaW50ZXJtaXR0ZW50bHkgaW4gdGhlIHJlY29yZGVk IHByb2ZpbGUgbWFraW5nIHRoZSB0ZXN0CisgICAgICAgIGZsYWt5LiBUbyBhdm9pZCB0aGF0IGR1 bXAgb25seSBldmVudHMgdGhhdCBhcmUgYWx3YXlzIHByZXNlbnQuCisKIDIwMTktMTAtMDQgIFRy dWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXlvdXQgVGVzdCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzLzJkY29udGV4dC9saW5lLXN0eWxlcy8yZC5s aW5lLmNhcC5yb3VuZC5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLWV4cGVjdGVkLnR4dAppbmRleCAzOTli YWNhMmM5OTk2M2I5MTljMDhlZjVhYTRiOTFhOGFhYTIxNDk2Li44YTU3MDY4OWI2MTY4OTJjYTBh MjY2Mzk0NmIyYjNkNmJmZjE0OTEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv bGF5ZXJzL2xheWVycy1mb3Itbm9kZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2xheWVycy9sYXllcnMtZm9yLW5vZGUtZXhwZWN0ZWQudHh0CkBAIC0xMjYsNiArMTI2 LDEwIEBAIFBBU1MKIAogUEFTUwogCis9PT0gV2FpdCBmb3IgcmVxdWVzdEFuaW1hdGlvbkZyYW1l ID09PQorCitQQVNTCisKID09PSBHZXQgdGhlIG1vZGlmaWVkIGxheWVyIHRyZWUgPT09CiAKIFBB U1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1u b2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbGF5ZXJzL2xheWVycy1mb3Itbm9kZS5o dG1sCmluZGV4IDUzYjllMjA4YTljZGUzYjNkODNlNmM5YWYzYTJkOTc1ZmQyZTgxZjEuLjlhYWNl MWMzNzVhZmNlZTA0ZThmYTIwYTJlNDE5NDA0MTczOTY4ZjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2xheWVycy9sYXllcnMtZm9yLW5vZGUuaHRtbApAQCAtOSwyMiArOSwyMCBA QCBmdW5jdGlvbiBhZGRDb21wb3NpdGVkTGF5ZXIoKQogICAgIGVsZW1lbnQuY2xhc3NOYW1lID0g ImNvbXBvc2l0ZWQiOwogICAgIGVsZW1lbnQuaWQgPSAibGFzdC1lbGVtZW50IjsKICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOworICAgIHJldHVybiBuZXcgUHJvbWlzZShy ZXNvbHZlID0+IHJlcXVlc3RBbmltYXRpb25GcmFtZShyZXNvbHZlKSk7CiB9OwogCiBmdW5jdGlv biB0ZXN0KCkKIHsKLSAgICB2YXIgZG9jdW1lbnROb2RlOwotICAgIHZhciBpbml0aWFsTGF5ZXJz OwotICAgIHZhciBldmVudHNDb3VudCA9IDA7Ci0KLSAgICBJbnNwZWN0b3JQcm90b2NvbC5ldmVu dEhhbmRsZXJbIkxheWVyVHJlZS5sYXllclRyZWVEaWRDaGFuZ2UiXSA9IGZ1bmN0aW9uIChtZXNz YWdlT2JqZWN0KSB7Ci0gICAgICAgIGV2ZW50c0NvdW50Kys7Ci0gICAgfTsKKyAgICBsZXQgZG9j dW1lbnROb2RlOworICAgIGxldCBpbml0aWFsTGF5ZXJzOworICAgIGxldCBsYXllcnNDaGFuZ2Vk OwogCiAgICAgZW5hYmxlTGF5ZXJUcmVlQWdlbnQoKTsKIAogICAgIGZ1bmN0aW9uIGVuYWJsZUxh eWVyVHJlZUFnZW50KHJlc3VsdCkKICAgICB7CisgICAgICAgIGxheWVyc0NoYW5nZWQgPSBJbnNw ZWN0b3JQcm90b2NvbC5hd2FpdEV2ZW50KHtldmVudDogIkxheWVyVHJlZS5sYXllclRyZWVEaWRD aGFuZ2UifSkKICAgICAgICAgc3RlcCh7CiAgICAgICAgICAgICBuYW1lOiAiRW5hYmxlIHRoZSBM YXllclRyZWUgYWdlbnQiLAogICAgICAgICAgICAgY29tbWFuZDogIkxheWVyVHJlZS5lbmFibGUi LApAQCAtMzIsMTUgKzMwLDE1IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAgY2FsbGJh Y2s6IGdldERvY3VtZW50CiAgICAgICAgIH0pOwogICAgIH07Ci0gICAgCi0gICAgZnVuY3Rpb24g Z2V0RG9jdW1lbnQocmVzdWx0KQorCisgICAgZnVuY3Rpb24gZ2V0RG9jdW1lbnQoKQogICAgIHsK LSAgICAgICAgc3RlcCh7CisgICAgICAgIGxheWVyc0NoYW5nZWQudGhlbigoKSA9PiBzdGVwKHsK ICAgICAgICAgICAgIG5hbWU6ICJHZXQgdGhlIERvY3VtZW50IiwKICAgICAgICAgICAgIGNvbW1h bmQ6ICJET00uZ2V0RG9jdW1lbnQiLAogICAgICAgICAgICAgcGFyYW1ldGVyczoge30sCiAgICAg ICAgICAgICBjYWxsYmFjazogZ2V0SW5pdGlhbExheWVyVHJlZQotICAgICAgICB9KTsKKyAgICAg ICAgfSkpOwogICAgIH07CiAgICAgCiAgICAgZnVuY3Rpb24gZ2V0SW5pdGlhbExheWVyVHJlZShy ZXN1bHQpCkBAIC02NCw2ICs2MiwxNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIG5h bWU6ICJNZXNzYWdlIHRoZSBwYWdlIHRvIGFkZCBhIG5ldyBjb21wb3NpdGVkIGxheWVyIiwKICAg ICAgICAgICAgIGNvbW1hbmQ6ICJSdW50aW1lLmV2YWx1YXRlIiwKICAgICAgICAgICAgIHBhcmFt ZXRlcnM6IHsiZXhwcmVzc2lvbiI6ICJhZGRDb21wb3NpdGVkTGF5ZXIoKSJ9LAorICAgICAgICAg ICAgY2FsbGJhY2s6IGF3YWl0UmVxdWVzdEFuaW1hdGlvbkZyYW1lCisgICAgICAgIH0pOworICAg IH07CisKKyAgICBmdW5jdGlvbiBhd2FpdFJlcXVlc3RBbmltYXRpb25GcmFtZShyZXN1bHQpCisg ICAgeworICAgICAgICBzdGVwKHsKKyAgICAgICAgICAgIG5hbWU6ICJXYWl0IGZvciByZXF1ZXN0 QW5pbWF0aW9uRnJhbWUiLAorICAgICAgICAgICAgY29tbWFuZDogIlJ1bnRpbWUuYXdhaXRQcm9t aXNlIiwKKyAgICAgICAgICAgIHBhcmFtZXRlcnM6IHsicHJvbWlzZU9iamVjdElkIjogcmVzdWx0 LnJlc3VsdC5vYmplY3RJZH0sCiAgICAgICAgICAgICBjYWxsYmFjazogZ2V0TW9kaWZpZWRMYXll clRyZWUKICAgICAgICAgfSk7CiAgICAgfTsKQEAgLTEwNiwxMSArMTE0LDcgQEAgZnVuY3Rpb24g dGVzdCgpCiAKICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkKICAgICB7Ci0gICAgICAgIGlmICgh ZXZlbnRzQ291bnQpCi0gICAgICAgICAgICBQcm90b2NvbFRlc3QubG9nKCJGQUlMOiBEaWQgbm90 IHJlY2VpdmUgbGF5ZXJUcmVlRGlkQ2hhbmdlIGV2ZW50cy4iKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgUHJvdG9jb2xUZXN0LmxvZygiXG49PT0gVGVzdCBjb21wbGV0ZSwgYWxsIGV4cGVj dGVkIGNvbmRpdGlvbnMgbWV0ID09PSIpOwotCisgICAgICAgIFByb3RvY29sVGVzdC5sb2coIlxu PT09IFRlc3QgY29tcGxldGUsIGFsbCBleHBlY3RlZCBjb25kaXRpb25zIG1ldCA9PT0iKTsKICAg ICAgICAgUHJvdG9jb2xUZXN0LmNvbXBsZXRlVGVzdCgpOwogICAgIH07CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvbGluZS1jb2x1bW4tZXhwZWN0ZWQudHh0 CmluZGV4IDQ2ZDg2NjBiZTM5OTgyZWJlNGY5YmMwZTIzZGY2YWNiMjExMWZkMmIuLjIwMzNlYTFk M2YyZDFlMjkxMmU1MWMwMmM0ZDE1OTc3ZDlhZWMwOGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLWV4cGVjdGVkLnR4dApAQCAtMTAs NDkgKzEwLDYgQEAgUEFTUzogQ2FwdHVyaW5nIHN0YXJ0ZWQuCiAgICJzdGFydFRpbWUiOiAiPGZp bHRlcmVkPiIsCiAgICJkYXRhIjoge30sCiAgICJjaGlsZHJlbiI6IFsKLSAgICB7Ci0gICAgICAi c3RhcnRUaW1lIjogIjxmaWx0ZXJlZD4iLAotICAgICAgInN0YWNrVHJhY2UiOiBbCi0gICAgICAg IHsKLSAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogImNsaWNrIiwKLSAgICAgICAgICAidXJsIjog IltuYXRpdmUgY29kZV0iLAotICAgICAgICAgICJzY3JpcHRJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAg ICAgICAgICAibGluZU51bWJlciI6IDAsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDAKLSAg ICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAid2lsbENhbGxG dW5jdGlvblRlc3QiLAotICAgICAgICAgICJ1cmwiOiAidGltZWxpbmUvbGluZS1jb2x1bW4uaHRt bCIsCi0gICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJsaW5l TnVtYmVyIjogMjYsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDQ0Ci0gICAgICAgIH0sCi0g ICAgICAgIHsKLSAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogImdsb2JhbCBjb2RlIiwKLSAgICAg ICAgICAidXJsIjogIiIsCi0gICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAg ICAgICAgICJsaW5lTnVtYmVyIjogMSwKLSAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjEKLSAg ICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbHVhdGVX aXRoU2NvcGVFeHRlbnNpb24iLAotICAgICAgICAgICJ1cmwiOiAiW25hdGl2ZSBjb2RlXSIsCi0g ICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJsaW5lTnVtYmVy IjogMCwKLSAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMAotICAgICAgICB9LAotICAgICAgICB7 Ci0gICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICIiLAotICAgICAgICAgICJ1cmwiOiAiIiwKLSAg ICAgICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgImxpbmVOdW1iZXIi OiAxNDAsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDk3Ci0gICAgICAgIH0KLSAgICAgIF0s Ci0gICAgICAiZGF0YSI6IHt9LAotICAgICAgImZyYW1lSWQiOiAiPGZpbHRlcmVkPiIsCi0gICAg ICAidHlwZSI6ICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiIKLSAgICB9LAogICAgIHsKICAg ICAgICJzdGFydFRpbWUiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAiZnJhbWVJZCI6ICI8ZmlsdGVy ZWQ+IiwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNv bHVtbi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0 bWwKaW5kZXggNTc0MzdlZGJiM2UwYWIzZTdiMWJhYmNhYzRkNmExMGFmN2NkYjcyNC4uZWYxYTZi YjEyYzc0YmQzZTYzNjEzZTgzNTMyZTM4YmE1YzA2MDY4YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWwKQEAgLTQwLDcgKzQwLDExIEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIEluc3BlY3RvclByb3RvY29sLnNlbmRDb21tYW5kKCJQYWdlLmVu YWJsZSIsIHt9KTsKICAgICBJbnNwZWN0b3JQcm90b2NvbC5zZW5kQ29tbWFuZCgiVGltZWxpbmUu ZW5hYmxlIik7CiAKKyAgICAvLyBUbyBhdm9pZCBmbGFraW5lc3MgcHJpbnQgb25seSBldmVudHMg dGhhdCB3ZSBhbHdheXMgZXhwZWN0LgorICAgIGNvbnN0IGV2ZW50V2hpdGVsaXN0ID0gbmV3IFNl dChbIlJlbmRlcmluZ0ZyYW1lIiwgIkNvbnNvbGVQcm9maWxlIiwgIkV2ZW50RGlzcGF0Y2giLCAi RnVuY3Rpb25DYWxsIl0pOwogICAgIGZ1bmN0aW9uIHJlcGxhY2VyKGtleSwgdmFsdWUpIHsKKyAg ICAgICAgaWYgKGtleSA9PT0gImNoaWxkcmVuIiAmJiB0aGlzLnN0YXJ0VGltZSkKKyAgICAgICAg ICAgIHJldHVybiB2YWx1ZS5maWx0ZXIoZSA9PiBldmVudFdoaXRlbGlzdC5oYXMoZS50eXBlKSk7 CiAgICAgICAgIGlmIChrZXkgPT09ICJzdGFydFRpbWUiIHx8IGtleSA9PT0gImVuZFRpbWUiIHx8 IGtleSA9PT0gInNjcmlwdElkIiB8fCBrZXkgPT09ICJmcmFtZUlkIikKICAgICAgICAgICAgIHJl dHVybiAiPGZpbHRlcmVkPiI7CiAgICAgICAgIGlmIChrZXkgPT09ICJ1cmwiIHx8IGtleSA9PT0g InNjcmlwdE5hbWUiKQo= 380361 2019-10-07 14:13:40 -0700 2019-10-08 16:03:08 -0700 Patch bug-202649-20191007141340.patch text/plain 7253 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNzQ2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzAyZGQ2NWZmNzIxZTRiNjI1Yjlk NzFhOTE3YmE2YmU0NDBjZmE1Mi4uMjBlYjVhY2RmNzRmODljY2FkZGJiYTgzNjllN2NmNmYxMDUz MWNhYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTEwLTA0ICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGluc3BlY3Rv ci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLmh0bWwgYW5kICBpbnNwZWN0b3IvdGltZWxpbmUvbGlu ZS1jb2x1bW4uaHRtbCBhcmUgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMjY0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFVuZmxha2UgYSBjb3VwbGUgb2YgaW5zcGVjdG9yIHByb3RvY29sIHRl c3RzLiByMjUwNjU1IHJlcGxhY2VkIFRpbWVyLWJhc2VkIHF1ZXVlCisgICAgICAgIHdpdGggUnVu TG9vcC1iYXNlZCBvbmUgZm9yIGluc3BlY3RvciBtZXNzYWdlIGRpc3BhdGNoaW5nLiBUaGUgdGVz dHMgYXBwYXJlbnRseSByZWxpZWQKKyAgICAgICAgb24gdGhlIHRpbWluZyBvZiB0aGUgbWVzc2Fn ZSBkZWxpdmVyeSBhbmQgaGFkIGJlZW4gbGVzcyBmbGFreSBiZWZvcmUuIFVwZGF0ZWQgdGhlIHRl c3RzCisgICAgICAgIHRvIHdhaXQgZm9yIGV4cGxpY2l0IHNpZ25hbHMgcmF0aGVyIHRoYW4gcmVs eWluZyBvbiBldmVudCB0aW1pbmcuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvbGF5ZXJzL2xheWVy cy1mb3Itbm9kZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2xheWVycy9sYXll cnMtZm9yLW5vZGUuaHRtbDogVXBkYXRlZCB0aGUgdGVzdCB0byB3YWl0IGZvciB0aGUgZmlyc3QK KyAgICAgICAgTGF5ZXJUcmVlLmxheWVyVHJlZURpZENoYW5nZSBldmVudCBiZWZvcmUgcmVxdWVz dGluZyBpbml0aWFsIGxheWVyIHRyZWUuCisKKyAgICAgICAgQWxzbyBhZnRlciBhZGRpbmcgYSBu b2RlIHdhaXQgZm9yIG5leHQgUkFGIHRvIGF2b2lkIGZsYWtpbmVzcy4KKworICAgICAgICAqIGlu c3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5z cGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWw6IFRoZXJlIGEgc3R5bGUgcmVjYWxjIGV2 ZW50CisgICAgICAgIHdoaWNoIGFwcGVhcnMgaW50ZXJtaXR0ZW50bHkgaW4gdGhlIHJlY29yZGVk IHByb2ZpbGUgbWFraW5nIHRoZSB0ZXN0CisgICAgICAgIGZsYWt5LiBUbyBhdm9pZCB0aGF0IGR1 bXAgb25seSBldmVudHMgdGhhdCBhcmUgYWx3YXlzIHByZXNlbnQuCisKIDIwMTktMTAtMDQgIFRy dWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXlvdXQgVGVzdCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzLzJkY29udGV4dC9saW5lLXN0eWxlcy8yZC5s aW5lLmNhcC5yb3VuZC5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLWV4cGVjdGVkLnR4dAppbmRleCAzOTli YWNhMmM5OTk2M2I5MTljMDhlZjVhYTRiOTFhOGFhYTIxNDk2Li44YTU3MDY4OWI2MTY4OTJjYTBh MjY2Mzk0NmIyYjNkNmJmZjE0OTEzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Iv bGF5ZXJzL2xheWVycy1mb3Itbm9kZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2xheWVycy9sYXllcnMtZm9yLW5vZGUtZXhwZWN0ZWQudHh0CkBAIC0xMjYsNiArMTI2 LDEwIEBAIFBBU1MKIAogUEFTUwogCis9PT0gV2FpdCBmb3IgcmVxdWVzdEFuaW1hdGlvbkZyYW1l ID09PQorCitQQVNTCisKID09PSBHZXQgdGhlIG1vZGlmaWVkIGxheWVyIHRyZWUgPT09CiAKIFBB U1MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1u b2RlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvbGF5ZXJzL2xheWVycy1mb3Itbm9kZS5o dG1sCmluZGV4IDUzYjllMjA4YTljZGUzYjNkODNlNmM5YWYzYTJkOTc1ZmQyZTgxZjEuLmVkZWQ5 OGU2NjQ2MTFkODBiYzc3ZDc1ZjE2OTYyMTQ3MzY2ODdhMWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9sYXllcnMvbGF5ZXJzLWZvci1ub2RlLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2xheWVycy9sYXllcnMtZm9yLW5vZGUuaHRtbApAQCAtOSwzMSArOSwyNCBA QCBmdW5jdGlvbiBhZGRDb21wb3NpdGVkTGF5ZXIoKQogICAgIGVsZW1lbnQuY2xhc3NOYW1lID0g ImNvbXBvc2l0ZWQiOwogICAgIGVsZW1lbnQuaWQgPSAibGFzdC1lbGVtZW50IjsKICAgICBkb2N1 bWVudC5ib2R5LmFwcGVuZENoaWxkKGVsZW1lbnQpOworICAgIHJldHVybiBuZXcgUHJvbWlzZShy ZXNvbHZlID0+IHJlcXVlc3RBbmltYXRpb25GcmFtZShyZXNvbHZlKSk7CiB9OwogCiBmdW5jdGlv biB0ZXN0KCkKIHsKLSAgICB2YXIgZG9jdW1lbnROb2RlOwotICAgIHZhciBpbml0aWFsTGF5ZXJz OwotICAgIHZhciBldmVudHNDb3VudCA9IDA7CisgICAgbGV0IGRvY3VtZW50Tm9kZTsKKyAgICBs ZXQgaW5pdGlhbExheWVyczsKIAotICAgIEluc3BlY3RvclByb3RvY29sLmV2ZW50SGFuZGxlclsi TGF5ZXJUcmVlLmxheWVyVHJlZURpZENoYW5nZSJdID0gZnVuY3Rpb24gKG1lc3NhZ2VPYmplY3Qp IHsKLSAgICAgICAgZXZlbnRzQ291bnQrKzsKLSAgICB9OworICAgIHN0ZXAoeworICAgICAgICBu YW1lOiAiRW5hYmxlIHRoZSBMYXllclRyZWUgYWdlbnQiLAorICAgICAgICBjb21tYW5kOiAiTGF5 ZXJUcmVlLmVuYWJsZSIsCisgICAgICAgIHBhcmFtZXRlcnM6IHt9LAorICAgICAgICBjYWxsYmFj azogKCkgPT4ge30KKyAgICB9KTsKIAotICAgIGVuYWJsZUxheWVyVHJlZUFnZW50KCk7CisgICAg SW5zcGVjdG9yUHJvdG9jb2wuYXdhaXRFdmVudCh7ZXZlbnQ6ICJMYXllclRyZWUubGF5ZXJUcmVl RGlkQ2hhbmdlIn0pLnRoZW4oZ2V0RG9jdW1lbnQpOwogCi0gICAgZnVuY3Rpb24gZW5hYmxlTGF5 ZXJUcmVlQWdlbnQocmVzdWx0KQotICAgIHsKLSAgICAgICAgc3RlcCh7Ci0gICAgICAgICAgICBu YW1lOiAiRW5hYmxlIHRoZSBMYXllclRyZWUgYWdlbnQiLAotICAgICAgICAgICAgY29tbWFuZDog IkxheWVyVHJlZS5lbmFibGUiLAotICAgICAgICAgICAgcGFyYW1ldGVyczoge30sCi0gICAgICAg ICAgICBjYWxsYmFjazogZ2V0RG9jdW1lbnQKLSAgICAgICAgfSk7Ci0gICAgfTsKLSAgICAKLSAg ICBmdW5jdGlvbiBnZXREb2N1bWVudChyZXN1bHQpCisgICAgZnVuY3Rpb24gZ2V0RG9jdW1lbnQo KQogICAgIHsKICAgICAgICAgc3RlcCh7CiAgICAgICAgICAgICBuYW1lOiAiR2V0IHRoZSBEb2N1 bWVudCIsCkBAIC02NCw2ICs1NywxNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgICAgIG5h bWU6ICJNZXNzYWdlIHRoZSBwYWdlIHRvIGFkZCBhIG5ldyBjb21wb3NpdGVkIGxheWVyIiwKICAg ICAgICAgICAgIGNvbW1hbmQ6ICJSdW50aW1lLmV2YWx1YXRlIiwKICAgICAgICAgICAgIHBhcmFt ZXRlcnM6IHsiZXhwcmVzc2lvbiI6ICJhZGRDb21wb3NpdGVkTGF5ZXIoKSJ9LAorICAgICAgICAg ICAgY2FsbGJhY2s6IGF3YWl0UmVxdWVzdEFuaW1hdGlvbkZyYW1lCisgICAgICAgIH0pOworICAg IH07CisKKyAgICBmdW5jdGlvbiBhd2FpdFJlcXVlc3RBbmltYXRpb25GcmFtZShyZXN1bHQpCisg ICAgeworICAgICAgICBzdGVwKHsKKyAgICAgICAgICAgIG5hbWU6ICJXYWl0IGZvciByZXF1ZXN0 QW5pbWF0aW9uRnJhbWUiLAorICAgICAgICAgICAgY29tbWFuZDogIlJ1bnRpbWUuYXdhaXRQcm9t aXNlIiwKKyAgICAgICAgICAgIHBhcmFtZXRlcnM6IHsicHJvbWlzZU9iamVjdElkIjogcmVzdWx0 LnJlc3VsdC5vYmplY3RJZH0sCiAgICAgICAgICAgICBjYWxsYmFjazogZ2V0TW9kaWZpZWRMYXll clRyZWUKICAgICAgICAgfSk7CiAgICAgfTsKQEAgLTEwNiwxMSArMTA5LDcgQEAgZnVuY3Rpb24g dGVzdCgpCiAKICAgICBmdW5jdGlvbiBmaW5pc2hUZXN0KCkKICAgICB7Ci0gICAgICAgIGlmICgh ZXZlbnRzQ291bnQpCi0gICAgICAgICAgICBQcm90b2NvbFRlc3QubG9nKCJGQUlMOiBEaWQgbm90 IHJlY2VpdmUgbGF5ZXJUcmVlRGlkQ2hhbmdlIGV2ZW50cy4iKTsKLSAgICAgICAgZWxzZQotICAg ICAgICAgICAgUHJvdG9jb2xUZXN0LmxvZygiXG49PT0gVGVzdCBjb21wbGV0ZSwgYWxsIGV4cGVj dGVkIGNvbmRpdGlvbnMgbWV0ID09PSIpOwotCisgICAgICAgIFByb3RvY29sVGVzdC5sb2coIlxu PT09IFRlc3QgY29tcGxldGUsIGFsbCBleHBlY3RlZCBjb25kaXRpb25zIG1ldCA9PT0iKTsKICAg ICAgICAgUHJvdG9jb2xUZXN0LmNvbXBsZXRlVGVzdCgpOwogICAgIH07CiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGltZWxpbmUvbGluZS1jb2x1bW4tZXhwZWN0ZWQudHh0 CmluZGV4IDQ2ZDg2NjBiZTM5OTgyZWJlNGY5YmMwZTIzZGY2YWNiMjExMWZkMmIuLjIwMzNlYTFk M2YyZDFlMjkxMmU1MWMwMmM0ZDE1OTc3ZDlhZWMwOGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNvbHVtbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLWV4cGVjdGVkLnR4dApAQCAtMTAs NDkgKzEwLDYgQEAgUEFTUzogQ2FwdHVyaW5nIHN0YXJ0ZWQuCiAgICJzdGFydFRpbWUiOiAiPGZp bHRlcmVkPiIsCiAgICJkYXRhIjoge30sCiAgICJjaGlsZHJlbiI6IFsKLSAgICB7Ci0gICAgICAi c3RhcnRUaW1lIjogIjxmaWx0ZXJlZD4iLAotICAgICAgInN0YWNrVHJhY2UiOiBbCi0gICAgICAg IHsKLSAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogImNsaWNrIiwKLSAgICAgICAgICAidXJsIjog IltuYXRpdmUgY29kZV0iLAotICAgICAgICAgICJzY3JpcHRJZCI6ICI8ZmlsdGVyZWQ+IiwKLSAg ICAgICAgICAibGluZU51bWJlciI6IDAsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDAKLSAg ICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAid2lsbENhbGxG dW5jdGlvblRlc3QiLAotICAgICAgICAgICJ1cmwiOiAidGltZWxpbmUvbGluZS1jb2x1bW4uaHRt bCIsCi0gICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJsaW5l TnVtYmVyIjogMjYsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDQ0Ci0gICAgICAgIH0sCi0g ICAgICAgIHsKLSAgICAgICAgICAiZnVuY3Rpb25OYW1lIjogImdsb2JhbCBjb2RlIiwKLSAgICAg ICAgICAidXJsIjogIiIsCi0gICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAg ICAgICAgICJsaW5lTnVtYmVyIjogMSwKLSAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMjEKLSAg ICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAgICJmdW5jdGlvbk5hbWUiOiAiZXZhbHVhdGVX aXRoU2NvcGVFeHRlbnNpb24iLAotICAgICAgICAgICJ1cmwiOiAiW25hdGl2ZSBjb2RlXSIsCi0g ICAgICAgICAgInNjcmlwdElkIjogIjxmaWx0ZXJlZD4iLAotICAgICAgICAgICJsaW5lTnVtYmVy IjogMCwKLSAgICAgICAgICAiY29sdW1uTnVtYmVyIjogMAotICAgICAgICB9LAotICAgICAgICB7 Ci0gICAgICAgICAgImZ1bmN0aW9uTmFtZSI6ICIiLAotICAgICAgICAgICJ1cmwiOiAiIiwKLSAg ICAgICAgICAic2NyaXB0SWQiOiAiPGZpbHRlcmVkPiIsCi0gICAgICAgICAgImxpbmVOdW1iZXIi OiAxNDAsCi0gICAgICAgICAgImNvbHVtbk51bWJlciI6IDk3Ci0gICAgICAgIH0KLSAgICAgIF0s Ci0gICAgICAiZGF0YSI6IHt9LAotICAgICAgImZyYW1lSWQiOiAiPGZpbHRlcmVkPiIsCi0gICAg ICAidHlwZSI6ICJTY2hlZHVsZVN0eWxlUmVjYWxjdWxhdGlvbiIKLSAgICB9LAogICAgIHsKICAg ICAgICJzdGFydFRpbWUiOiAiPGZpbHRlcmVkPiIsCiAgICAgICAiZnJhbWVJZCI6ICI8ZmlsdGVy ZWQ+IiwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90aW1lbGluZS9saW5lLWNv bHVtbi5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0 bWwKaW5kZXggNTc0MzdlZGJiM2UwYWIzZTdiMWJhYmNhYzRkNmExMGFmN2NkYjcyNC4uZWYxYTZi YjEyYzc0YmQzZTYzNjEzZTgzNTMyZTM4YmE1YzA2MDY4YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3RpbWVsaW5lL2xpbmUtY29sdW1uLmh0bWwKQEAgLTQwLDcgKzQwLDExIEBAIGZ1 bmN0aW9uIHRlc3QoKQogICAgIEluc3BlY3RvclByb3RvY29sLnNlbmRDb21tYW5kKCJQYWdlLmVu YWJsZSIsIHt9KTsKICAgICBJbnNwZWN0b3JQcm90b2NvbC5zZW5kQ29tbWFuZCgiVGltZWxpbmUu ZW5hYmxlIik7CiAKKyAgICAvLyBUbyBhdm9pZCBmbGFraW5lc3MgcHJpbnQgb25seSBldmVudHMg dGhhdCB3ZSBhbHdheXMgZXhwZWN0LgorICAgIGNvbnN0IGV2ZW50V2hpdGVsaXN0ID0gbmV3IFNl dChbIlJlbmRlcmluZ0ZyYW1lIiwgIkNvbnNvbGVQcm9maWxlIiwgIkV2ZW50RGlzcGF0Y2giLCAi RnVuY3Rpb25DYWxsIl0pOwogICAgIGZ1bmN0aW9uIHJlcGxhY2VyKGtleSwgdmFsdWUpIHsKKyAg ICAgICAgaWYgKGtleSA9PT0gImNoaWxkcmVuIiAmJiB0aGlzLnN0YXJ0VGltZSkKKyAgICAgICAg ICAgIHJldHVybiB2YWx1ZS5maWx0ZXIoZSA9PiBldmVudFdoaXRlbGlzdC5oYXMoZS50eXBlKSk7 CiAgICAgICAgIGlmIChrZXkgPT09ICJzdGFydFRpbWUiIHx8IGtleSA9PT0gImVuZFRpbWUiIHx8 IGtleSA9PT0gInNjcmlwdElkIiB8fCBrZXkgPT09ICJmcmFtZUlkIikKICAgICAgICAgICAgIHJl dHVybiAiPGZpbHRlcmVkPiI7CiAgICAgICAgIGlmIChrZXkgPT09ICJ1cmwiIHx8IGtleSA9PT0g InNjcmlwdE5hbWUiKQo=