194282 2019-02-05 00:09:11 -0800 Web Inspector: Fix modify-css-property-race.html test failures 2019-02-05 23:25:35 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 nvasilyev nvasilyev commit-queue hi inspector-bugzilla-changes joepeck mattbaker simon.fraser sroberts webkit-bug-importer oldest_to_newest 1502289 0 nvasilyev 2019-02-05 00:09:11 -0800 Introduced by Bug 192739: Web Inspector: Styles: fix race conditions when editing. 1502293 1 361166 nvasilyev 2019-02-05 00:15:41 -0800 Created attachment 361166 Patch Run tests on EWS. 1502294 2 361167 nvasilyev 2019-02-05 00:21:21 -0800 Created attachment 361167 Patch Don't review. This is for EWS. 1502296 3 361168 nvasilyev 2019-02-05 00:31:50 -0800 Created attachment 361168 Patch 1502297 4 361169 nvasilyev 2019-02-05 00:45:44 -0800 Created attachment 361169 Patch 1502419 5 361169 joepeck 2019-02-05 10:38:47 -0800 Comment on attachment 361169 Patch This patch hasn't changed anything yet, right? 1502447 6 nvasilyev 2019-02-05 11:27:56 -0800 (In reply to Joseph Pecoraro from comment #5) > Comment on attachment 361169 [details] > Patch > > This patch hasn't changed anything yet, right? It did! expectGreaterThan(43, 42) logs "PASS: expectGreaterThan(43, 42)". Imagine, the actual value would be 44 or 45. It would still pass the assertion, but it would log "PASS: expectGreaterThan(45, 42)", causing the test to fail. 1502454 7 361169 mattbaker 2019-02-05 12:05:42 -0800 Comment on attachment 361169 Patch rs=me 1502455 8 mattbaker 2019-02-05 12:07:20 -0800 Let's put a comment in the change log that this fixing a test failure introduced in https://trac.webkit.org/changeset/240946. 1502456 9 361208 nvasilyev 2019-02-05 12:13:02 -0800 Created attachment 361208 Patch 1502457 10 361209 nvasilyev 2019-02-05 12:19:09 -0800 Created attachment 361209 Patch 1502470 11 361209 commit-queue 2019-02-05 12:35:16 -0800 Comment on attachment 361209 Patch Clearing flags on attachment: 361209 Committed r240989: <https://trac.webkit.org/changeset/240989> 1502471 12 commit-queue 2019-02-05 12:35:18 -0800 All reviewed patches have been landed. Closing bug. 1502472 13 webkit-bug-importer 2019-02-05 12:36:29 -0800 <rdar://problem/47827420> 1502644 14 sroberts 2019-02-05 18:12:53 -0800 test is still a flaky failure on Mac WK2, WK1 Debug Reproduced with: run-webkit-tests t240999 inspector/css/modify-css-property-race.html --iterations 500 -f --debug -1 run-webkit-tests t240999 inspector/css/modify-css-property-race.html --iterations 500 -f --debug run-webkit-tests t240999 inspector/css/modify-css-property-race.html --iterations 500 -f Flakiness dashboard: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=inspector%2Fcss%2Fmodify-css-property-race.html Diff: --- /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/inspector/css/modify-css-property-race-expected.txt +++ /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/inspector/css/modify-css-property-race-actual.txt @@ -3,9 +3,15 @@ == Running test suite: ModifyCSSProperty -- Running test case: ModifyCSSPropertyRace.ChangeInlineStyle -PASS: expectGreaterThan(43, 42) -PASS: expectGreaterThan(43, 42) -PASS: Value updated to "10px". +FAIL: expectGreaterThan(42, 42) + Expected: greater than 42 + Actual: 42 +FAIL: expectGreaterThan(42, 42) + Expected: greater than 42 + Actual: 42 +FAIL: Value updated to "10px". + Expected: "10px" + Actual: "44px" PASS: CSSStyleDeclaration text should update. -PASS: expectGreaterThanOrEqual(10, 10) +PASS: expectGreaterThanOrEqual(44, 10) 1502646 15 nvasilyev 2019-02-05 18:20:14 -0800 Thanks, I'm working on the fix in https://bugs.webkit.org/show_bug.cgi?id=194318. 1502702 16 nvasilyev 2019-02-05 23:25:35 -0800 modify-css-property-race.html shouldn't be flaky after https://trac.webkit.org/changeset/241011 361166 2019-02-05 00:15:41 -0800 2019-02-05 00:21:21 -0800 Patch patch.txt text/plain 2403 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uNmFkYWMyY2VlYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sOgorCiAyMDE5 LTAyLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb aVBhZF0gSW5pdGlhbCB0ZXN0IGdhcmRlbmluZyAoUGFydCAxKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKaW5kZXgg ODNjNjkxZDAxODMuLjlkODM4ZGFiYjYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKQEAgLTY2LDE3ICs2Niwx NyBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAgICAgICAgICAgZnVuY3Rpb24gc3R5bGVEZWNvcmF0 aW9uVXBkYXRlZChldmVudCkgewogICAgICAgICAgICAgICAgIGlmICghdXBkYXRlQ291bnQpIHsK ICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVlTnVtYmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVy dHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwgNDIpOworICAgICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdo dCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQyLiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAodXBkYXRlQ291bnQgPT09IDEpIHsKICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVlTnVt YmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwg NDIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFu KHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQyLiIpOwog ICAgICAgICAgICAgICAgICAgICBnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUgPSAiMTBw eCI7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1cGRhdGVDb3VudCA9PT0gMikgewogICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKGdldFByb3BlcnR5KCJo ZWlnaHQiKS5yYXdWYWx1ZSwgIjEwcHgiLCBgVmFsdWUgdXBkYXRlZCB0byAiMTBweCIuYCk7CiAg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZ2V0SW5saW5lU3R5 bGVEZWNsYXJhdGlvbigpLnRleHQsICJoZWlnaHQ6IDEwcHg7IiwgIkNTU1N0eWxlRGVjbGFyYXRp b24gdGV4dCBzaG91bGQgdXBkYXRlLiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgICAgIGxldCB2YWx1ZU51bWJlciA9IHBhcnNlSW50KGdldFByb3BlcnR5KCJo ZWlnaHQiKS5yYXdWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVtYmVyLCAxMCk7CisgICAgICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVtYmVyLCAx MCwgIkhlaWdodCBzaG91bGQgYmUgMTAuIik7CiAKICAgICAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic3RvcEV4cGFuZGluZygpIik7CiAgICAgICAgICAgICAg ICAgICAgIFdJLkNTU1N0eWxlRGVjbGFyYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NT dHlsZURlY2xhcmF0aW9uLkV2ZW50LlByb3BlcnRpZXNDaGFuZ2VkLCBzdHlsZURlY29yYXRpb25V cGRhdGVkKTsK 361167 2019-02-05 00:21:21 -0800 2019-02-05 00:31:50 -0800 Patch patch.txt text/plain 2403 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uNmFkYWMyY2VlYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sOgorCiAyMDE5 LTAyLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb aVBhZF0gSW5pdGlhbCB0ZXN0IGdhcmRlbmluZyAoUGFydCAxKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UuaHRtbCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKaW5kZXgg ODNjNjkxZDAxODMuLjlkODM4ZGFiYjYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKQEAgLTY2LDE3ICs2Niwx NyBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAgICAgICAgICAgZnVuY3Rpb24gc3R5bGVEZWNvcmF0 aW9uVXBkYXRlZChldmVudCkgewogICAgICAgICAgICAgICAgIGlmICghdXBkYXRlQ291bnQpIHsK ICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVlTnVtYmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVy dHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwgNDIpOworICAgICAgICAgICAgICAgICAg ICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdo dCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQyLiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAodXBkYXRlQ291bnQgPT09IDEpIHsKICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVlTnVt YmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwg NDIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFu KHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQyLiIpOwog ICAgICAgICAgICAgICAgICAgICBnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUgPSAiMTBw eCI7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1cGRhdGVDb3VudCA9PT0gMikgewogICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKGdldFByb3BlcnR5KCJo ZWlnaHQiKS5yYXdWYWx1ZSwgIjEwcHgiLCBgVmFsdWUgdXBkYXRlZCB0byAiMTBweCIuYCk7CiAg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZ2V0SW5saW5lU3R5 bGVEZWNsYXJhdGlvbigpLnRleHQsICJoZWlnaHQ6IDEwcHg7IiwgIkNTU1N0eWxlRGVjbGFyYXRp b24gdGV4dCBzaG91bGQgdXBkYXRlLiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgICAgIGxldCB2YWx1ZU51bWJlciA9IHBhcnNlSW50KGdldFByb3BlcnR5KCJo ZWlnaHQiKS5yYXdWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVtYmVyLCAxMCk7CisgICAgICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVtYmVyLCAx MCwgIkhlaWdodCBzaG91bGQgYmUgMTAuIik7CiAKICAgICAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic3RvcEV4cGFuZGluZygpIik7CiAgICAgICAgICAgICAg ICAgICAgIFdJLkNTU1N0eWxlRGVjbGFyYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NT dHlsZURlY2xhcmF0aW9uLkV2ZW50LlByb3BlcnRpZXNDaGFuZ2VkLCBzdHlsZURlY29yYXRpb25V cGRhdGVkKTsK 361168 2019-02-05 00:31:50 -0800 2019-02-05 00:45:44 -0800 Patch patch.txt text/plain 3237 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uNmFkYWMyY2VlYTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sOgorCiAyMDE5 LTAyLTA0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb aVBhZF0gSW5pdGlhbCB0ZXN0IGdhcmRlbmluZyAoUGFydCAxKQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhw ZWN0ZWQudHh0CmluZGV4IGI0ZTg1N2Q1NGQ1Li5hYWExMDE1MTIzNyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1y YWNlLWV4cGVjdGVkLnR4dApAQCAtMyw5ICszLDkgQEAgVGVzdGluZyB0aGF0IGNoYW5nZXMgdG8g InN0eWxlIiBhdHRyaWJ1dGUgbWFkZSBmcm9tIHBhZ2UncyBKYXZhU2NyaXB0IGFyZSBpZ25vcmUK IAogPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBNb2RpZnlDU1NQcm9wZXJ0eQogLS0gUnVubmluZyB0 ZXN0IGNhc2U6IE1vZGlmeUNTU1Byb3BlcnR5UmFjZS5DaGFuZ2VJbmxpbmVTdHlsZQotUEFTUzog ZXhwZWN0R3JlYXRlclRoYW4oNDMsIDQyKQotUEFTUzogZXhwZWN0R3JlYXRlclRoYW4oNDMsIDQy KQorUEFTUzogSGVpZ2h0IHNob3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4KK1BBU1M6IEhlaWdo dCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQycHguCiBQQVNTOiBWYWx1ZSB1cGRhdGVkIHRvICIx MHB4Ii4KIFBBU1M6IENTU1N0eWxlRGVjbGFyYXRpb24gdGV4dCBzaG91bGQgdXBkYXRlLgotUEFT UzogZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKDEwLCAxMCkKK1BBU1M6IEhlaWdodCBzaG91bGQg YmUgMTBweC4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnkt Y3NzLXByb3BlcnR5LXJhY2UuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5 LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKaW5kZXggODNjNjkxZDAxODMuLjA0ZTNmOGQxN2I1IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHkt cmFjZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9w ZXJ0eS1yYWNlLmh0bWwKQEAgLTY2LDE3ICs2NiwxNyBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAg ICAgICAgICAgZnVuY3Rpb24gc3R5bGVEZWNvcmF0aW9uVXBkYXRlZChldmVudCkgewogICAgICAg ICAgICAgICAgIGlmICghdXBkYXRlQ291bnQpIHsKICAgICAgICAgICAgICAgICAgICAgbGV0IHZh bHVlTnVtYmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAg ICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51 bWJlciwgNDIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0 ZXJUaGFuKHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQy cHguIik7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1cGRhdGVDb3VudCA9PT0gMSkgewog ICAgICAgICAgICAgICAgICAgICBsZXQgdmFsdWVOdW1iZXIgPSBwYXJzZUludChnZXRQcm9wZXJ0 eSgiaGVpZ2h0IikucmF3VmFsdWUpOwotICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVyLCA0Mik7CisgICAgICAgICAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW4odmFsdWVOdW1iZXIsIDQyLCAiSGVpZ2h0 IHNob3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4iKTsKICAgICAgICAgICAgICAgICAgICAgZ2V0 UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlID0gIjEwcHgiOwogICAgICAgICAgICAgICAgIH0g ZWxzZSBpZiAodXBkYXRlQ291bnQgPT09IDIpIHsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RFcXVhbChnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUsICIxMHB4 IiwgYFZhbHVlIHVwZGF0ZWQgdG8gIjEwcHgiLmApOwogICAgICAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV4cGVjdEVxdWFsKGdldElubGluZVN0eWxlRGVjbGFyYXRpb24oKS50ZXh0LCAi aGVpZ2h0OiAxMHB4OyIsICJDU1NTdHlsZURlY2xhcmF0aW9uIHRleHQgc2hvdWxkIHVwZGF0ZS4i KTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBsZXQgdmFs dWVOdW1iZXIgPSBwYXJzZUludChnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUpOwotICAg ICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFuT3JFcXVhbCh2 YWx1ZU51bWJlciwgMTApOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVj dEdyZWF0ZXJUaGFuT3JFcXVhbCh2YWx1ZU51bWJlciwgMTAsICJIZWlnaHQgc2hvdWxkIGJlIDEw cHguIik7CiAKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFn ZSgic3RvcEV4cGFuZGluZygpIik7CiAgICAgICAgICAgICAgICAgICAgIFdJLkNTU1N0eWxlRGVj bGFyYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5lcihXSS5DU1NTdHlsZURlY2xhcmF0aW9uLkV2ZW50 LlByb3BlcnRpZXNDaGFuZ2VkLCBzdHlsZURlY29yYXRpb25VcGRhdGVkKTsK 361169 2019-02-05 00:45:44 -0800 2019-02-05 12:13:02 -0800 Patch patch.txt text/plain 3479 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uMzdhYmNhODNiOGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBpbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS1leHBlY3RlZC50eHQ6 CisgICAgICAgICogaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UuaHRtbDoK KwogMjAxOS0wMi0wNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lQYWRdIEluaXRpYWwgdGVzdCBnYXJkZW5pbmcgKFBhcnQgMSkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1y YWNlLWV4cGVjdGVkLnR4dAppbmRleCBiNGU4NTdkNTRkNS4uMTM5MTI1NDg4YWMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJv cGVydHktcmFjZS1leHBlY3RlZC50eHQKQEAgLTMsOSArMyw5IEBAIFRlc3RpbmcgdGhhdCBjaGFu Z2VzIHRvICJzdHlsZSIgYXR0cmlidXRlIG1hZGUgZnJvbSBwYWdlJ3MgSmF2YVNjcmlwdCBhcmUg aWdub3JlCiAKID09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogTW9kaWZ5Q1NTUHJvcGVydHkKIC0tIFJ1 bm5pbmcgdGVzdCBjYXNlOiBNb2RpZnlDU1NQcm9wZXJ0eVJhY2UuQ2hhbmdlSW5saW5lU3R5bGUK LVBBU1M6IGV4cGVjdEdyZWF0ZXJUaGFuKDQzLCA0MikKLVBBU1M6IGV4cGVjdEdyZWF0ZXJUaGFu KDQzLCA0MikKLVBBU1M6IFZhbHVlIHVwZGF0ZWQgdG8gIjEwcHgiLgorUEFTUzogSGVpZ2h0IHNo b3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4KK1BBU1M6IEhlaWdodCBzaG91bGQgYmUgZ3JlYXRl ciB0aGFuIDQycHguCitQQVNTOiBIZWlnaHQgc2hvdWxkIGJlIDEwcHguCiBQQVNTOiBDU1NTdHls ZURlY2xhcmF0aW9uIHRleHQgc2hvdWxkIHVwZGF0ZS4KLVBBU1M6IGV4cGVjdEdyZWF0ZXJUaGFu T3JFcXVhbCgxMCwgMTApCitQQVNTOiBIZWlnaHQgc2hvdWxkIGJlIGdyZWF0ZXIgb3IgZXF1YWwg MTBweC4KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3Nz LXByb3BlcnR5LXJhY2UuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNz cy1wcm9wZXJ0eS1yYWNlLmh0bWwKaW5kZXggODNjNjkxZDAxODMuLmY3MmI0ZjAyMGVlIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFj ZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0 eS1yYWNlLmh0bWwKQEAgLTY2LDE3ICs2NiwxNyBAQCBmdW5jdGlvbiB0ZXN0KCkgewogICAgICAg ICAgICAgZnVuY3Rpb24gc3R5bGVEZWNvcmF0aW9uVXBkYXRlZChldmVudCkgewogICAgICAgICAg ICAgICAgIGlmICghdXBkYXRlQ291bnQpIHsKICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVl TnVtYmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJl ciwgNDIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJU aGFuKHZhbHVlTnVtYmVyLCA0MiwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQycHgu Iik7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1cGRhdGVDb3VudCA9PT0gMSkgewogICAg ICAgICAgICAgICAgICAgICBsZXQgdmFsdWVOdW1iZXIgPSBwYXJzZUludChnZXRQcm9wZXJ0eSgi aGVpZ2h0IikucmF3VmFsdWUpOwotICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVyLCA0Mik7CisgICAgICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW4odmFsdWVOdW1iZXIsIDQyLCAiSGVpZ2h0IHNo b3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4iKTsKICAgICAgICAgICAgICAgICAgICAgZ2V0UHJv cGVydHkoImhlaWdodCIpLnJhd1ZhbHVlID0gIjEwcHgiOwogICAgICAgICAgICAgICAgIH0gZWxz ZSBpZiAodXBkYXRlQ291bnQgPT09IDIpIHsKLSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5leHBlY3RFcXVhbChnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUsICIxMHB4Iiwg YFZhbHVlIHVwZGF0ZWQgdG8gIjEwcHgiLmApOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKGdldFByb3BlcnR5KCJoZWlnaHQiKS5yYXdWYWx1ZSwgIjEwcHgi LCAiSGVpZ2h0IHNob3VsZCBiZSAxMHB4LiIpOwogICAgICAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKGdldElubGluZVN0eWxlRGVjbGFyYXRpb24oKS50ZXh0LCAiaGVp Z2h0OiAxMHB4OyIsICJDU1NTdHlsZURlY2xhcmF0aW9uIHRleHQgc2hvdWxkIHVwZGF0ZS4iKTsK ICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBsZXQgdmFsdWVO dW1iZXIgPSBwYXJzZUludChnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUpOwotICAgICAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFuT3JFcXVhbCh2YWx1 ZU51bWJlciwgMTApOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdy ZWF0ZXJUaGFuT3JFcXVhbCh2YWx1ZU51bWJlciwgMTAsICJIZWlnaHQgc2hvdWxkIGJlIGdyZWF0 ZXIgb3IgZXF1YWwgMTBweC4iKTsKIAogICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV2YWx1YXRlSW5QYWdlKCJzdG9wRXhwYW5kaW5nKCkiKTsKICAgICAgICAgICAgICAgICAgICAg V0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5yZW1vdmVFdmVudExpc3RlbmVyKFdJLkNTU1N0eWxlRGVj bGFyYXRpb24uRXZlbnQuUHJvcGVydGllc0NoYW5nZWQsIHN0eWxlRGVjb3JhdGlvblVwZGF0ZWQp Owo= 361208 2019-02-05 12:13:02 -0800 2019-02-05 12:19:09 -0800 Patch patch.txt text/plain 3609 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uZDU2OTE0M2MxYmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWF0dCBCYWtlci4KKworICAgICAgICBQ cm92aWRlIGEgbWVzc2FnZSBmb3IgZXhwZWN0R3JlYXRlclRoYW4gYXNzZXJ0IHNvIGl0IGRvZXNu J3QgbG9nIHRoZSBhY3R1YWwgdmFsdWVzCisgICAgICAgIHdoaWNoIGNhdXNlZCB0aGUgdGVzdCB0 byBmYWlsLgorCisgICAgICAgICogaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJh Y2UtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9w ZXJ0eS1yYWNlLmh0bWw6CisKIDIwMTktMDItMDQgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRA YXBwbGUuY29tPgogCiAgICAgICAgIFtpUGFkXSBJbml0aWFsIHRlc3QgZ2FyZGVuaW5nIChQYXJ0 IDEpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJv cGVydHktcmFjZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlm eS1jc3MtcHJvcGVydHktcmFjZS1leHBlY3RlZC50eHQKaW5kZXggYjRlODU3ZDU0ZDUuLjEzOTEy NTQ4OGFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3Mt cHJvcGVydHktcmFjZS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQudHh0CkBAIC0zLDkgKzMsOSBAQCBU ZXN0aW5nIHRoYXQgY2hhbmdlcyB0byAic3R5bGUiIGF0dHJpYnV0ZSBtYWRlIGZyb20gcGFnZSdz IEphdmFTY3JpcHQgYXJlIGlnbm9yZQogCiA9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6IE1vZGlmeUNT U1Byb3BlcnR5CiAtLSBSdW5uaW5nIHRlc3QgY2FzZTogTW9kaWZ5Q1NTUHJvcGVydHlSYWNlLkNo YW5nZUlubGluZVN0eWxlCi1QQVNTOiBleHBlY3RHcmVhdGVyVGhhbig0MywgNDIpCi1QQVNTOiBl eHBlY3RHcmVhdGVyVGhhbig0MywgNDIpCi1QQVNTOiBWYWx1ZSB1cGRhdGVkIHRvICIxMHB4Ii4K K1BBU1M6IEhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQycHguCitQQVNTOiBIZWlnaHQg c2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiA0MnB4LgorUEFTUzogSGVpZ2h0IHNob3VsZCBiZSAxMHB4 LgogUEFTUzogQ1NTU3R5bGVEZWNsYXJhdGlvbiB0ZXh0IHNob3VsZCB1cGRhdGUuCi1QQVNTOiBl eHBlY3RHcmVhdGVyVGhhbk9yRXF1YWwoMTAsIDEwKQorUEFTUzogSGVpZ2h0IHNob3VsZCBiZSBn cmVhdGVyIG9yIGVxdWFsIDEwcHguCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sCmluZGV4IDgzYzY5MWQwMTgzLi5m NzJiNGYwMjBlZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnkt Y3NzLXByb3BlcnR5LXJhY2UuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY3NzL21v ZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sCkBAIC02NiwxNyArNjYsMTcgQEAgZnVuY3Rpb24g dGVzdCgpIHsKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0eWxlRGVjb3JhdGlvblVwZGF0ZWQoZXZl bnQpIHsKICAgICAgICAgICAgICAgICBpZiAoIXVwZGF0ZUNvdW50KSB7CiAgICAgICAgICAgICAg ICAgICAgIGxldCB2YWx1ZU51bWJlciA9IHBhcnNlSW50KGdldFByb3BlcnR5KCJoZWlnaHQiKS5y YXdWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRl clRoYW4odmFsdWVOdW1iZXIsIDQyKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwgNDIsICJIZWlnaHQgc2hvdWxkIGJlIGdy ZWF0ZXIgdGhhbiA0MnB4LiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAodXBkYXRlQ291 bnQgPT09IDEpIHsKICAgICAgICAgICAgICAgICAgICAgbGV0IHZhbHVlTnVtYmVyID0gcGFyc2VJ bnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJhd1ZhbHVlKTsKLSAgICAgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbih2YWx1ZU51bWJlciwgNDIpOworICAgICAg ICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVy LCA0MiwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDQycHguIik7CiAgICAgICAgICAg ICAgICAgICAgIGdldFByb3BlcnR5KCJoZWlnaHQiKS5yYXdWYWx1ZSA9ICIxMHB4IjsKICAgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKHVwZGF0ZUNvdW50ID09PSAyKSB7Ci0gICAgICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJh d1ZhbHVlLCAiMTBweCIsIGBWYWx1ZSB1cGRhdGVkIHRvICIxMHB4Ii5gKTsKKyAgICAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChnZXRQcm9wZXJ0eSgiaGVpZ2h0Iiku cmF3VmFsdWUsICIxMHB4IiwgIkhlaWdodCBzaG91bGQgYmUgMTBweC4iKTsKICAgICAgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChnZXRJbmxpbmVTdHlsZURlY2xhcmF0 aW9uKCkudGV4dCwgImhlaWdodDogMTBweDsiLCAiQ1NTU3R5bGVEZWNsYXJhdGlvbiB0ZXh0IHNo b3VsZCB1cGRhdGUuIik7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICAgICAgbGV0IHZhbHVlTnVtYmVyID0gcGFyc2VJbnQoZ2V0UHJvcGVydHkoImhlaWdodCIpLnJh d1ZhbHVlKTsKLSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVy VGhhbk9yRXF1YWwodmFsdWVOdW1iZXIsIDEwKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RHcmVhdGVyVGhhbk9yRXF1YWwodmFsdWVOdW1iZXIsIDEwLCAiSGVpZ2h0 IHNob3VsZCBiZSBncmVhdGVyIG9yIGVxdWFsIDEwcHguIik7CiAKICAgICAgICAgICAgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgic3RvcEV4cGFuZGluZygpIik7CiAgICAg ICAgICAgICAgICAgICAgIFdJLkNTU1N0eWxlRGVjbGFyYXRpb24ucmVtb3ZlRXZlbnRMaXN0ZW5l cihXSS5DU1NTdHlsZURlY2xhcmF0aW9uLkV2ZW50LlByb3BlcnRpZXNDaGFuZ2VkLCBzdHlsZURl Y29yYXRpb25VcGRhdGVkKTsK 361209 2019-02-05 12:19:09 -0800 2019-02-05 12:35:16 -0800 Patch patch.txt text/plain 3625 nvasilyev ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZDA2YjAwNGZjMy4uYzgyN2I3MmY5NzYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAor MjAxOS0wMi0wNSAgTmlraXRhIFZhc2lseWV2ICA8bnZhc2lseWV2QGFwcGxlLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBGaXggbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwgdGVz dCBmYWlsdXJlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk0MjgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWF0dCBCYWtlci4KKworICAgICAgICBG aXggdGVzdCBmYWlsdXJlcyBpbnRyb2R1Y2VkIGJ5IHIyNDA5NDYgYnkgcHJvdmlkaW5nIGEgbWVz c2FnZSBmb3IgZXhwZWN0R3JlYXRlclRoYW4gYXNzZXJ0LAorICAgICAgICBzbyBpdCBkb2Vzbid0 IGxvZyB0aGUgYWN0dWFsIHZhbHVlcy4KKworICAgICAgICAqIGluc3BlY3Rvci9jc3MvbW9kaWZ5 LWNzcy1wcm9wZXJ0eS1yYWNlLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvY3Nz L21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sOgorCiAyMDE5LTAyLTA0ICBKb25hdGhhbiBC ZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbaVBhZF0gSW5pdGlhbCB0ZXN0 IGdhcmRlbmluZyAoUGFydCAxKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2Nz cy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQudHh0CmluZGV4IGI0 ZTg1N2Q1NGQ1Li4xMzkxMjU0ODhhYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLWV4cGVjdGVkLnR4dApA QCAtMyw5ICszLDkgQEAgVGVzdGluZyB0aGF0IGNoYW5nZXMgdG8gInN0eWxlIiBhdHRyaWJ1dGUg bWFkZSBmcm9tIHBhZ2UncyBKYXZhU2NyaXB0IGFyZSBpZ25vcmUKIAogPT0gUnVubmluZyB0ZXN0 IHN1aXRlOiBNb2RpZnlDU1NQcm9wZXJ0eQogLS0gUnVubmluZyB0ZXN0IGNhc2U6IE1vZGlmeUNT U1Byb3BlcnR5UmFjZS5DaGFuZ2VJbmxpbmVTdHlsZQotUEFTUzogZXhwZWN0R3JlYXRlclRoYW4o NDMsIDQyKQotUEFTUzogZXhwZWN0R3JlYXRlclRoYW4oNDMsIDQyKQotUEFTUzogVmFsdWUgdXBk YXRlZCB0byAiMTBweCIuCitQQVNTOiBIZWlnaHQgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiA0MnB4 LgorUEFTUzogSGVpZ2h0IHNob3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4KK1BBU1M6IEhlaWdo dCBzaG91bGQgYmUgMTBweC4KIFBBU1M6IENTU1N0eWxlRGVjbGFyYXRpb24gdGV4dCBzaG91bGQg dXBkYXRlLgotUEFTUzogZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKDEwLCAxMCkKK1BBU1M6IEhl aWdodCBzaG91bGQgYmUgZ3JlYXRlciBvciBlcXVhbCAxMHB4LgogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvY3NzL21vZGlmeS1jc3MtcHJvcGVydHktcmFjZS5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UuaHRtbAppbmRl eCA4M2M2OTFkMDE4My4uZjcyYjRmMDIwZWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9jc3MvbW9kaWZ5LWNzcy1wcm9wZXJ0eS1yYWNlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL2Nzcy9tb2RpZnktY3NzLXByb3BlcnR5LXJhY2UuaHRtbApAQCAtNjYsMTcgKzY2 LDE3IEBAIGZ1bmN0aW9uIHRlc3QoKSB7CiAgICAgICAgICAgICBmdW5jdGlvbiBzdHlsZURlY29y YXRpb25VcGRhdGVkKGV2ZW50KSB7CiAgICAgICAgICAgICAgICAgaWYgKCF1cGRhdGVDb3VudCkg ewogICAgICAgICAgICAgICAgICAgICBsZXQgdmFsdWVOdW1iZXIgPSBwYXJzZUludChnZXRQcm9w ZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUpOwotICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdEdyZWF0ZXJUaGFuKHZhbHVlTnVtYmVyLCA0Mik7CisgICAgICAgICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW4odmFsdWVOdW1iZXIsIDQyLCAiSGVp Z2h0IHNob3VsZCBiZSBncmVhdGVyIHRoYW4gNDJweC4iKTsKICAgICAgICAgICAgICAgICB9IGVs c2UgaWYgKHVwZGF0ZUNvdW50ID09PSAxKSB7CiAgICAgICAgICAgICAgICAgICAgIGxldCB2YWx1 ZU51bWJlciA9IHBhcnNlSW50KGdldFByb3BlcnR5KCJoZWlnaHQiKS5yYXdWYWx1ZSk7Ci0gICAg ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW4odmFsdWVOdW1i ZXIsIDQyKTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RHcmVhdGVy VGhhbih2YWx1ZU51bWJlciwgNDIsICJIZWlnaHQgc2hvdWxkIGJlIGdyZWF0ZXIgdGhhbiA0MnB4 LiIpOwogICAgICAgICAgICAgICAgICAgICBnZXRQcm9wZXJ0eSgiaGVpZ2h0IikucmF3VmFsdWUg PSAiMTBweCI7CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh1cGRhdGVDb3VudCA9PT0gMikg ewotICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKGdldFByb3Bl cnR5KCJoZWlnaHQiKS5yYXdWYWx1ZSwgIjEwcHgiLCBgVmFsdWUgdXBkYXRlZCB0byAiMTBweCIu YCk7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZ2V0UHJv cGVydHkoImhlaWdodCIpLnJhd1ZhbHVlLCAiMTBweCIsICJIZWlnaHQgc2hvdWxkIGJlIDEwcHgu Iik7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZ2V0SW5s aW5lU3R5bGVEZWNsYXJhdGlvbigpLnRleHQsICJoZWlnaHQ6IDEwcHg7IiwgIkNTU1N0eWxlRGVj bGFyYXRpb24gdGV4dCBzaG91bGQgdXBkYXRlLiIpOwogICAgICAgICAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICAgICAgICAgIGxldCB2YWx1ZU51bWJlciA9IHBhcnNlSW50KGdldFByb3Bl cnR5KCJoZWlnaHQiKS5yYXdWYWx1ZSk7Ci0gICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVtYmVyLCAxMCk7CisgICAgICAgICAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0R3JlYXRlclRoYW5PckVxdWFsKHZhbHVlTnVt YmVyLCAxMCwgIkhlaWdodCBzaG91bGQgYmUgZ3JlYXRlciBvciBlcXVhbCAxMHB4LiIpOwogCiAg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoInN0b3BFeHBh bmRpbmcoKSIpOwogICAgICAgICAgICAgICAgICAgICBXSS5DU1NTdHlsZURlY2xhcmF0aW9uLnJl bW92ZUV2ZW50TGlzdGVuZXIoV0kuQ1NTU3R5bGVEZWNsYXJhdGlvbi5FdmVudC5Qcm9wZXJ0aWVz Q2hhbmdlZCwgc3R5bGVEZWNvcmF0aW9uVXBkYXRlZCk7Cg==