158320 2016-06-02 15:22:08 -0700 LayoutTest tiled-drawing/scrolling/latched-div-with-scroll-snap.html is flaky 2016-06-21 16:32:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryanhaddad zalan ap bfulgham cdumez commit-queue simon.fraser zalan oldest_to_newest 1198708 0 ryanhaddad 2016-06-02 15:22:08 -0700 LayoutTest tiled-drawing/scrolling/latched-div-with-scroll-snap.html is flaky This test is frequently failing or timing out on mac-wk2. It has been flaky for a while, but as of 5/28/16 it fails much more frequently. Most recent failure: <https://build.webkit.org/builders/Apple%20El%20Capitan%20Debug%20WK2%20(Tests)/builds/5581> <https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=tiled-drawing%2Fscrolling%2Flatched-div-with-scroll-snap.html> --- /Volumes/Data/slave/elcapitan-debug-tests-wk2/build/layout-test-results/tiled-drawing/scrolling/latched-div-with-scroll-snap-expected.txt +++ /Volumes/Data/slave/elcapitan-debug-tests-wk2/build/layout-test-results/tiled-drawing/scrolling/latched-div-with-scroll-snap-actual.txt @@ -3,7 +3,7 @@ PASS div honored snap points. Testing that latch moves to bottom div: PASS top div did not move. -PASS div scrolled to next window. +FAIL div did not honor snap points. Expected 200, but got 50 PASS successfullyParsed is true TEST COMPLETE 1199727 1 ryanhaddad 2016-06-06 15:07:55 -0700 El Capitan only, seems to fail 100% of the time https://build.webkit.org/builders/Apple%20El%20Capitan%2032-bit%20JSC%20(BuildAndTest)?numbuilds=50 1200077 2 ryanhaddad 2016-06-07 09:36:57 -0700 (In reply to comment #1) > El Capitan only, seems to fail 100% of the time > > https://build.webkit.org/builders/Apple%20El%20Capitan%2032- > bit%20JSC%20(BuildAndTest)?numbuilds=50 This comment was intended for a different bug. Please disregard. However, tiled-drawing/scrolling/latched-div-with-scroll-snap.html is still frequently failing or timing out on Mac, especially on El Capitan Debug WK2 1200083 3 bfulgham 2016-06-07 09:45:23 -0700 (In reply to comment #2) > (In reply to comment #1) > > El Capitan only, seems to fail 100% of the time > > > > https://build.webkit.org/builders/Apple%20El%20Capitan%2032- > > bit%20JSC%20(BuildAndTest)?numbuilds=50 > > This comment was intended for a different bug. Please disregard. > > However, tiled-drawing/scrolling/latched-div-with-scroll-snap.html is still > frequently failing or timing out on Mac, especially on El Capitan Debug WK2 We have general flakiness in a lot of these scroll-snap/latching tests. Much of this is due to generating 'fake' wheel gestures to drive the tests. Maybe some partial event state is getting held over from test-to-test and causing things to behave in weird ways. Simon and I spent a lot of time trying to get this more stable, but clearly more effort is needed. 1201690 4 ap 2016-06-11 22:21:41 -0700 > It has been flaky for a while, but as of 5/28/16 it fails much more frequently. Is there any way to more precisely isolate when this started? There were sweeping changes to callOnMainThread and NoncopyableFunction on 5/28 and 5/27, and while I don't see anything wrong with those patches, a mistake there could easily cause such symptoms. 1201692 5 ap 2016-06-11 22:31:28 -0700 It started early on 5/28, roughly around 1am. <http://trac.webkit.org/projects/webkit/changeset/201482> seems to fit. 1201693 6 ap 2016-06-11 22:34:50 -0700 Or looking at revision numbers and not at times, <http://trac.webkit.org/projects/webkit/changeset/201476>. 1204059 7 ap 2016-06-20 23:09:09 -0700 Marked as flaky in <http://trac.webkit.org/r202269>. Zalan, do you think that you could look into this? 1204263 8 281771 zalan 2016-06-21 13:40:56 -0700 Created attachment 281771 Patch 1204266 9 281771 ap 2016-06-21 13:43:51 -0700 Comment on attachment 281771 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281771&action=review r=me pending EWS > LayoutTests/tiled-drawing/scrolling/latched-div-with-scroll-snap.html:30 > - <script src="../../resources/js-test.js"></script> > + <script src="../../resources/js-test-pre.js"></script> Why this change? I think that js-test.js is slightly preferable in general. 1204267 10 281771 ap 2016-06-21 13:44:48 -0700 Comment on attachment 281771 Patch Please remove the test from TestExpectations, now that it's expected to pass reliably. 1204323 11 281787 zalan 2016-06-21 15:25:32 -0700 Created attachment 281787 Patch 1204349 12 281787 commit-queue 2016-06-21 16:32:45 -0700 Comment on attachment 281787 Patch Clearing flags on attachment: 281787 Committed r202304: <http://trac.webkit.org/changeset/202304> 1204350 13 commit-queue 2016-06-21 16:32:50 -0700 All reviewed patches have been landed. Closing bug. 281771 2016-06-21 13:40:56 -0700 2016-06-21 15:25:28 -0700 Patch bug-158320-20160621134049.patch text/plain 7517 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMjUxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODQwNzdjZWYwNTVhMTVhM2IyMWYx NTI1OTRiZmIwMjIwMWU4YTk2Ny4uNDg5OGRmZDU2MTQxNzY5NDQ3M2E2YTMwYmZhNjFlODljN2Nm NTA5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA2LTIxICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0VGVzdCB0aWxlZC1kcmF3aW5nL3Njcm9s bGluZy9sYXRjaGVkLWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0bWwgaXMgZmxha3kKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyMAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgdGVzdCBjYXNlIGlz IGZsYWt5IGJlY2F1c2U6CisgICAgICAgIDEuIFRoZXJlIGFyZSBtdWx0aXBsZSBtb3VzZVNjcm9s bEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoKSBldmVudCBidW5kbGVzIGFuZCB0aGV5IGFs bCBuZWVkIHRoZWlyIG93bgorICAgICAgICBjYWxsYmFja3MuIChzZWUgYWRkaXRpb25hbCBldmVu dFNlbmRlci5jYWxsQWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoKSkgLT4gZmFpbAorICAgICAgICAy LiBXaGVuIHRoZSB0ZXN0IGZhaWxzLCB0aGUgdGVzdEZhaWxlZCgpIGZ1bmN0aW9uIGlzIGNhbGxl ZCB3aXRoIHVuZGVmaW5lZCB2YXJpYWJsZXMuIC0+IHRpbWVvdXQgIAorCisgICAgICAgICogdGls ZWQtZHJhd2luZy9zY3JvbGxpbmcvbGF0Y2hlZC1kaXYtd2l0aC1zY3JvbGwtc25hcC5odG1sOgor CiAyMDE2LTA2LTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAg U2V0IHRoZSBlbmQgcG9zaXRpb24gb24gdGhlIHBsYWNlaG9sZGVyIEJpZGlSdW4gcHJvcGVybHku CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9sYXRjaGVk LWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0bWwgYi9MYXlvdXRUZXN0cy90aWxlZC1kcmF3aW5nL3Nj cm9sbGluZy9sYXRjaGVkLWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0bWwKaW5kZXggYjllZDNkMGI1 ZmU2YTU1YmRjNjA0NDg4OWM5MjFiNThjZDQ5OTUwZi4uMzM3MWJjZGYyOWM2YWY4MTQ3OTA2MjFl NTBjY2MwNmYxZDFjMjM0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9z Y3JvbGxpbmcvbGF0Y2hlZC1kaXYtd2l0aC1zY3JvbGwtc25hcC5odG1sCisrKyBiL0xheW91dFRl c3RzL3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2xhdGNoZWQtZGl2LXdpdGgtc2Nyb2xsLXNuYXAu aHRtbApAQCAtMjcsNyArMjcsNyBAQAogICAgICAgICAgICAgI2l0ZW1INCwgI2l0ZW1WNCB7IGJh Y2tncm91bmQtY29sb3I6IHllbGxvdzsgfQogICAgICAgICAgICAgI2l0ZW1INSwgI2l0ZW1WNSB7 IGJhY2tncm91bmQtY29sb3I6IGZ1Y2hzaWE7IH0KICAgICAgICAgPC9zdHlsZT4KLSAgICAgICAg PHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICAg ICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+ CiAgICAgICAgIDxzY3JpcHQ+CiAgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK IApAQCAtODIsMjEgKzgyLDI2IEBACiAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKICAgICAg ICAgfQogCisgICAgICAgIGZ1bmN0aW9uIHBlcmZvcm1Td2lwZUdlc3R1cmVPbkVsZW1lbnRFbmQo KQorICAgICAgICB7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdo ZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdub25lJywgJ2JlZ2luJyk7CisgICAgICAgICAg ICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEs IDAsICdub25lJywgJ2NvbnRpbnVlJyk7CisgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNj cm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwgJ25vbmUnLCAnZW5kJyk7Cisg ICAgICAgIH0KKwogICAgICAgICBmdW5jdGlvbiBwZXJmb3JtU3dpcGVHZXN0dXJlT25FbGVtZW50 KGRpdlRhcmdldCkKICAgICAgICAgewogICAgICAgICAgICAgdmFyIHdpbmRvd1Bvc2l0aW9uID0g bG9jYXRpb25JbldpbmRvd0Nvb3JkaW5hdGVzKGRpdlRhcmdldCk7CiAgICAgICAgICAgICB2YXIg c3RhcnRQb3NYID0gd2luZG93UG9zaXRpb24ueCArIDAuNSAqIGRpdlRhcmdldC5jbGllbnRXaWR0 aDsKICAgICAgICAgICAgIHZhciBzdGFydFBvc1kgPSB3aW5kb3dQb3NpdGlvbi55ICsgMC41ICog ZGl2VGFyZ2V0LmNsaWVudEhlaWdodDsKIAorICAgICAgICAgICAgZXZlbnRTZW5kZXIubW9uaXRv cldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhzdGFy dFBvc1gsIHN0YXJ0UG9zWSk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5 V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdiZWdhbicsICdub25lJyk7CiAgICAg ICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFz ZXMoLTEsIDAsICdjaGFuZ2VkJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2NoYW5nZWQnLCAn bm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFu ZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnY2hhbmdlZCcsICdub25lJyk7CiAgICAgICAgICAgICBl dmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoMCwgMCwg J2VuZGVkJywgJ25vbmUnKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlX aXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ25vbmUnLCAnYmVnaW4nKTsKLSAgICAg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNl cygtMSwgMCwgJ25vbmUnLCAnY29udGludWUnKTsKLSAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAwLCAnbm9uZScsICdlbmQn KTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIHNjcm9sbEluU2Vjb25kRGl2KCkKQEAg LTEwOSw3ICsxMTQsMTIgQEAKIAogICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9uRWxl bWVudChkaXZUYXJnZXQpOwogCi0gICAgICAgICAgICBldmVudFNlbmRlci5jYWxsQWZ0ZXJTY3Jv bGxpbmdDb21wbGV0ZXMoZnVuY3Rpb24oKSB7IHJldHVybiBjaGVja0ZvclNlY29uZGFyeVNjcm9s bEdsaWRlKCk7IH0pOyAgICAgICAgICAgCisgICAgICAgICAgICBldmVudFNlbmRlci5jYWxsQWZ0 ZXJTY3JvbGxpbmdDb21wbGV0ZXMoZnVuY3Rpb24oKSB7IAorICAgICAgICAgICAgICAgIHBlcmZv cm1Td2lwZUdlc3R1cmVPbkVsZW1lbnRFbmQoKTsKKyAgICAgICAgICAgICAgICBldmVudFNlbmRl ci5jYWxsQWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAg ICAgICAgIGNoZWNrRm9yU2Vjb25kYXJ5U2Nyb2xsR2xpZGUoKTsgCisgICAgICAgICAgICAgICAg fSk7CisgICAgICAgICAgICB9KTsgICAgICAgICAgIAogICAgICAgICB9CiAKICAgICAgICAgZnVu Y3Rpb24gY2hlY2tGb3JTY3JvbGxTbmFwKCkKQEAgLTExOSwxMiArMTI5LDEyIEBACiAgICAgICAg ICAgICB2YXIgYWN0dWFsUG9zaXRpb24gPSBkaXZUYXJnZXQuc2Nyb2xsTGVmdDsKIAogICAgICAg ICAgICAgLy8gVGhlIGRpdiBzaG91bGQgaGF2ZSBzbmFwcGVkIGJhY2sgdG8gdGhlIHByZXZpb3Vz IHBvc2l0aW9uCi0gICAgICAgICAgICBpZiAoYWN0dWFsUG9zaXRpb24gIT0gZGl2U2Nyb2xsUG9z aXRpb25CZWZvcmVTbmFwKQotICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoImRpdiBkaWQgbm90 IHNuYXAgYmFjayB0byBwcm9wZXIgbG9jYXRpb24gZm9yICIgKyB0YXJnZXRMYWJlbCArIi4gRXhw ZWN0ZWQgIiArIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlU25hcCArICIsIGJ1dCBnb3QgIiArIGFj dHVhbFBvc2l0aW9uKTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGlmIChhY3R1YWxQ b3NpdGlvbiAhPSBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXApIHsKKyAgICAgICAgICAgICAg ICB0ZXN0RmFpbGVkKCJkaXYgZGlkIG5vdCBzbmFwIGJhY2sgdG8gcHJvcGVyIGxvY2F0aW9uIGZv ciAiICsgZGl2VGFyZ2V0ICsiLiBFeHBlY3RlZCAiICsgZGl2U2Nyb2xsUG9zaXRpb25CZWZvcmVT bmFwICsgIiwgYnV0IGdvdCAiICsgYWN0dWFsUG9zaXRpb24pOworICAgICAgICAgICAgICAgIGZp bmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICAgICAgdGVzdFBh c3NlZCgiZGl2IGhvbm9yZWQgc25hcCBwb2ludHMuIik7Ci0KLSAgICAgICAgICAgIHNldFRpbWVv dXQoZnVuY3Rpb24oKSB7IHNjcm9sbEluU2Vjb25kRGl2KCkgfSwgMCk7CisgICAgICAgICAgICBz Y3JvbGxJblNlY29uZERpdigpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gc2Nyb2xs U25hcFRlc3QoKQpAQCAtMTM3LDEyICsxNDcsMTMgQEAKICAgICAgICAgICAgIHZhciBzdGFydFBv c1ggPSB3aW5kb3dQb3NpdGlvbi54ICsgMC41ICogZGl2VGFyZ2V0LmNsaWVudFdpZHRoOwogICAg ICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IHdpbmRvd1Bvc2l0aW9uLnkgKyAwLjUgKiBkaXZUYXJn ZXQuY2xpZW50SGVpZ2h0OwogCisgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxF dmVudHMoKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9zWCwg c3RhcnRQb3NZKTsgLy8gTWFrZSBzdXJlIHdlIGFyZSBqdXN0IG91dHNpZGUgdGhlIGlGcmFtZQog ICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVt UGhhc2VzKC0xLCAwLCAnYmVnYW4nLCAnbm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnY2hhbmdlZCcs ICdub25lJyk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVs QW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdjaGFuZ2VkJywgJ25vbmUnKTsKICAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAw LCAnZW5kZWQnLCAnbm9uZScpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVyU2Ny b2xsaW5nQ29tcGxldGVzKGZ1bmN0aW9uKCkgeyByZXR1cm4gY2hlY2tGb3JTY3JvbGxTbmFwKCk7 IH0pOworICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVyU2Nyb2xsaW5nQ29tcGxldGVz KGZ1bmN0aW9uKCkgeyBjaGVja0ZvclNjcm9sbFNuYXAoKTsgfSk7CiAgICAgICAgIH0KIAogICAg ICAgICBmdW5jdGlvbiBjaGVja0ZvclNjcm9sbEdsaWRlKHRhcmdldExhYmVsKQpAQCAtMTU1LDEw ICsxNjYsMTEgQEAKICAgICAgICAgICAgIC8vIFRoZSBkaXYgc2hvdWxkIGhhdmUgc2Nyb2xsZWQg KGdsaWRlZCkgdG8gdGhlIG5leHQgc25hcCBwb2ludC4KICAgICAgICAgICAgIGlmIChhY3R1YWxQ b3NpdGlvbiA9PSBleHBlY3RlZFBvc2l0aW9uKQogICAgICAgICAgICAgICAgIHRlc3RQYXNzZWQo ImRpdiBzY3JvbGxlZCB0byBuZXh0IHdpbmRvdy4iKTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoImRpdiBkaWQgbm90IGhv bm9yIHNuYXAgcG9pbnRzLiBFeHBlY3RlZCAiICsgZXhwZWN0ZWRQb3NpdGlvbiArICIsIGJ1dCBn b3QgIiArIGFjdHVhbFBvc2l0aW9uKTsKLQotICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlv bigpIHsgc2Nyb2xsU25hcFRlc3QoKSB9LCAwKTsKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rl c3QoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNjcm9sbFNuYXBUZXN0KCk7CiAgICAg ICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBzY3JvbGxHbGlkZVRlc3QoKQpAQCAtMTY4LDE3ICsx ODAsMTkgQEAKICAgICAgICAgICAgIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlR2xpZGUgPSBkaXZU YXJnZXQuc2Nyb2xsTGVmdDsKIAogICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9uRWxl bWVudChkaXZUYXJnZXQpOwotICAgIAotICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVy U2Nyb2xsaW5nQ29tcGxldGVzKGZ1bmN0aW9uKCkgeyByZXR1cm4gY2hlY2tGb3JTY3JvbGxHbGlk ZSgpOyB9KTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBs ZXRlcyhmdW5jdGlvbigpIHsgCisgICAgICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9u RWxlbWVudEVuZCgpOworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9s bGluZ0NvbXBsZXRlcyhmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgY2hlY2tGb3JT Y3JvbGxHbGlkZSgpOyAKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIH0pOyAgICAg ICAgICAgCiAgICAgICAgIH0KIAogICAgICAgICBmdW5jdGlvbiBvbkxvYWQoKQogICAgICAgICB7 CiAgICAgICAgICAgICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAgICAg ZXZlbnRTZW5kZXIubW9uaXRvcldoZWVsRXZlbnRzKCk7CiAgICAgICAgICAgICAgICAgdGVzdFJ1 bm5lci5kdW1wQXNUZXh0KCk7Ci0gICAgICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxE b25lKCk7Ci0gICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsgc2Nyb2xsR2xp ZGVUZXN0KCkgfSwgMCk7CisgICAgICAgICAgICAgICAgc2Nyb2xsR2xpZGVUZXN0KCk7CiAgICAg ICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHZhciBtZXNzYWdlTG9jYXRpb25IID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2l0ZW1IMCcpOwogICAgICAgICAgICAgICAgIHZhciBt ZXNzYWdlID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7CkBAIC0yMjQsNCArMjM4LDUg QEAKICAgICAgICAgICAgIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgogICAgICAgICA8L2Rpdj4K ICAgICA8L2JvZHk+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q cyI+PC9zY3JpcHQ+CiA8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= 281787 2016-06-21 15:25:32 -0700 2016-06-21 16:32:45 -0700 Patch bug-158320-20160621152525.patch text/plain 8040 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyMjk0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjMxMWNiN2JkOWQ4Y2ViNDUzM2Y1 NDRlZDU4MzE4Y2Y0YWNhNmQ0Ni4uYWZjNGM3MjgyNDhjNWY4YzA1YTMxNzMyMjdhMTcxODc1NTBh MDc4MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA2LTIxICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5b3V0VGVzdCB0aWxlZC1kcmF3aW5nL3Njcm9s bGluZy9sYXRjaGVkLWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0bWwgaXMgZmxha3kKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODMyMAorCisgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBUaGlzIHRlc3QgY2FzZSBpcyBm bGFreSBiZWNhdXNlOgorICAgICAgICAxLiBUaGVyZSBhcmUgbXVsdGlwbGUgbW91c2VTY3JvbGxC eVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKCkgZXZlbnQgYnVuZGxlcyBhbmQgdGhleSBhbGwg bmVlZCB0aGVpciBvd24KKyAgICAgICAgY2FsbGJhY2tzLiAoc2VlIGFkZGl0aW9uYWwgZXZlbnRT ZW5kZXIuY2FsbEFmdGVyU2Nyb2xsaW5nQ29tcGxldGVzKCkpIC0+IGZhaWwKKyAgICAgICAgMi4g V2hlbiB0aGUgdGVzdCBmYWlscywgdGhlIHRlc3RGYWlsZWQoKSBmdW5jdGlvbiBpcyBjYWxsZWQg d2l0aCB1bmRlZmluZWQgdmFyaWFibGVzLiAtPiB0aW1lb3V0ICAKKworICAgICAgICAqIHBsYXRm b3JtL21hYy13azIvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiB0aWxlZC1kcmF3aW5nL3Nj cm9sbGluZy9sYXRjaGVkLWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0bWw6CisKIDIwMTYtMDYtMjAg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRm9jdXMg ZXZlbnQgZGlzcGF0Y2hlZCBpbiBpZnJhbWUgY2F1c2VzIHBhcmVudCBkb2N1bWVudCB0byBzY3Jv bGwgaW5jb3JyZWN0bHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIv VGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvVGVzdEV4cGVj dGF0aW9ucwppbmRleCBmODU0ZmY0NDU0YmIwNDkxMTg1NzdiZTQ4YWE0MTIxZWU1YTliNTg2Li4z ZTY4ZmRjMjQwMTczMmExNmVkMDMyYjFmMjhjZjUyM2QzYjNlYWQxIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0yNTgsOCArMjU4LDYgQEAg d2Via2l0Lm9yZy9iLzE0ODQwOCB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9zY3JvbGwtc25hcC9z Y3JvbGwtc25hcC1tYW5kYXRvcnktcGEKIHdlYmtpdC5vcmcvYi8xNDg0MDggdGlsZWQtZHJhd2lu Zy9zY3JvbGxpbmcvc2Nyb2xsLXNuYXAvc2Nyb2xsLXNuYXAtaWZyYW1lLmh0bWwgWyBQYXNzIEZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzE0ODQwOCB0aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9yb290 LW92ZXJmbG93LXdpdGgtbW91c2V3aGVlbC5odG1sIFsgUGFzcyBGYWlsdXJlIFRpbWVvdXQgXQog Ci13ZWJraXQub3JnL2IvMTU4MzIwIHRpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2xhdGNoZWQtZGl2 LXdpdGgtc2Nyb2xsLXNuYXAuaHRtbCBbIFBhc3MgRmFpbHVyZSBUaW1lb3V0IF0KLQogd2Via2l0 Lm9yZy9iLzEzOTgyMCBmYXN0L2ZyYW1lcy9sb3RzLW9mLW9iamVjdHMuaHRtbCBbIFRpbWVvdXQg XQogd2Via2l0Lm9yZy9iLzEzOTgyMCBmYXN0L2ZyYW1lcy9sb3RzLW9mLWlmcmFtZXMuaHRtbCBb IFBhc3MgVGltZW91dCBdCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3RpbGVkLWRyYXdpbmcv c2Nyb2xsaW5nL2xhdGNoZWQtZGl2LXdpdGgtc2Nyb2xsLXNuYXAuaHRtbCBiL0xheW91dFRlc3Rz L3RpbGVkLWRyYXdpbmcvc2Nyb2xsaW5nL2xhdGNoZWQtZGl2LXdpdGgtc2Nyb2xsLXNuYXAuaHRt bAppbmRleCBiOWVkM2QwYjVmZTZhNTViZGM2MDQ0ODg5YzkyMWI1OGNkNDk5NTBmLi45ZTc5MDEw MzcxZTc4MTM0NjBlYjQyNmE3NDdjNTY2NTYwMmNkMDQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy90aWxlZC1kcmF3aW5nL3Njcm9sbGluZy9sYXRjaGVkLWRpdi13aXRoLXNjcm9sbC1zbmFwLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvdGlsZWQtZHJhd2luZy9zY3JvbGxpbmcvbGF0Y2hlZC1kaXYt d2l0aC1zY3JvbGwtc25hcC5odG1sCkBAIC04MiwyMSArODIsMjYgQEAKICAgICAgICAgICAgIGZp bmlzaEpTVGVzdCgpOwogICAgICAgICB9CiAKKyAgICAgICAgZnVuY3Rpb24gcGVyZm9ybVN3aXBl R2VzdHVyZU9uRWxlbWVudEVuZCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVy Lm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ25vbmUnLCAn YmVnaW4nKTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxB bmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ25vbmUnLCAnY29udGludWUnKTsKKyAgICAgICAgICAg IGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygwLCAw LCAnbm9uZScsICdlbmQnKTsKKyAgICAgICAgfQorCiAgICAgICAgIGZ1bmN0aW9uIHBlcmZvcm1T d2lwZUdlc3R1cmVPbkVsZW1lbnQoZGl2VGFyZ2V0KQogICAgICAgICB7CiAgICAgICAgICAgICB2 YXIgd2luZG93UG9zaXRpb24gPSBsb2NhdGlvbkluV2luZG93Q29vcmRpbmF0ZXMoZGl2VGFyZ2V0 KTsKICAgICAgICAgICAgIHZhciBzdGFydFBvc1ggPSB3aW5kb3dQb3NpdGlvbi54ICsgMC41ICog ZGl2VGFyZ2V0LmNsaWVudFdpZHRoOwogICAgICAgICAgICAgdmFyIHN0YXJ0UG9zWSA9IHdpbmRv d1Bvc2l0aW9uLnkgKyAwLjUgKiBkaXZUYXJnZXQuY2xpZW50SGVpZ2h0OwogCisgICAgICAgICAg ICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAgICAgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlTW92ZVRvKHN0YXJ0UG9zWCwgc3RhcnRQb3NZKTsKICAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2Jl Z2FuJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRo V2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2NoYW5nZWQnLCAnbm9uZScpOwogICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2Vz KC0xLCAwLCAnY2hhbmdlZCcsICdub25lJyk7CiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3Vz ZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdjaGFuZ2VkJywgJ25v bmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRN b21lbnR1bVBoYXNlcygwLCAwLCAnZW5kZWQnLCAnbm9uZScpOwotICAgICAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnbm9u ZScsICdiZWdpbicpOwotICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhX aGVlbEFuZE1vbWVudHVtUGhhc2VzKC0xLCAwLCAnbm9uZScsICdjb250aW51ZScpOwotICAgICAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFuZE1vbWVudHVtUGhhc2Vz KDAsIDAsICdub25lJywgJ2VuZCcpOwogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gc2Ny b2xsSW5TZWNvbmREaXYoKQpAQCAtMTA5LDcgKzExNCwxMiBAQAogCiAgICAgICAgICAgICBwZXJm b3JtU3dpcGVHZXN0dXJlT25FbGVtZW50KGRpdlRhcmdldCk7CiAKLSAgICAgICAgICAgIGV2ZW50 U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhmdW5jdGlvbigpIHsgcmV0dXJuIGNo ZWNrRm9yU2Vjb25kYXJ5U2Nyb2xsR2xpZGUoKTsgfSk7ICAgICAgICAgICAKKyAgICAgICAgICAg IGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhmdW5jdGlvbigpIHsgCisg ICAgICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9uRWxlbWVudEVuZCgpOworICAgICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhmdW5jdGlv bigpIHsKKyAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsgY2hlY2tG b3JTZWNvbmRhcnlTY3JvbGxHbGlkZSgpOyB9LCAxMCk7IAorICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgfSk7ICAgICAgICAgICAKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9u IGNoZWNrRm9yU2Nyb2xsU25hcCgpCkBAIC0xMTksMTIgKzEyOSwxMyBAQAogICAgICAgICAgICAg dmFyIGFjdHVhbFBvc2l0aW9uID0gZGl2VGFyZ2V0LnNjcm9sbExlZnQ7CiAKICAgICAgICAgICAg IC8vIFRoZSBkaXYgc2hvdWxkIGhhdmUgc25hcHBlZCBiYWNrIHRvIHRoZSBwcmV2aW91cyBwb3Np dGlvbgotICAgICAgICAgICAgaWYgKGFjdHVhbFBvc2l0aW9uICE9IGRpdlNjcm9sbFBvc2l0aW9u QmVmb3JlU25hcCkKLSAgICAgICAgICAgICAgICB0ZXN0RmFpbGVkKCJkaXYgZGlkIG5vdCBzbmFw IGJhY2sgdG8gcHJvcGVyIGxvY2F0aW9uIGZvciAiICsgdGFyZ2V0TGFiZWwgKyIuIEV4cGVjdGVk ICIgKyBkaXZTY3JvbGxQb3NpdGlvbkJlZm9yZVNuYXAgKyAiLCBidXQgZ290ICIgKyBhY3R1YWxQ b3NpdGlvbik7Ci0gICAgICAgICAgICBlbHNlCisgICAgICAgICAgICBpZiAoYWN0dWFsUG9zaXRp b24gIT0gZGl2U2Nyb2xsUG9zaXRpb25CZWZvcmVTbmFwKSB7CisgICAgICAgICAgICAgICAgdGVz dEZhaWxlZCgiZGl2IGRpZCBub3Qgc25hcCBiYWNrIHRvIHByb3BlciBsb2NhdGlvbiBmb3IgIiAr IGRpdlRhcmdldCArIi4gRXhwZWN0ZWQgIiArIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlU25hcCAr ICIsIGJ1dCBnb3QgIiArIGFjdHVhbFBvc2l0aW9uKTsKKyAgICAgICAgICAgICAgICBmaW5pc2hK U1Rlc3QoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgICAgICB0ZXN0UGFzc2VkKCJkaXYgaG9ub3JlZCBzbmFwIHBvaW50cy4iKTsKLQot ICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsgc2Nyb2xsSW5TZWNvbmREaXYoKSB9 LCAwKTsKKyAgICAgICAgICAgIHNjcm9sbEluU2Vjb25kRGl2KCk7CiAgICAgICAgIH0KIAogICAg ICAgICBmdW5jdGlvbiBzY3JvbGxTbmFwVGVzdCgpCkBAIC0xMzcsMTIgKzE0OCwxMyBAQAogICAg ICAgICAgICAgdmFyIHN0YXJ0UG9zWCA9IHdpbmRvd1Bvc2l0aW9uLnggKyAwLjUgKiBkaXZUYXJn ZXQuY2xpZW50V2lkdGg7CiAgICAgICAgICAgICB2YXIgc3RhcnRQb3NZID0gd2luZG93UG9zaXRp b24ueSArIDAuNSAqIGRpdlRhcmdldC5jbGllbnRIZWlnaHQ7CiAKKyAgICAgICAgICAgIGV2ZW50 U2VuZGVyLm1vbml0b3JXaGVlbEV2ZW50cygpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91 c2VNb3ZlVG8oc3RhcnRQb3NYLCBzdGFydFBvc1kpOyAvLyBNYWtlIHN1cmUgd2UgYXJlIGp1c3Qg b3V0c2lkZSB0aGUgaUZyYW1lCiAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5 V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFzZXMoLTEsIDAsICdiZWdhbicsICdub25lJyk7CiAgICAg ICAgICAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5V2l0aFdoZWVsQW5kTW9tZW50dW1QaGFz ZXMoLTEsIDAsICdjaGFuZ2VkJywgJ25vbmUnKTsKICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1v dXNlU2Nyb2xsQnlXaXRoV2hlZWxBbmRNb21lbnR1bVBoYXNlcygtMSwgMCwgJ2NoYW5nZWQnLCAn bm9uZScpOwogICAgICAgICAgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeVdpdGhXaGVlbEFu ZE1vbWVudHVtUGhhc2VzKDAsIDAsICdlbmRlZCcsICdub25lJyk7Ci0gICAgICAgICAgICBldmVu dFNlbmRlci5jYWxsQWZ0ZXJTY3JvbGxpbmdDb21wbGV0ZXMoZnVuY3Rpb24oKSB7IHJldHVybiBj aGVja0ZvclNjcm9sbFNuYXAoKTsgfSk7CisgICAgICAgICAgICBldmVudFNlbmRlci5jYWxsQWZ0 ZXJTY3JvbGxpbmdDb21wbGV0ZXMoZnVuY3Rpb24oKSB7IGNoZWNrRm9yU2Nyb2xsU25hcCgpOyB9 KTsKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGNoZWNrRm9yU2Nyb2xsR2xpZGUodGFy Z2V0TGFiZWwpCkBAIC0xNTUsMTAgKzE2NywxMiBAQAogICAgICAgICAgICAgLy8gVGhlIGRpdiBz aG91bGQgaGF2ZSBzY3JvbGxlZCAoZ2xpZGVkKSB0byB0aGUgbmV4dCBzbmFwIHBvaW50LgogICAg ICAgICAgICAgaWYgKGFjdHVhbFBvc2l0aW9uID09IGV4cGVjdGVkUG9zaXRpb24pCiAgICAgICAg ICAgICAgICAgdGVzdFBhc3NlZCgiZGl2IHNjcm9sbGVkIHRvIG5leHQgd2luZG93LiIpOwotICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgdGVzdEZh aWxlZCgiZGl2IGRpZCBub3QgaG9ub3Igc25hcCBwb2ludHMuIEV4cGVjdGVkICIgKyBleHBlY3Rl ZFBvc2l0aW9uICsgIiwgYnV0IGdvdCAiICsgYWN0dWFsUG9zaXRpb24pOwotCi0gICAgICAgICAg ICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyBzY3JvbGxTbmFwVGVzdCgpIH0sIDApOworICAgICAg ICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIHNjcm9sbFNuYXBUZXN0KCk7CiAgICAgICAgIH0KIAogICAg ICAgICBmdW5jdGlvbiBzY3JvbGxHbGlkZVRlc3QoKQpAQCAtMTY4LDE3ICsxODIsMTkgQEAKICAg ICAgICAgICAgIGRpdlNjcm9sbFBvc2l0aW9uQmVmb3JlR2xpZGUgPSBkaXZUYXJnZXQuc2Nyb2xs TGVmdDsKIAogICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9uRWxlbWVudChkaXZUYXJn ZXQpOwotICAgIAotICAgICAgICAgICAgZXZlbnRTZW5kZXIuY2FsbEFmdGVyU2Nyb2xsaW5nQ29t cGxldGVzKGZ1bmN0aW9uKCkgeyByZXR1cm4gY2hlY2tGb3JTY3JvbGxHbGlkZSgpOyB9KTsKKyAg ICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRlcyhmdW5jdGlv bigpIHsgCisgICAgICAgICAgICAgICAgcGVyZm9ybVN3aXBlR2VzdHVyZU9uRWxlbWVudEVuZCgp OworICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLmNhbGxBZnRlclNjcm9sbGluZ0NvbXBsZXRl cyhmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigp IHsgY2hlY2tGb3JTY3JvbGxHbGlkZSgpOyB9LCAxMCk7IAorICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgfSk7ICAgICAgICAgICAKICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9u IG9uTG9hZCgpCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIp IHsKLSAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb25pdG9yV2hlZWxFdmVudHMoKTsKICAg ICAgICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKLSAgICAgICAgICAgICAgICB0 ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKLSAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KGZ1 bmN0aW9uKCkgeyBzY3JvbGxHbGlkZVRlc3QoKSB9LCAwKTsKKyAgICAgICAgICAgICAgICBzY3Jv bGxHbGlkZVRlc3QoKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgdmFy IG1lc3NhZ2VMb2NhdGlvbkggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaXRlbUgwJyk7CiAg ICAgICAgICAgICAgICAgdmFyIG1lc3NhZ2UgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYn KTsK