81983 2012-03-22 15:57:48 -0700 Move garden-o-matic progress feedback from non-modal dialogs to a status console anchored to the bottom of the page 2012-03-22 17:36:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth dglazkov oldest_to_newest 585816 0 ojan 2012-03-22 15:57:48 -0700 Move garden-o-matic progress feedback from non-modal dialogs to a status console anchored to the bottom of the page 585821 1 133376 ojan 2012-03-22 16:02:05 -0700 Created attachment 133376 Patch 585879 2 133376 abarth 2012-03-22 17:05:55 -0700 Comment on attachment 133376 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133376&action=review I assume this look pretty. :) > Tools/ChangeLog:10 > + The dialogs get in the way if you are doing multiple rebaselines. Also, > + a number of people didn't realize that you could do multiple rebaselines > + in parallel. A non-modal dialog is just confusing. I didn't realize you could do multiple rebaselines in parallel! > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:118 > + // FIXME: Why don't we use Object.values(dictionary)? Because I'm dumb and I didn't know that existed. 585912 3 ojan 2012-03-22 17:35:39 -0700 (In reply to comment #2) > (From update of attachment 133376 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133376&action=review > > I assume this look pretty. :) Not gonna win any beauty contests, but I think it's good enough. I'm happy to tweak it if you look at it and are disgusted. :) > > Tools/ChangeLog:10 > > + The dialogs get in the way if you are doing multiple rebaselines. Also, > > + a number of people didn't realize that you could do multiple rebaselines > > + in parallel. A non-modal dialog is just confusing. > > I didn't realize you could do multiple rebaselines in parallel! Lol. It works surprisingly well (albeit slowly). > > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:118 > > + // FIXME: Why don't we use Object.values(dictionary)? > > Because I'm dumb and I didn't know that existed. Lol. I'll fix this in a followup patch. 585913 4 ojan 2012-03-22 17:36:33 -0700 Committed r111793: <http://trac.webkit.org/changeset/111793> 133376 2012-03-22 16:02:05 -0700 2012-03-22 17:05:55 -0700 Patch bug-81983-20120322160204.patch text/plain 14335 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNzQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjFkNDQ5OWRiZGM3YzIzZDdkZWU1YzhiZWJhZjFlNjY3 NmNhYjkyOC4uMzZhMDAwOTA3OWE5MjJiYjFiZWM5M2RhYWFiN2I4YzYyZGZmMmFjNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDEyLTAzLTIyICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgTW92ZSBnYXJkZW4tby1tYXRpYyBwcm9ncmVzcyBmZWVkYmFjayBmcm9tIG5vbi1tb2RhbCBk aWFsb2dzIHRvIGEgc3RhdHVzIGNvbnNvbGUgYW5jaG9yZWQgdG8gdGhlIGJvdHRvbSBvZiB0aGUg cGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODE5 ODMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg ZGlhbG9ncyBnZXQgaW4gdGhlIHdheSBpZiB5b3UgYXJlIGRvaW5nIG11bHRpcGxlIHJlYmFzZWxp bmVzLiBBbHNvLAorICAgICAgICBhIG51bWJlciBvZiBwZW9wbGUgZGlkbid0IHJlYWxpemUgdGhh dCB5b3UgY291bGQgZG8gbXVsdGlwbGUgcmViYXNlbGluZXMKKyAgICAgICAgaW4gcGFyYWxsZWwu IEEgbm9uLW1vZGFsIGRpYWxvZyBpcyBqdXN0IGNvbmZ1c2luZy4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWls dXJlcy9zY3JpcHRzL2Jhc2UuanM6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJv bGxlcnMuanM6CisgICAgICAgIElmIHdlJ3JlIG9ubHkgcmViYXNlbGluaW5nIDEgdGVzdCwgc2hv dyB0aGUgdGVzdCBuYW1lIGluIHRoZSBpbml0aWFsIG1lc3NhZ2UuIE90aGVyd2lzZSwKKyAgICAg ICAgc2hvdyB0aGUgbnVtYmVyIG9mIHRlc3RzIGJlaW5nIHJlYmFzZWxpbmVkLgorCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv VGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkuanM6CisgICAgICAgIFR1cm4gTWVzc2FnZUJveCBpbnRv IFN0YXR1c0FyZWEuIFN0YXR1c0FyZWEgaXMgYSBzaW5nbGV0b24gYW5kIG1lc3NhZ2VzIGluIHRo ZSBTdGF0dXNBcmVhIGFyZSBncm91cGVkCisgICAgICAgIGJ5IElELiBUaGF0IHdheSwgdGhlIHJl c3VsdHMgb2YgZWFjaCBVSSBhY3Rpb24gKGUuZy4gY2xpY2tpbmcgcmViYXNlbGluZSkgYXJlIGdy b3VwZWQgdG9nZXRoZXIKKyAgICAgICAgaW50byBhIHNpbmdsZSBhcmVhLgorCisgICAgICAgIE9u Y2UgYWRkRmluYWxNZXNzYWdlIGhhcyBiZWVuIGNhbGxlZCBmb3IgYWxsIElEcywgd2Ugc2hvdyB0 aGUgY2xvc2UgYnV0dG9uLiBDbGlja2luZyBjbG9zZQorICAgICAgICBhbHNvIHNlcnZlcyB0byBj bGVhciBhbGwgdGVoIGNvbnRlbnQgaW4gdGhlIFN0YXR1c0FyZWEuIAorCisgICAgICAgICogQnVp bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZh aWx1cmVzL3NjcmlwdHMvdWlfdW5pdHRlc3RzLmpzOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zdHls ZXMvcmVzdWx0cy5jc3M6CisKIDIwMTItMDMtMjIgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmUtbGFuZCBmaXggZm9yIHI4MTYwMyB5ZXQgYWdhaW4gKCEp IHdpdGggbGF0ZXN0IGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3Jp cHRzL2Jhc2UuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy9iYXNlLmpzCmluZGV4IGVhZTAz MTVhNWQ5ZmVhYWE5ZTgyNGI1MzU3NTQ3YWVmNmRmZWE1YjQuLmQ1OGJiNmZjOTg1YWI2YmJhZjFk Y2YyMjMyMTUwNWY3MGZiZTJkNWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRz L2Jhc2UuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1j b25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvYmFzZS5qcwpAQCAtMTE1LDYg KzExNSw3IEBAIGJhc2UuZmxhdHRlbkFycmF5ID0gZnVuY3Rpb24oYXJyYXlPZkFycmF5cykKIAog YmFzZS52YWx1ZXMgPSBmdW5jdGlvbihkaWN0aW9uYXJ5KQogeworICAgIC8vIEZJWE1FOiBXaHkg ZG9uJ3Qgd2UgdXNlIE9iamVjdC52YWx1ZXMoZGljdGlvbmFyeSk/CiAgICAgdmFyIHJlc3VsdCA9 IFtdOwogCiAgICAgZm9yICh2YXIga2V5IGluIGRpY3Rpb25hcnkpIHsKQEAgLTM4Miw3ICszODMs OSBAQCBiYXNlLmV4dGVuZHMgPSBmdW5jdGlvbihiYXNlLCBwcm90b3R5cGUpCiAgICAgICAgIHZh ciBlbGVtZW50ID0gdHlwZW9mIGJhc2UgPT0gJ3N0cmluZycgPyBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KGJhc2UpIDogYmFzZS5jYWxsKHRoaXMpOwogICAgICAgICBleHRlbmRlZC5wcm90b3R5cGUu X19wcm90b19fID0gZWxlbWVudC5fX3Byb3RvX187CiAgICAgICAgIGVsZW1lbnQuX19wcm90b19f ID0gZXh0ZW5kZWQucHJvdG90eXBlOwotICAgICAgICBlbGVtZW50LmluaXQgJiYgZWxlbWVudC5p bml0LmFwcGx5KGVsZW1lbnQsIGFyZ3VtZW50cyk7CisgICAgICAgIHZhciBzaW5nbGV0b24gPSBl bGVtZW50LmluaXQgJiYgZWxlbWVudC5pbml0LmFwcGx5KGVsZW1lbnQsIGFyZ3VtZW50cyk7Cisg ICAgICAgIGlmIChzaW5nbGV0b24pCisgICAgICAgICAgICByZXR1cm4gc2luZ2xldG9uOwogICAg ICAgICByZXR1cm4gZWxlbWVudDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJl cy9zY3JpcHRzL2NvbnRyb2xsZXJzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJv bGxlcnMuanMKaW5kZXggNGFlNWUxZjZjYWI1MTkyMjQwZWE5OWI0MTM2ZGJiNzllMzliMzQ0NC4u YmM0OTdkYWRjOGJmOTBmZmE1MjdkZmQzYTQxNzkzMmY5OGRiZjdjYSAxMDA2NDQKLS0tIGEvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv VGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVz L3NjcmlwdHMvY29udHJvbGxlcnMuanMKQEAgLTMyLDI2ICszMiwzNiBAQCB2YXIga0NoZWNrb3V0 VW5hdmFpbGFibGVNZXNzYWdlID0gJ0ZhaWxlZCEgR2FyZGVuLW8tbWF0aWMgbmVlZHMgYSBsb2Nh bCBzZXJ2ZXIgdAogLy8gRklYTUU6IFdoZXJlIHNob3VsZCB0aGlzIGZ1bmN0aW9uIGdvPwogZnVu Y3Rpb24gcmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVzKGZhaWx1cmVJbmZvTGlzdCkKIHsKLSAg ICB2YXIgc3RhdHVzVmlldyA9IG5ldyB1aS5NZXNzYWdlQm94KCdSZWJhc2VsaW5lJywgJ1BlcmZv cm1pbmcgcmViYXNlbGluZS4uLicpOworICAgIHZhciBzdGF0dXNWaWV3ID0gbmV3IHVpLlN0YXR1 c0FyZWEoJ1JlYmFzZWxpbmUnKTsKKyAgICB2YXIgaWQgPSBzdGF0dXNWaWV3Lm5ld0lkKCk7CisK KyAgICB2YXIgdGVzdE5hbWVzID0gYmFzZS51bmlxdWlmeUFycmF5KGZhaWx1cmVJbmZvTGlzdC5t YXAoZnVuY3Rpb24oZmFpbHVyZUluZm8pIHsgcmV0dXJuIGZhaWx1cmVJbmZvLnRlc3ROYW1lOyB9 KSk7CisgICAgdmFyIHRlc3ROYW1lID0gdGVzdE5hbWVzLmxlbmd0aCA9PSAxID8gdGVzdE5hbWVz WzBdIDogdGVzdE5hbWVzLmxlbmd0aCArICcgdGVzdHMnOworICAgIHN0YXR1c1ZpZXcuYWRkTWVz c2FnZShpZCwgJ1BlcmZvcm1pbmcgcmViYXNlbGluZSBvZiAnICsgdGVzdE5hbWUgKyAnLi4uJyk7 CiAKICAgICBjaGVja291dC5yZWJhc2VsaW5lKGZhaWx1cmVJbmZvTGlzdCwgZnVuY3Rpb24oKSB7 Ci0gICAgICAgIHN0YXR1c1ZpZXcuYWRkRmluYWxNZXNzYWdlKCdSZWJhc2VsaW5lIGRvbmUhIFBs ZWFzZSBsYW5kIHdpdGggIndlYmtpdC1wYXRjaCBsYW5kLWNvd2JveSIuJyk7CisgICAgICAgIHN0 YXR1c1ZpZXcuYWRkRmluYWxNZXNzYWdlKGlkLCAnUmViYXNlbGluZSBkb25lISBQbGVhc2UgbGFu ZCB3aXRoICJ3ZWJraXQtcGF0Y2ggbGFuZC1jb3dib3kiLicpOwogICAgIH0sIGZ1bmN0aW9uKGZh aWx1cmVJbmZvKSB7Ci0gICAgICAgIHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShmYWlsdXJlSW5mby50 ZXN0TmFtZSArICcgb24gJyArIHVpLmRpc3BsYXlOYW1lRm9yQnVpbGRlcihmYWlsdXJlSW5mby5i dWlsZGVyTmFtZSkpOworICAgICAgICBzdGF0dXNWaWV3LmFkZE1lc3NhZ2UoaWQsIGZhaWx1cmVJ bmZvLnRlc3ROYW1lICsgJyBvbiAnICsgdWkuZGlzcGxheU5hbWVGb3JCdWlsZGVyKGZhaWx1cmVJ bmZvLmJ1aWxkZXJOYW1lKSk7CiAgICAgfSwgZnVuY3Rpb24oKSB7Ci0gICAgICAgIHN0YXR1c1Zp ZXcuYWRkRmluYWxNZXNzYWdlKGtDaGVja291dFVuYXZhaWxhYmxlTWVzc2FnZSk7CisgICAgICAg IHN0YXR1c1ZpZXcuYWRkRmluYWxNZXNzYWdlKGlkLCBrQ2hlY2tvdXRVbmF2YWlsYWJsZU1lc3Nh Z2UpOwogICAgIH0pOwogfQogCiAvLyBGSVhNRTogV2hlcmUgc2hvdWxkIHRoaXMgZnVuY3Rpb24g Z28/CiBmdW5jdGlvbiB1cGRhdGVFeHBlY3RhdGlvbnNXaXRoU3RhdHVzVXBkYXRlcyhmYWlsdXJl SW5mb0xpc3QpCiB7Ci0gICAgdmFyIHN0YXR1c1ZpZXcgPSBuZXcgdWkuTWVzc2FnZUJveCgnRXhw ZWN0YXRpb25zIFVwZGF0ZScsICdVcGRhdGluZyBleHBlY3RhdGlvbnMuLi4nKTsKKyAgICB2YXIg c3RhdHVzVmlldyA9IG5ldyB1aS5TdGF0dXNBcmVhKCdFeHBlY3RhdGlvbnMgVXBkYXRlJyk7Cisg ICAgdmFyIGlkID0gc3RhdHVzVmlldy5uZXdJZCgpOworCisgICAgdmFyIHRlc3ROYW1lcyA9IGJh c2UudW5pcXVpZnlBcnJheShmYWlsdXJlSW5mb0xpc3QubWFwKGZ1bmN0aW9uKGZhaWx1cmVJbmZv KSB7IHJldHVybiBmYWlsdXJlSW5mby50ZXN0TmFtZTsgfSkpOworICAgIHZhciB0ZXN0TmFtZSA9 IHRlc3ROYW1lcy5sZW5ndGggPT0gMSA/IHRlc3ROYW1lc1swXSA6IHRlc3ROYW1lcy5sZW5ndGgg KyAnIHRlc3RzJzsKKyAgICBzdGF0dXNWaWV3LmFkZE1lc3NhZ2UoaWQsICdVcGRhdGluZyBleHBl Y3RhdGlvbnMgb2YgJyArIHRlc3ROYW1lICsgJy4uLicpOwogCiAgICAgY2hlY2tvdXQudXBkYXRl RXhwZWN0YXRpb25zKGZhaWx1cmVJbmZvTGlzdCwgZnVuY3Rpb24oKSB7Ci0gICAgICAgIHN0YXR1 c1ZpZXcuYWRkRmluYWxNZXNzYWdlKCdFeHBlY3RhdGlvbnMgdXBkYXRlIGRvbmUhIFBsZWFzZSBs YW5kIHdpdGggIndlYmtpdC1wYXRjaCBsYW5kLWNvd2JveSIuJyk7CisgICAgICAgIHN0YXR1c1Zp ZXcuYWRkRmluYWxNZXNzYWdlKGlkLCAnRXhwZWN0YXRpb25zIHVwZGF0ZSBkb25lISBQbGVhc2Ug bGFuZCB3aXRoICJ3ZWJraXQtcGF0Y2ggbGFuZC1jb3dib3kiLicpOwogICAgIH0sIGZ1bmN0aW9u KCkgewotICAgICAgICBzdGF0dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShrQ2hlY2tvdXRVbmF2YWls YWJsZU1lc3NhZ2UpOworICAgICAgICBzdGF0dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShpZCwga0No ZWNrb3V0VW5hdmFpbGFibGVNZXNzYWdlKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv VGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkuanMgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS5q cwppbmRleCA3N2I2YmJmNTBhZWZmYzA1ZmQwOTkzZDAzOWY1Njg2NmRjNWFjNDMyLi4xNWNiOWFl MDQyZjhhMWNmODcyZjk5N2NkMDQ5OGVlNDg1ODFiNzAzIDEwMDY0NAotLS0gYS9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFp bHVyZXMvc2NyaXB0cy91aS5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS5qcwpA QCAtMTQzLDM4ICsxNDMsNjYgQEAgdWkuUmVsYXRpdmVUaW1lID0gYmFzZS5leHRlbmRzKCd0aW1l JywgewogICAgIH0KIH0pOwogCi11aS5NZXNzYWdlQm94ID0gYmFzZS5leHRlbmRzKCdkaXYnLCAg ewotICAgIGluaXQ6IGZ1bmN0aW9uKHRpdGxlLCBtZXNzYWdlKQordWkuU3RhdHVzQXJlYSA9IGJh c2UuZXh0ZW5kcygnZGl2JywgIHsKKyAgICBpbml0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB0aGlzLl9jb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7Ci0gICAgICAg IHRoaXMuYXBwZW5kQ2hpbGQodGhpcy5fY29udGVudCk7Ci0gICAgICAgIHRoaXMuYWRkTWVzc2Fn ZShtZXNzYWdlKTsKKyAgICAgICAgLy8gVGhpcyBpcyBhIFNpbmdsZXRvbi4KKyAgICAgICAgaWYg KHVpLlN0YXR1c0FyZWEuX2luc3RhbmNlKQorICAgICAgICAgICAgcmV0dXJuIHVpLlN0YXR1c0Fy ZWEuX2luc3RhbmNlOworICAgICAgICB1aS5TdGF0dXNBcmVhLl9pbnN0YW5jZSA9IHRoaXM7CisK KyAgICAgICAgdGhpcy5jbGFzc05hbWUgPSAnc3RhdHVzJzsKICAgICAgICAgZG9jdW1lbnQuYm9k eS5hcHBlbmRDaGlsZCh0aGlzKTsKLSAgICAgICAgJCh0aGlzKS5kaWFsb2coewotICAgICAgICAg ICAgcmVzaXphYmxlOiBmYWxzZSwKLSAgICAgICAgICAgIHdpZHRoOiAkKHdpbmRvdykud2lkdGgo KSAqIDAuODAsICAvLyBGSVhNRTogV2Ugc2hvdWxkIGhhdmUgQ1NTIGRvIHRoaXMgd29yayBmb3Ig dXMuCi0gICAgICAgIH0pOwotICAgICAgICAkKCcudWktZGlhbG9nLXRpdGxlJywgdGhpcy5wYXJl bnROb2RlKS50ZXh0KHRpdGxlKTsKLSAgICAgICAgJCh0aGlzKS5iaW5kKCdkaWFsb2djbG9zZScs IGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgJCh0aGlzKS5kZXRhY2goKTsKLSAgICAgICAgfS5i aW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5fY3VycmVudElkID0gMDsKKyAgICAgICAgdGhpcy5f dW5maW5pc2hlZElkcyA9IHt9OworCisgICAgICAgIHRoaXMuYXBwZW5kQ2hpbGQobmV3IHVpLmFj dGlvbnMuTGlzdChbbmV3IHVpLmFjdGlvbnMuQ2xvc2UoKV0pKTsKKyAgICAgICAgJCh0aGlzKS5i aW5kKCdjbG9zZScsIHRoaXMuY2xvc2UuYmluZCh0aGlzKSk7CisKKyAgICAgICAgdmFyIHByb2Nl c3NpbmcgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdkaXYnKTsKKyAgICAgICAgcHJvY2Vzc2lu Zy5jbGFzc05hbWUgPSAncHJvY2Vzcy10ZXh0JzsKKyAgICAgICAgcHJvY2Vzc2luZy50ZXh0Q29u dGVudCA9ICdQcm9jZXNzaW5nLi4uJzsKKyAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChwcm9jZXNz aW5nKTsKICAgICB9LAogICAgIGNsb3NlOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICAkKHRo aXMpLmRpYWxvZygnY2xvc2UnKTsKKyAgICAgICAgdGhpcy5zdHlsZS52aXNpYmlsaXR5ID0gJ2hp ZGRlbic7CisgICAgICAgIEFycmF5LnByb3RvdHlwZS5mb3JFYWNoLmNhbGwodGhpcy5xdWVyeVNl bGVjdG9yQWxsKCcuc3RhdHVzLWNvbnRlbnQnKSwgZnVuY3Rpb24obm9kZSkgeworICAgICAgICAg ICAgbm9kZS5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKG5vZGUpOworICAgICAgICB9KTsKICAgICB9 LAotICAgIGFkZE1lc3NhZ2U6IGZ1bmN0aW9uKG1lc3NhZ2UpCisgICAgYWRkTWVzc2FnZTogZnVu Y3Rpb24oaWQsIG1lc3NhZ2UpCiAgICAgeworICAgICAgICB0aGlzLnN0eWxlLnZpc2liaWxpdHkg PSAndmlzaWJsZSc7CisgICAgICAgICQodGhpcykuYWRkQ2xhc3MoJ3Byb2Nlc3NpbmcnKTsKKwog ICAgICAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpOwogICAg ICAgICAkKGVsZW1lbnQpLmFkZENsYXNzKCdtZXNzYWdlJykudGV4dChtZXNzYWdlKTsKLSAgICAg ICAgdGhpcy5fY29udGVudC5hcHBlbmRDaGlsZChlbGVtZW50KTsKKworICAgICAgICB2YXIgY29u dGVudCA9IHRoaXMucXVlcnlTZWxlY3RvcignIycgKyBpZCk7CisgICAgICAgIGlmICghY29udGVu dCkgeworICAgICAgICAgICAgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2Rpdicp OworICAgICAgICAgICAgY29udGVudC5pZCA9IGlkOworICAgICAgICAgICAgY29udGVudC5jbGFz c05hbWUgPSAnc3RhdHVzLWNvbnRlbnQnOworICAgICAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChj b250ZW50KTsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQoZWxlbWVu dCk7CisgICAgICAgIGVsZW1lbnQuc2Nyb2xsSW50b1ZpZXcoKTsKICAgICB9LAogICAgIC8vIEZJ WE1FOiBJdCdzIHVuY2xlYXIgd2hldGhlciB0aGlzIGNvZGUgY291bGQgbGl2ZSBoZXJlIG9yIGlu IGEgY29udHJvbGxlci4KLSAgICBhZGRGaW5hbE1lc3NhZ2U6IGZ1bmN0aW9uKG1lc3NhZ2UpCisg ICAgYWRkRmluYWxNZXNzYWdlOiBmdW5jdGlvbihpZCwgbWVzc2FnZSkKICAgICB7Ci0gICAgICAg IHRoaXMuYWRkTWVzc2FnZShtZXNzYWdlKTsKLSAgICAgICAgdGhpcy5hcHBlbmRDaGlsZChuZXcg dWkuYWN0aW9ucy5MaXN0KFtuZXcgdWkuYWN0aW9ucy5DbG9zZSgpXSkpOwotICAgICAgICAkKHRo aXMpLmJpbmQoJ2Nsb3NlJywgdGhpcy5jbG9zZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgdGhpcy5h ZGRNZXNzYWdlKGlkLCBtZXNzYWdlKTsKKworICAgICAgICBkZWxldGUgdGhpcy5fdW5maW5pc2hl ZElkc1tpZF07CisgICAgICAgIGlmICghT2JqZWN0LmtleXModGhpcy5fdW5maW5pc2hlZElkcyku bGVuZ3RoKQorICAgICAgICAgICAgJCh0aGlzKS5yZW1vdmVDbGFzcygncHJvY2Vzc2luZycpOwor ICAgIH0sCisgICAgbmV3SWQ6IGZ1bmN0aW9uKCkgeworICAgICAgICB2YXIgaWQgPSAnc3RhdHVz LWNvbnRlbnQtJyArICsrdGhpcy5fY3VycmVudElkOworICAgICAgICB0aGlzLl91bmZpbmlzaGVk SWRzW2lkXSA9IDE7CisgICAgICAgIHJldHVybiBpZDsKICAgICB9CiB9KTsKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGlj X2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWlfdW5pdHRlc3RzLmpzIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1 cmVzL3NjcmlwdHMvdWlfdW5pdHRlc3RzLmpzCmluZGV4IGM3NzYxMDkyNGIzODM0MmExNzA3ZmMz M2U1YTk3YzFmYTIyYzI0MWIuLjA3NThmNjU3ZjY4Y2YzNzEyM2E3MzMyZmY2NmI0NDE0MzVjODdl YTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpX3VuaXR0ZXN0cy5qcwor KysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aV91bml0dGVzdHMuanMKQEAgLTExOSwxNyAr MTE5LDU3IEBAIHRlc3QoInRpbWUiLCA2LCBmdW5jdGlvbigpIHsKICAgICBlcXVhbCh0aW1lLmRh dGUoKS5nZXRUaW1lKCksIHRlbk1pbnV0ZXNBZ28uZ2V0VGltZSgpKTsKIH0pOwogCi10ZXN0KCJN ZXNzYWdlQm94IiwgMSwgZnVuY3Rpb24oKSB7Ci0gICAgdmFyIG1lc3NhZ2VCb3ggPSBuZXcgdWku TWVzc2FnZUJveCgnVGhlIFRpdGxlJywgJ0ZpcnN0IG1lc3NhZ2UnKTsKLSAgICBtZXNzYWdlQm94 LmFkZE1lc3NhZ2UoJ1NlY29uZCBNZXNzYWdlJyk7Ci0gICAgZXF1YWwobWVzc2FnZUJveC5vdXRl ckhUTUwsCi0gICAgICAgICc8ZGl2IGNsYXNzPSJ1aS1kaWFsb2ctY29udGVudCB1aS13aWRnZXQt Y29udGVudCIgc3R5bGU9IndpZHRoOiBhdXRvOyBtaW4taGVpZ2h0OiAxMzBweDsgaGVpZ2h0OiBh dXRvOyAiIHNjcm9sbHRvcD0iMCIgc2Nyb2xsbGVmdD0iMCI+JyArCi0gICAgICAgICAgICAnPGRp dj4nICsKLSAgICAgICAgICAgICAgICAnPGRpdiBjbGFzcz0ibWVzc2FnZSI+Rmlyc3QgbWVzc2Fn ZTwvZGl2PicgKwordGVzdCgiU3RhdHVzQXJlYSIsIDMsIGZ1bmN0aW9uKCkgeworICAgIHZhciBz dGF0dXNBcmVhID0gbmV3IHVpLlN0YXR1c0FyZWEoKTsKKyAgICB2YXIgaWQgPSBzdGF0dXNBcmVh Lm5ld0lkKCk7CisgICAgc3RhdHVzQXJlYS5hZGRNZXNzYWdlKGlkLCAnRmlyc3QgTWVzc2FnZScp OworICAgIHN0YXR1c0FyZWEuYWRkTWVzc2FnZShpZCwgJ1NlY29uZCBNZXNzYWdlJyk7CisgICAg ZXF1YWwoc3RhdHVzQXJlYS5vdXRlckhUTUwsCisgICAgICAgICc8ZGl2IGNsYXNzPSJzdGF0dXMg cHJvY2Vzc2luZyIgc3R5bGU9InZpc2liaWxpdHk6IHZpc2libGU7ICI+JyArCisgICAgICAgICAg ICAnPHVsIGNsYXNzPSJhY3Rpb25zIj48bGk+PGJ1dHRvbiBjbGFzcz0iYWN0aW9uIj5DbG9zZTwv YnV0dG9uPjwvbGk+PC91bD4nICsKKyAgICAgICAgICAgICc8ZGl2IGNsYXNzPSJwcm9jZXNzLXRl eHQiPlByb2Nlc3NpbmcuLi48L2Rpdj4nICsKKyAgICAgICAgICAgICc8ZGl2IGlkPSJzdGF0dXMt Y29udGVudC0xIiBjbGFzcz0ic3RhdHVzLWNvbnRlbnQiPicgKworICAgICAgICAgICAgICAgICc8 ZGl2IGNsYXNzPSJtZXNzYWdlIj5GaXJzdCBNZXNzYWdlPC9kaXY+JyArCiAgICAgICAgICAgICAg ICAgJzxkaXYgY2xhc3M9Im1lc3NhZ2UiPlNlY29uZCBNZXNzYWdlPC9kaXY+JyArCiAgICAgICAg ICAgICAnPC9kaXY+JyArCiAgICAgICAgICc8L2Rpdj4nKTsKLSAgICBtZXNzYWdlQm94LmNsb3Nl KCk7CisKKyAgICB2YXIgc2Vjb25kU3RhdHVzQXJlYSA9IG5ldyB1aS5TdGF0dXNBcmVhKCk7Cisg ICAgdmFyIHNlY29uZElkID0gc2Vjb25kU3RhdHVzQXJlYS5uZXdJZCgpOworICAgIHNlY29uZFN0 YXR1c0FyZWEuYWRkTWVzc2FnZShzZWNvbmRJZCwgJ0ZpcnN0IE1lc3NhZ2Ugc2Vjb25kIGlkJyk7 CisKKyAgICBlcXVhbChzdGF0dXNBcmVhLm91dGVySFRNTCwKKyAgICAgICAgJzxkaXYgY2xhc3M9 InN0YXR1cyBwcm9jZXNzaW5nIiBzdHlsZT0idmlzaWJpbGl0eTogdmlzaWJsZTsgIj4nICsKKyAg ICAgICAgICAgICc8dWwgY2xhc3M9ImFjdGlvbnMiPjxsaT48YnV0dG9uIGNsYXNzPSJhY3Rpb24i PkNsb3NlPC9idXR0b24+PC9saT48L3VsPicgKworICAgICAgICAgICAgJzxkaXYgY2xhc3M9InBy b2Nlc3MtdGV4dCI+UHJvY2Vzc2luZy4uLjwvZGl2PicgKworICAgICAgICAgICAgJzxkaXYgaWQ9 InN0YXR1cy1jb250ZW50LTEiIGNsYXNzPSJzdGF0dXMtY29udGVudCI+JyArCisgICAgICAgICAg ICAgICAgJzxkaXYgY2xhc3M9Im1lc3NhZ2UiPkZpcnN0IE1lc3NhZ2U8L2Rpdj4nICsKKyAgICAg ICAgICAgICAgICAnPGRpdiBjbGFzcz0ibWVzc2FnZSI+U2Vjb25kIE1lc3NhZ2U8L2Rpdj4nICsK KyAgICAgICAgICAgICc8L2Rpdj4nICsKKyAgICAgICAgICAgICc8ZGl2IGlkPSJzdGF0dXMtY29u dGVudC0yIiBjbGFzcz0ic3RhdHVzLWNvbnRlbnQiPicgKworICAgICAgICAgICAgICAgICc8ZGl2 IGNsYXNzPSJtZXNzYWdlIj5GaXJzdCBNZXNzYWdlIHNlY29uZCBpZDwvZGl2PicgKworICAgICAg ICAgICAgJzwvZGl2PicgKworICAgICAgICAnPC9kaXY+Jyk7CisKKyAgICBzdGF0dXNBcmVhLmFk ZEZpbmFsTWVzc2FnZShpZCwgJ0ZpbmFsIE1lc3NhZ2UgMScpOworICAgIHN0YXR1c0FyZWEuYWRk RmluYWxNZXNzYWdlKHNlY29uZElkLCAnRmluYWwgTWVzc2FnZSAyJyk7CisKKyAgICBlcXVhbChz dGF0dXNBcmVhLm91dGVySFRNTCwKKyAgICAgICAgJzxkaXYgY2xhc3M9InN0YXR1cyIgc3R5bGU9 InZpc2liaWxpdHk6IHZpc2libGU7ICI+JyArCisgICAgICAgICAgICAnPHVsIGNsYXNzPSJhY3Rp b25zIj48bGk+PGJ1dHRvbiBjbGFzcz0iYWN0aW9uIj5DbG9zZTwvYnV0dG9uPjwvbGk+PC91bD4n ICsKKyAgICAgICAgICAgICc8ZGl2IGNsYXNzPSJwcm9jZXNzLXRleHQiPlByb2Nlc3NpbmcuLi48 L2Rpdj4nICsKKyAgICAgICAgICAgICc8ZGl2IGlkPSJzdGF0dXMtY29udGVudC0xIiBjbGFzcz0i c3RhdHVzLWNvbnRlbnQiPicgKworICAgICAgICAgICAgICAgICc8ZGl2IGNsYXNzPSJtZXNzYWdl Ij5GaXJzdCBNZXNzYWdlPC9kaXY+JyArCisgICAgICAgICAgICAgICAgJzxkaXYgY2xhc3M9Im1l c3NhZ2UiPlNlY29uZCBNZXNzYWdlPC9kaXY+JyArCisgICAgICAgICAgICAgICAgJzxkaXYgY2xh c3M9Im1lc3NhZ2UiPkZpbmFsIE1lc3NhZ2UgMTwvZGl2PicgKworICAgICAgICAgICAgJzwvZGl2 PicgKworICAgICAgICAgICAgJzxkaXYgaWQ9InN0YXR1cy1jb250ZW50LTIiIGNsYXNzPSJzdGF0 dXMtY29udGVudCI+JyArCisgICAgICAgICAgICAgICAgJzxkaXYgY2xhc3M9Im1lc3NhZ2UiPkZp cnN0IE1lc3NhZ2Ugc2Vjb25kIGlkPC9kaXY+JyArCisgICAgICAgICAgICAgICAgJzxkaXYgY2xh c3M9Im1lc3NhZ2UiPkZpbmFsIE1lc3NhZ2UgMjwvZGl2PicgKworICAgICAgICAgICAgJzwvZGl2 PicgKworICAgICAgICAnPC9kaXY+Jyk7CisKKyAgICBzdGF0dXNBcmVhLmNsb3NlKCk7CiB9KTsK IAogfSkoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zdHlsZXMvcmVzdWx0cy5jc3Mg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNf aHRtbC9UZXN0RmFpbHVyZXMvc3R5bGVzL3Jlc3VsdHMuY3NzCmluZGV4IGIwYjM1MDJiNWRjOTk0 N2E2MmE0Njc2YmZiNWQ4YjhlOGYxYjMyOTYuLmU3ZTUxMTZmNGY5YmViYWIwYjZiMTA1MzI4Y2Yz NmIyMGY1ZjJmN2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zdHlsZXMvcmVzdWx0cy5j c3MKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv cHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3N0eWxlcy9yZXN1bHRzLmNzcwpAQCAtODksMyArODks NDYgQEAKIC51aS1zdGF0ZS1hY3RpdmUgLm5vbi1saW5rLXRpdGxlLCAudWktc3RhdGUtYWN0aXZl IC5ub24tbGluay10aXRsZTpsaW5rLCAudWktc3RhdGUtYWN0aXZlIC5ub24tbGluay10aXRsZTp2 aXNpdGVkIHsKICAgICBkaXNwbGF5OiBub25lOwogfQorCisvKioqIHN0YXR1cyBjb25zb2xlICoq Ki8KKy5zdGF0dXMgeworICAgIHBvc2l0aW9uOiBmaXhlZDsKKyAgICBib3R0b206IDA7CisgICAg bGVmdDogMDsKKyAgICByaWdodDogMDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91 bmQtY29sb3I6IHdoaXRlOworICAgIGJvcmRlci10b3A6IDNweCBzb2xpZDsKKyAgICBvdmVyZmxv dzogYXV0bzsKKyAgICB3aGl0ZS1zcGFjZTogbm93cmFwOworICAgIHBhZGRpbmc6IDRweDsKK30K KworLnN0YXR1cyAuYWN0aW9ucywgLnN0YXR1cyAucHJvY2Vzcy10ZXh0IHsKKyAgICBwb3NpdGlv bjogZml4ZWQ7CisgICAgYm90dG9tOiAwOworICAgIHJpZ2h0OiAwOworICAgIG1hcmdpbjogNHB4 OworfQorCisucHJvY2Vzc2luZyAuYWN0aW9ucyB7CisgICAgZGlzcGxheTogbm9uZTsKK30KKwor LnByb2Nlc3NpbmcgLnByb2Nlc3MtdGV4dCB7CisgICAgZGlzcGxheTogYmxvY2s7Cit9CisKKy5w cm9jZXNzLXRleHQgeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKKy5zdGF0dXMtY29udGVudCB7 CisgICAgYm9yZGVyLWJvdHRvbTogMXB4IGRhc2hlZDsKKyAgICBtYXJnaW4tYm90dG9tOiAxZW07 Cit9CisKKy5zdGF0dXMtY29udGVudDpsYXN0LWNoaWxkIHsKKyAgICBib3JkZXItYm90dG9tOiAw OworICAgIG1hcmdpbi1ib3R0b206IDA7Cit9Cg==