153818 2016-02-02 21:19:35 -0800 Format revisions for display according to repository type 2016-02-03 22:08:49 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=152345 P2 Normal --- 1 jmarcell webkit-unassigned adele ap dbates dburkart dean_johnson dino jmarcell lforschler matthew_hanson oldest_to_newest 1161527 0 jmarcell 2016-02-02 21:19:35 -0800 Add special logic for Git revisions in the popover 1161530 1 270547 jmarcell 2016-02-02 21:29:14 -0800 Created attachment 270547 Patch 1161552 2 270547 ap 2016-02-02 22:11:25 -0800 Comment on attachment 270547 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270547&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:131 > + revision = commit.revisionNumber.substr(0, 7); Should there be a utility function with a helpful name for substr(0, 7)? 1161830 3 270610 jmarcell 2016-02-03 17:02:19 -0800 Created attachment 270610 Patch 1161835 4 jmarcell 2016-02-03 17:06:14 -0800 (In reply to comment #2) > Comment on attachment 270547 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=270547&action=review > > > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:131 > > + revision = commit.revisionNumber.substr(0, 7); > > Should there be a utility function with a helpful name for substr(0, 7)? I started to write a utility function just for the Git part but then I went another route and made a more generic function called _formatRevisionForDisplay that handles both the Git and the Subversion part. I also noticed another section of the codebase where we were doing almost the exact same thing so it ended up being useful there as well. 1161892 5 270610 ap 2016-02-03 21:42:36 -0800 Comment on attachment 270610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270610&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:127 > - linkElement.textContent = "r" + commit.revisionNumber; > + linkElement.textContent = this._formatRevisionForDisplay(commit.revisionNumber, branch.repository); Is "revision number" the right terminology for git? Just curious, no need to update all the naming for this patch even if it's not quite right. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:339 > + _formatRevisionForDisplay: function (revision, repository) Please remove the space after "function". > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:347 > + if (repository.isSVN) > + return "r" + revision; > + else if (repository.isGit) > + // Truncating for display. Git traditionally uses seven characters for a short hash. > + return revision.substr(0, 7); > + else > + console.assert(false, "Should not get here; " + repository.name + " did not specify a known VCS type."); WebKit style is to not use else after return. Here is how I would write this: console.assert(repository.isSVN || repository.isGit); if (repository.isSVN) return "r" + revision; // Truncating for display. Git traditionally uses seven characters for a short hash. return revision.substr(0, 7); 1161899 6 270610 jmarcell 2016-02-03 21:56:58 -0800 Comment on attachment 270610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270610&action=review >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:127 >> + linkElement.textContent = this._formatRevisionForDisplay(commit.revisionNumber, branch.repository); > > Is "revision number" the right terminology for git? > > Just curious, no need to update all the naming for this patch even if it's not quite right. I've thought about that before. With the introduction of Git, the revision is a hash, which you might argue is not a number because we're working with it in string form everywhere. On the other hand, a Git hash is actually a hexadecimal number. I think maybe the term "revision" instead of "revision number" might be more appropriate. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:339 >> + _formatRevisionForDisplay: function (revision, repository) > > Please remove the space after "function". Will do. >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:347 >> + console.assert(false, "Should not get here; " + repository.name + " did not specify a known VCS type."); > > WebKit style is to not use else after return. Here is how I would write this: > > console.assert(repository.isSVN || repository.isGit); > if (repository.isSVN) > return "r" + revision; > // Truncating for display. Git traditionally uses seven characters for a short hash. > return revision.substr(0, 7); Thanks. I'll use this. 1161905 7 jmarcell 2016-02-03 22:08:49 -0800 Landed: https://trac.webkit.org/changeset/196109 270547 2016-02-02 21:29:14 -0800 2016-02-03 17:02:15 -0800 Patch bug-153818-20160202212851.patch text/plain 1958 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MDQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTIzNTdjYzVjZjhkMWNiNzJlNzBjNGU1OWI1Yzg4YTUx ZjQ4ZjMyYi4uNTMyYjUzYmJkM2MyYjEyZDU2Njc2Zjg2Njc5Y2RjNWEwZGQ1MWQ1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE2LTAyLTAyICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCisg ICAgICAgIEFkZCBzcGVjaWFsIGxvZ2ljIGZvciBHaXQgcmV2aXNpb25zIGluIHRoZSBwb3BvdmVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM4MTgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2Fy ZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzOgorICAgICAgICAoQnVpbGRib3RRdWV1ZVZp ZXcucHJvdG90eXBlLl9wb3BvdmVyTGluZXNGb3JDb21taXRSYW5nZSk6IEFkZHMgc3BlY2lhbCBs b2dpYyBmb3IgR2l0IHJldmlzaW9ucyBpbiB0aGUgcG9wb3Zlci4KKwogMjAxNi0wMi0wMSAgSmFz b24gTWFyY2VsbCAgPGptYXJjZWxsQGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBkYXNoYm9h cmQgY29kZSB0byBjb21wYXJlIG5vbi1pbnRlZ2VyIHJldmlzaW9ucwpkaWZmIC0tZ2l0IGEvVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwv ZGFzaGJvYXJkL1NjcmlwdHMvQnVpbGRib3RRdWV1ZVZpZXcuanMgYi9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2Ny aXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwppbmRleCBjMWY1M2YyYjNmOTU3ODEwZWNmNDUyYWRk ZGIwZTcyM2QwNzJkNDRiLi40YzU0OGFlZDMzNTg5MGFjMjZmZGY4MzA5Y2ZlMmJiOTdiOGIxZmVi IDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwor KysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qcwpAQCAtMTI0LDcg KzEyNCwxMiBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBs aW5rRWxlbWVudC5jbGFzc05hbWUgPSAicmV2aXNpb24iOwogICAgICAgICAgICAgbGlua0VsZW1l bnQuaHJlZiA9IHRyYWMucmV2aXNpb25VUkwoY29tbWl0LnJldmlzaW9uTnVtYmVyKTsKICAgICAg ICAgICAgIGxpbmtFbGVtZW50LnRhcmdldCA9ICJfYmxhbmsiOwotICAgICAgICAgICAgbGlua0Vs ZW1lbnQudGV4dENvbnRlbnQgPSAiciIgKyBjb21taXQucmV2aXNpb25OdW1iZXI7CisgICAgICAg ICAgICB2YXIgcmV2aXNpb247CisgICAgICAgICAgICBpZiAoYnJhbmNoLnJlcG9zaXRvcnkuaXNT Vk4pCisgICAgICAgICAgICAgICAgcmV2aXNpb24gPSAiciIgKyBjb21taXQucmV2aXNpb25OdW1i ZXI7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgcmV2aXNpb24gPSBjb21taXQu cmV2aXNpb25OdW1iZXIuc3Vic3RyKDAsIDcpOworICAgICAgICAgICAgbGlua0VsZW1lbnQudGV4 dENvbnRlbnQgPSByZXZpc2lvbjsKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmRDaGlsZChsaW5r RWxlbWVudCk7CiAKICAgICAgICAgICAgIHZhciBhdXRob3JFbGVtZW50ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgic3BhbiIpOwo= 270610 2016-02-03 17:02:19 -0800 2016-02-03 21:42:36 -0800 Patch bug-153818-20160203170155.patch text/plain 5673 jmarcell U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MDcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWZhMmQ3ZmVkZjBkMTc4MTFjYjIxYjU2M2YyNmQ2MjJj MTc3YTI3OC4uMTY0YTBhODhiNTE4YzI4YjU2ZjliNGM2N2JjMTEwZTZhNWFkNzliMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE2LTAyLTAzICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxAYXBwbGUuY29tPgorCisg ICAgICAgIEZvcm1hdCByZXZpc2lvbnMgZm9yIGRpc3BsYXkgYWNjb3JkaW5nIHRvIHJlcG9zaXRv cnkgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUzODE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9k YXNoYm9hcmQvU2NyaXB0cy9CdWlsZGJvdFF1ZXVlVmlldy5qczoKKyAgICAgICAgKEJ1aWxkYm90 UXVldWVWaWV3LnByb3RvdHlwZS5fcG9wb3ZlckxpbmVzRm9yQ29tbWl0UmFuZ2UpOiBVc2UgbmV3 IF9mb3JtYXRSZXZpc2lvbkZvckRpc3BsYXkgdG8gZGlzcGxheSByZXZpc2lvbnMgYWNjb3JkaW5n CisgICAgICAgIHRvIHJlcG9zaXRvcnkgdHlwZS4KKyAgICAgICAgKEJ1aWxkYm90UXVldWVWaWV3 LnByb3RvdHlwZS5fcmV2aXNpb25Db250ZW50V2l0aFBvcG92ZXJGb3JJdGVyYXRpb24pOiBEaXR0 by4KKyAgICAgICAgKEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZS5fZm9ybWF0UmV2aXNpb25G b3JEaXNwbGF5KTogRm9ybWF0cyByZXZpc2lvbnMgZm9yIGRpc3BsYXkgYWNjb3JkaW5nIHRvIHJl cG9zaXRvcnkgdHlwZS4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQu b3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cy90ZXN0cy5qczog QWRkZWQgdW5pdCB0ZXN0cyB0byB0ZXN0IG5ldworICAgICAgICBfZm9ybWF0UmV2aXNpb25Gb3JE aXNwbGF5IGZ1bmN0aW9uLgorCiAyMDE2LTAyLTAxICBKYXNvbiBNYXJjZWxsICA8am1hcmNlbGxA YXBwbGUuY29tPgogCiAgICAgICAgIFRlYWNoIGRhc2hib2FyZCBjb2RlIHRvIGNvbXBhcmUgbm9u LWludGVnZXIgcmV2aXNpb25zCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy9CdWls ZGJvdFF1ZXVlVmlldy5qcyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3 LmpzCmluZGV4IGMxZjUzZjJiM2Y5NTc4MTBlY2Y0NTJhZGRkYjBlNzIzZDA3MmQ0NGIuLmRmZGNj NTZjZTYxYTRiOWM1OWJlZTIyOTc3YTk3OWE4NGJjYzNiMmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hi b2FyZC9TY3JpcHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL2Rhc2hib2FyZC9TY3Jp cHRzL0J1aWxkYm90UXVldWVWaWV3LmpzCkBAIC0xMjQsNyArMTI0LDcgQEAgQnVpbGRib3RRdWV1 ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgbGlua0VsZW1lbnQuY2xhc3NOYW1lID0g InJldmlzaW9uIjsKICAgICAgICAgICAgIGxpbmtFbGVtZW50LmhyZWYgPSB0cmFjLnJldmlzaW9u VVJMKGNvbW1pdC5yZXZpc2lvbk51bWJlcik7CiAgICAgICAgICAgICBsaW5rRWxlbWVudC50YXJn ZXQgPSAiX2JsYW5rIjsKLSAgICAgICAgICAgIGxpbmtFbGVtZW50LnRleHRDb250ZW50ID0gInIi ICsgY29tbWl0LnJldmlzaW9uTnVtYmVyOworICAgICAgICAgICAgbGlua0VsZW1lbnQudGV4dENv bnRlbnQgPSB0aGlzLl9mb3JtYXRSZXZpc2lvbkZvckRpc3BsYXkoY29tbWl0LnJldmlzaW9uTnVt YmVyLCBicmFuY2gucmVwb3NpdG9yeSk7CiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kQ2hpbGQo bGlua0VsZW1lbnQpOwogCiAgICAgICAgICAgICB2YXIgYXV0aG9yRWxlbWVudCA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKQEAgLTE0Niw3ICsxNDYsNyBAQCBCdWlsZGJvdFF1ZXVl Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIHRoZSBxdWV1ZSwgc2VlIF9zaG91bGRfZmls ZV90cmlnZ2VyX2J1aWxkIGluIHdrYnVpbGQucHkuCiAgICAgICAgIHZhciBjb21taXRzID0gdHJh Yy5jb21taXRzT25CcmFuY2hJblJldmlzaW9uUmFuZ2UoYnJhbmNoLm5hbWUsIGZpcnN0UmV2aXNp b25OdW1iZXIsIGxhc3RSZXZpc2lvbk51bWJlcik7CiAgICAgICAgIHJldHVybiBjb21taXRzLm1h cChmdW5jdGlvbihjb21taXQpIHsKLSAgICAgICAgICAgIHJldHVybiBsaW5lRm9yQ29tbWl0KHRy YWMsIGNvbW1pdCk7CisgICAgICAgICAgICByZXR1cm4gbGluZUZvckNvbW1pdC5jYWxsKHRoaXMs IHRyYWMsIGNvbW1pdCk7CiAgICAgICAgIH0sIHRoaXMpLnJldmVyc2UoKTsKICAgICB9LAogCkBA IC0yMjIsMTQgKzIyMiw3IEBAIEJ1aWxkYm90UXVldWVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgY29uc29sZS5hc3NlcnQoaXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSk7CiAg ICAgICAgIHZhciB0cmFjID0gcmVwb3NpdG9yeS50cmFjOwogICAgICAgICB2YXIgY29udGVudCA9 IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKLSAgICAgICAgdmFyIHJldmlzaW9uID0g aXRlcmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXTsKLSAgICAgICAgaWYgKHJlcG9zaXRv cnkuaXNTVk4pCi0gICAgICAgICAgICBjb250ZW50LnRleHRDb250ZW50ID0gInIiICsgcmV2aXNp b247Ci0gICAgICAgIGVsc2UgaWYgKHJlcG9zaXRvcnkuaXNHaXQpIHsKLSAgICAgICAgICAgIC8v IFRydW5jYXRpbmcgZm9yIGRpc3BsYXkuIEdpdCB0cmFkaXRpb25hbGx5IHVzZXMgc2V2ZW4gY2hh cmFjdGVycyBmb3IgYSBzaG9ydCBoYXNoLgotICAgICAgICAgICAgY29udGVudC50ZXh0Q29udGVu dCA9IHJldmlzaW9uLnN1YnN0cigwLCA3KTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBj b25zb2xlLmFzc2VydChmYWxzZSwgIlNob3VsZCBub3QgZ2V0IGhlcmU7ICIgKyByZXBvc2l0b3J5 Lm5hbWUgKyAiIGRpZCBub3Qgc3BlY2lmeSBhIGtub3duIFZDUyB0eXBlLiIpOworICAgICAgICBj b250ZW50LnRleHRDb250ZW50ID0gdGhpcy5fZm9ybWF0UmV2aXNpb25Gb3JEaXNwbGF5KGl0ZXJh dGlvbi5yZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0sIHJlcG9zaXRvcnkpOwogICAgICAgICBjb250 ZW50LmNsYXNzTGlzdC5hZGQoInJldmlzaW9uLW51bWJlciIpOwogCiAgICAgICAgIGlmIChwcmV2 aW91c0l0ZXJhdGlvbiAmJiB0cmFjLmluZGV4T2ZSZXZpc2lvbihwcmV2aW91c0l0ZXJhdGlvbi5y ZXZpc2lvbltyZXBvc2l0b3J5TmFtZV0pID4gLTEgJiYgdHJhYy5pbmRleE9mUmV2aXNpb24oaXRl cmF0aW9uLnJldmlzaW9uW3JlcG9zaXRvcnlOYW1lXSkgPiAtMSkgewpAQCAtMzQxLDYgKzMzNCwx NyBAQCBCdWlsZGJvdFF1ZXVlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgX3VuYXV0aG9yaXplZEFj Y2VzczogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLnVwZGF0ZVNvb24oKTsK LSAgICB9CisgICAgfSwKIAorICAgIF9mb3JtYXRSZXZpc2lvbkZvckRpc3BsYXk6IGZ1bmN0aW9u IChyZXZpc2lvbiwgcmVwb3NpdG9yeSkKKyAgICB7CisgICAgICAgIGlmIChyZXBvc2l0b3J5Lmlz U1ZOKQorICAgICAgICAgICAgcmV0dXJuICJyIiArIHJldmlzaW9uOworICAgICAgICBlbHNlIGlm IChyZXBvc2l0b3J5LmlzR2l0KQorICAgICAgICAgICAgLy8gVHJ1bmNhdGluZyBmb3IgZGlzcGxh eS4gR2l0IHRyYWRpdGlvbmFsbHkgdXNlcyBzZXZlbiBjaGFyYWN0ZXJzIGZvciBhIHNob3J0IGhh c2guCisgICAgICAgICAgICByZXR1cm4gcmV2aXNpb24uc3Vic3RyKDAsIDcpOworICAgICAgICBl bHNlCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlNob3VsZCBub3QgZ2V0IGhl cmU7ICIgKyByZXBvc2l0b3J5Lm5hbWUgKyAiIGRpZCBub3Qgc3BlY2lmeSBhIGtub3duIFZDUyB0 eXBlLiIpOworICAgICAgICByZXR1cm4gcmV2aXNpb247CisgICAgfQogfTsKZGlmZiAtLWdpdCBh L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL2Rhc2hib2FyZC9TY3JpcHRzL3Rlc3RzL3Rlc3RzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJvYXJkL1Njcmlw dHMvdGVzdHMvdGVzdHMuanMKaW5kZXggZTRjZTI3MWYxZTljZDJkNTk1OTdmZWRlMDIzMWY3MmJm M2ZmMDFmYy4uNGJhYjRlNzc5NjFmNWQ2MjE5NzllNWYzOTA1MzNmODJmMzc0NWZmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi bGljX2h0bWwvZGFzaGJvYXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMKKysrIGIvVG9vbHMvQnVp bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvZGFzaGJv YXJkL1NjcmlwdHMvdGVzdHMvdGVzdHMuanMKQEAgLTIwMCw2ICsyMDAsMjIgQEAgdGVzdCgiX3Jl dmlzaW9uQ29udGVudFdpdGhQb3BvdmVyRm9ySXRlcmF0aW9uIGhhcyBwcmV2aW91c0l0ZXJhdGlv biIsIGZ1bmN0aW9uKCkKICAgICBzdHJpY3RFcXVhbChub2RlTGlzdC5sZW5ndGgsIDIsICJoYXMg MiBjb21taXRzIik7CiB9KTsKIAordGVzdCgiX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSBTdWJ2 ZXJzaW9uIiwgZnVuY3Rpb24oKQoreworICAgIHZhciByZXBvc2l0b3J5ID0gdGhpcy50cnVua0Jy YW5jaC5yZXBvc2l0b3J5OworICAgIHJlcG9zaXRvcnkuaXNTVk4gPSB0cnVlOworICAgIHJlcG9z aXRvcnkuaXNHaXQgPSBmYWxzZTsKKyAgICBzdHJpY3RFcXVhbCh0aGlzLnZpZXcuX2Zvcm1hdFJl dmlzaW9uRm9yRGlzcGxheSgzMzAxOCwgcmVwb3NpdG9yeSksICJyMzMwMTgiLCAiU2hvdWxkIGJl IHIzMzAxOCIpCit9KTsKKwordGVzdCgiX2Zvcm1hdFJldmlzaW9uRm9yRGlzcGxheSBHaXQiLCBm dW5jdGlvbigpCit7CisgICAgdmFyIHJlcG9zaXRvcnkgPSB0aGlzLnRydW5rQnJhbmNoLnJlcG9z aXRvcnk7CisgICAgcmVwb3NpdG9yeS5pc1NWTiA9IGZhbHNlOworICAgIHJlcG9zaXRvcnkuaXNH aXQgPSB0cnVlOworICAgIHN0cmljdEVxdWFsKHRoaXMudmlldy5fZm9ybWF0UmV2aXNpb25Gb3JE aXNwbGF5KCIwZTQ5OGRiNWQ4ZTViNWEzNDI2MzEiLCByZXBvc2l0b3J5KSwgIjBlNDk4ZGIiLCAi U2hvdWxkIGJlIDBlNDk4ZGIiKTsKK30pOworCiBtb2R1bGUoIkJ1aWxkQm90UXVldWUiLCB7CiAg ICAgc2V0dXA6IGZ1bmN0aW9uKCkgewogICAgICAgICBEYXNoYm9hcmQuUmVwb3NpdG9yeS5PcGVu U291cmNlLnRyYWMgPSBuZXcgTW9ja1RyYWMoKTsK