174775 2017-07-24 00:37:42 -0700 Handle case where line_numbers is None instead of an array of line numbers 2017-07-24 10:31:17 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 173559 1 rego jbedard aakash_jain buildbot commit-queue ddkilzer glenn jbedard lforschler oldest_to_newest 1331553 0 rego 2017-07-24 00:37:42 -0700 After r219657 (bug #173559) we're getting a weird style checker error in some patches: * https://bugs.webkit.org/show_bug.cgi?id=174675#c5 * https://bugs.webkit.org/show_bug.cgi?id=174451#c29 Traceback (most recent call last): File "Tools/Scripts/check-webkit-style", line 48, in <module> sys.exit(CheckWebKitStyle().main()) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/main.py", line 155, in main patch_checker.check(patch) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/patchreader.py", line 71, in check self._text_file_reader.process_file(file_path=path, line_numbers=None) File "/Volumes/Data/StyleQueue/WebKit/Tools/Scripts/webkitpy/style/filereader.py", line 119, in process_file self._files[abs_file_path] = self._files[abs_file_path] + kwargs['line_numbers'] TypeError: can only concatenate list (not "NoneType") to list 1331613 1 316291 jbedard 2017-07-24 08:31:11 -0700 Created attachment 316291 Patch 1331614 2 jbedard 2017-07-24 08:32:55 -0700 A bit surprised we didn't have a unit test for this. It's a simple fix, added a test as well. 1331646 3 316291 aakash_jain 2017-07-24 09:43:37 -0700 Comment on attachment 316291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316291&action=review > Tools/Scripts/webkitpy/style/filereader.py:115 > + if 'line_numbers' in kwargs and kwargs['line_numbers']: Please check if we can simplify this to if kwargs.get('line_numbers'): > Tools/Scripts/webkitpy/style/main_unittest.py:165 > + def test_linter_added_file(self): Nit: should this name be more descriptive? 1331648 4 316299 jbedard 2017-07-24 09:43:57 -0700 Created attachment 316299 Patch 1331655 5 316300 jbedard 2017-07-24 09:53:02 -0700 Created attachment 316300 Patch for landing 1331664 6 316300 commit-queue 2017-07-24 10:31:15 -0700 Comment on attachment 316300 Patch for landing Clearing flags on attachment: 316300 Committed r219827: <http://trac.webkit.org/changeset/219827> 1331665 7 commit-queue 2017-07-24 10:31:17 -0700 All reviewed patches have been landed. Closing bug. 316291 2017-07-24 08:31:11 -0700 2017-07-24 09:43:56 -0700 Patch bug-174775-20170724083110.patch text/plain 3027 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTgyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA3LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBIYW5kbGUgY2FzZSB3aGVyZSBsaW5lX251bWJlcnMgaXMgTm9uZSBpbnN0 ZWFkIG9mIGFuIGFycmF5IG9mIGxpbmUgbnVtYmVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgZmlsZXMgc2V0IGxpbmVfbnVtYmVycyB0byBO b25lIGluIHByb2Nlc3NfZmlsZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv ZmlsZXJlYWRlci5weToKKyAgICAgICAgKFRleHRGaWxlUmVhZGVyLnByb2Nlc3NfZmlsZSk6IEhh bmRsZSBjYXNlIHdoZXJlIGxpbmVfbnVtYmVyIGlzIHNldCB0byBOb25lLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weToKKyAgICAgICAgKEV4cGVjdGF0 aW9uTGludGVySW5TdHlsZUNoZWNrZXJUZXN0LnRlc3RfbGludGVyX2FkZGVkX2ZpbGUpOiBUZXN0 IGNhc2Ugb2YgYW4gYWRkZWQgZmlsZS4KKwogMjAxNy0wNy0yNCAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gQWRkIGxpYmVwb3h5IHRvIHRoZSBK aGJ1aWxkIG1vZHVsZXNldApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxl cmVhZGVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmls ZXJlYWRlci5weQkocmV2aXNpb24gMjE5ODIxKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9maWxlcmVhZGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsNyArMTEyLDcgQEAgY2xh c3MgVGV4dEZpbGVSZWFkZXIob2JqZWN0KToKICAgICAgICAgYWJzX2ZpbGVfcGF0aCA9IHNlbGYu ZmlsZXN5c3RlbS5hYnNwYXRoKGZpbGVfcGF0aCkKICAgICAgICAgaWYgYWJzX2ZpbGVfcGF0aCBu b3QgaW4gc2VsZi5fZmlsZXM6CiAgICAgICAgICAgICBzZWxmLl9maWxlc1thYnNfZmlsZV9wYXRo XSA9IE5vbmUKLSAgICAgICAgaWYgJ2xpbmVfbnVtYmVycycgaW4ga3dhcmdzOgorICAgICAgICBp ZiAnbGluZV9udW1iZXJzJyBpbiBrd2FyZ3MgYW5kIGt3YXJnc1snbGluZV9udW1iZXJzJ106CiAg ICAgICAgICAgICAjIERlbGV0ZWQgZmlsZXMgd2lsbCBiZSAnTm9uZScsIGJ1dCBpZiBhIGZpbGUg aGFzIG1vZGlmaWVkIGxpbmVzLCB0aGlzIGluZm9ybWF0aW9uIHNob3VsZCBvdmVycmlkZSB0aGUg J05vbmUnCiAgICAgICAgICAgICBpZiBzZWxmLl9maWxlc1thYnNfZmlsZV9wYXRoXSBpcyBOb25l OgogICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzW2Fic19maWxlX3BhdGhdID0gW10KSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW5fdW5pdHRlc3QucHkJKHJldmlz aW9uIDIxOTgyMSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVz dC5weQkod29ya2luZyBjb3B5KQpAQCAtMTYyLDYgKzE2MiwxOSBAQCBjbGFzcyBFeHBlY3RhdGlv bkxpbnRlckluU3R5bGVDaGVja2VyVGVzCiAgICAgICAgICAgICBmaWxlX3JlYWRlci5kb19hc3Nv Y2lhdGlvbl9jaGVjaygnL21vY2stY2hlY2tvdXQnLCBob3N0KQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNjb3BlLmNhcHR1cmVkX291dHB1dCwgKCcnLCAnJywgJycpKQogCisgICAgZGVmIHRl c3RfbGludGVyX2FkZGVkX2ZpbGUoc2VsZik6CisgICAgICAgIGZpbGVzID0geworICAgICAgICAg ICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMnOgorICAgICAg ICAgICAgJyMgVGVzdEV4cGVjdGF0aW9uc1xuY3NzMS90ZXN0Lmh0bWwgWyBGYWlsdXJlIF1cbmNz czEvdGVzdC5odG1sIFsgRmFpbHVyZSBdXG4nfQorICAgICAgICBob3N0ID0gc2VsZi5fZ2VuZXJh dGVfdGVzdGluZ19ob3N0KGZpbGVzKQorCisgICAgICAgIHNjb3BlID0gT3V0cHV0Q2FwdHVyZVNj b3BlKCkKKyAgICAgICAgd2l0aCBzY29wZToKKyAgICAgICAgICAgIGZpbGVfcmVhZGVyID0gc2Vs Zi5fZ2VuZXJhdGVfZmlsZV9yZWFkZXIoaG9zdC5maWxlc3lzdGVtKQorICAgICAgICAgICAgZmls ZV9yZWFkZXIucHJvY2Vzc19maWxlKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhw ZWN0YXRpb25zJywgbGluZV9udW1iZXJzPU5vbmUpCisgICAgICAgICAgICBmaWxlX3JlYWRlci5k b19hc3NvY2lhdGlvbl9jaGVjaygnL21vY2stY2hlY2tvdXQnLCBob3N0KQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHNjb3BlLmNhcHR1cmVkX291dHB1dCwgKCcnLCAnJywgJy9tb2NrLWNoZWNr b3V0L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnM6MzogIER1cGxpY2F0ZSBvciBhbWJpZ3Vv dXMgZW50cnkgbGluZXMgTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9uczoyIGFuZCBMYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zOjMuICBbdGVzdC9leHBlY3RhdGlvbnNdIFs1XVxuJykpCisK ICAgICBkZWYgdGVzdF9saW50ZXJfZGVsZXRlZF9maWxlKHNlbGYpOgogICAgICAgICBmaWxlcyA9 IHsKICAgICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zJzoK 316299 2017-07-24 09:43:57 -0700 2017-07-24 09:53:01 -0700 Patch bug-174775-20170724094356.patch text/plain 3002 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTgyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA3LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBIYW5kbGUgY2FzZSB3aGVyZSBsaW5lX251bWJlcnMgaXMgTm9uZSBpbnN0 ZWFkIG9mIGFuIGFycmF5IG9mIGxpbmUgbnVtYmVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgZmlsZXMgc2V0IGxpbmVfbnVtYmVycyB0byBO b25lIGluIHByb2Nlc3NfZmlsZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv ZmlsZXJlYWRlci5weToKKyAgICAgICAgKFRleHRGaWxlUmVhZGVyLnByb2Nlc3NfZmlsZSk6IEhh bmRsZSBjYXNlIHdoZXJlIGxpbmVfbnVtYmVyIGlzIHNldCB0byBOb25lLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weToKKyAgICAgICAgKEV4cGVjdGF0 aW9uTGludGVySW5TdHlsZUNoZWNrZXJUZXN0LnRlc3RfbGludGVyX2FkZGVkX2ZpbGUpOiBUZXN0 IGNhc2Ugb2YgYW4gYWRkZWQgZmlsZS4KKwogMjAxNy0wNy0yNCAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV0gQWRkIGxpYmVwb3h5IHRvIHRoZSBK aGJ1aWxkIG1vZHVsZXNldApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9maWxl cmVhZGVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmls ZXJlYWRlci5weQkocmV2aXNpb24gMjE5ODI0KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9maWxlcmVhZGVyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsNyArMTEyLDcgQEAgY2xh c3MgVGV4dEZpbGVSZWFkZXIob2JqZWN0KToKICAgICAgICAgYWJzX2ZpbGVfcGF0aCA9IHNlbGYu ZmlsZXN5c3RlbS5hYnNwYXRoKGZpbGVfcGF0aCkKICAgICAgICAgaWYgYWJzX2ZpbGVfcGF0aCBu b3QgaW4gc2VsZi5fZmlsZXM6CiAgICAgICAgICAgICBzZWxmLl9maWxlc1thYnNfZmlsZV9wYXRo XSA9IE5vbmUKLSAgICAgICAgaWYgJ2xpbmVfbnVtYmVycycgaW4ga3dhcmdzOgorICAgICAgICBp ZiBrd2FyZ3MuZ2V0KCdsaW5lX251bWJlcnMnKToKICAgICAgICAgICAgICMgRGVsZXRlZCBmaWxl cyB3aWxsIGJlICdOb25lJywgYnV0IGlmIGEgZmlsZSBoYXMgbW9kaWZpZWQgbGluZXMsIHRoaXMg aW5mb3JtYXRpb24gc2hvdWxkIG92ZXJyaWRlIHRoZSAnTm9uZScKICAgICAgICAgICAgIGlmIHNl bGYuX2ZpbGVzW2Fic19maWxlX3BhdGhdIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAgc2VsZi5f ZmlsZXNbYWJzX2ZpbGVfcGF0aF0gPSBbXQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9tYWluX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weQkocmV2aXNpb24gMjE5ODI0KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0x NjIsNiArMTYyLDE5IEBAIGNsYXNzIEV4cGVjdGF0aW9uTGludGVySW5TdHlsZUNoZWNrZXJUZXMK ICAgICAgICAgICAgIGZpbGVfcmVhZGVyLmRvX2Fzc29jaWF0aW9uX2NoZWNrKCcvbW9jay1jaGVj a291dCcsIGhvc3QpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NvcGUuY2FwdHVyZWRfb3V0 cHV0LCAoJycsICcnLCAnJykpCiAKKyAgICBkZWYgdGVzdF9saW50ZXJfYWRkZWRfZmlsZShzZWxm KToKKyAgICAgICAgZmlsZXMgPSB7CisgICAgICAgICAgICAnL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyc6CisgICAgICAgICAgICAnIyBUZXN0RXhwZWN0YXRpb25z XG5jc3MxL3Rlc3QuaHRtbCBbIEZhaWx1cmUgXVxuY3NzMS90ZXN0Lmh0bWwgWyBGYWlsdXJlIF1c bid9CisgICAgICAgIGhvc3QgPSBzZWxmLl9nZW5lcmF0ZV90ZXN0aW5nX2hvc3QoZmlsZXMpCisK KyAgICAgICAgc2NvcGUgPSBPdXRwdXRDYXB0dXJlU2NvcGUoKQorICAgICAgICB3aXRoIHNjb3Bl OgorICAgICAgICAgICAgZmlsZV9yZWFkZXIgPSBzZWxmLl9nZW5lcmF0ZV9maWxlX3JlYWRlciho b3N0LmZpbGVzeXN0ZW0pCisgICAgICAgICAgICBmaWxlX3JlYWRlci5wcm9jZXNzX2ZpbGUoJy9t b2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMnLCBsaW5lX251bWJlcnM9 Tm9uZSkKKyAgICAgICAgICAgIGZpbGVfcmVhZGVyLmRvX2Fzc29jaWF0aW9uX2NoZWNrKCcvbW9j ay1jaGVja291dCcsIGhvc3QpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2NvcGUuY2FwdHVy ZWRfb3V0cHV0LCAoJycsICcnLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9uczozOiAgRHVwbGljYXRlIG9yIGFtYmlndW91cyBlbnRyeSBsaW5lcyBMYXlvdXRUZXN0 cy9UZXN0RXhwZWN0YXRpb25zOjIgYW5kIExheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnM6My4g IFt0ZXN0L2V4cGVjdGF0aW9uc10gWzVdXG4nKSkKKwogICAgIGRlZiB0ZXN0X2xpbnRlcl9kZWxl dGVkX2ZpbGUoc2VsZik6CiAgICAgICAgIGZpbGVzID0gewogICAgICAgICAgICAgJy9tb2NrLWNo ZWNrb3V0L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMnOgo= 316300 2017-07-24 09:53:02 -0700 2017-07-24 10:31:15 -0700 Patch for landing bug-174775-20170724095302.patch text/plain 3021 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxOTgyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE3LTA3LTI0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBIYW5kbGUgY2FzZSB3aGVyZSBsaW5lX251bWJlcnMgaXMgTm9uZSBpbnN0 ZWFkIG9mIGFuIGFycmF5IG9mIGxpbmUgbnVtYmVycworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWFr YXNoIEphaW4uCisKKyAgICAgICAgQWRkZWQgZmlsZXMgc2V0IGxpbmVfbnVtYmVycyB0byBOb25l IGluIHByb2Nlc3NfZmlsZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvZmls ZXJlYWRlci5weToKKyAgICAgICAgKFRleHRGaWxlUmVhZGVyLnByb2Nlc3NfZmlsZSk6IEhhbmRs ZSBjYXNlIHdoZXJlIGxpbmVfbnVtYmVyIGlzIHNldCB0byBOb25lLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvc3R5bGUvbWFpbl91bml0dGVzdC5weToKKyAgICAgICAgKEV4cGVjdGF0aW9u TGludGVySW5TdHlsZUNoZWNrZXJUZXN0LnRlc3RfbGludGVyX2FkZGVkX2ZpbGVfd2l0aF9lcnJv cik6IFRlc3QgY2FzZSBvZiBhbiBhZGRlZCBmaWxlLgorCiAyMDE3LTA3LTI0ICBaYW4gRG9iZXJz ZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBBZGQgbGliZXBveHkg dG8gdGhlIEpoYnVpbGQgbW9kdWxlc2V0CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2ZpbGVyZWFkZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9maWxlcmVhZGVyLnB5CShyZXZpc2lvbiAyMTk4MjQpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2ZpbGVyZWFkZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTExMiw3ICsxMTIs NyBAQCBjbGFzcyBUZXh0RmlsZVJlYWRlcihvYmplY3QpOgogICAgICAgICBhYnNfZmlsZV9wYXRo ID0gc2VsZi5maWxlc3lzdGVtLmFic3BhdGgoZmlsZV9wYXRoKQogICAgICAgICBpZiBhYnNfZmls ZV9wYXRoIG5vdCBpbiBzZWxmLl9maWxlczoKICAgICAgICAgICAgIHNlbGYuX2ZpbGVzW2Fic19m aWxlX3BhdGhdID0gTm9uZQotICAgICAgICBpZiAnbGluZV9udW1iZXJzJyBpbiBrd2FyZ3M6Cisg ICAgICAgIGlmIGt3YXJncy5nZXQoJ2xpbmVfbnVtYmVycycpOgogICAgICAgICAgICAgIyBEZWxl dGVkIGZpbGVzIHdpbGwgYmUgJ05vbmUnLCBidXQgaWYgYSBmaWxlIGhhcyBtb2RpZmllZCBsaW5l cywgdGhpcyBpbmZvcm1hdGlvbiBzaG91bGQgb3ZlcnJpZGUgdGhlICdOb25lJwogICAgICAgICAg ICAgaWYgc2VsZi5fZmlsZXNbYWJzX2ZpbGVfcGF0aF0gaXMgTm9uZToKICAgICAgICAgICAgICAg ICBzZWxmLl9maWxlc1thYnNfZmlsZV9wYXRoXSA9IFtdCkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL21haW5fdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9tYWluX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMTk4MjQpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL21haW5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29w eSkKQEAgLTE2Miw2ICsxNjIsMTkgQEAgY2xhc3MgRXhwZWN0YXRpb25MaW50ZXJJblN0eWxlQ2hl Y2tlclRlcwogICAgICAgICAgICAgZmlsZV9yZWFkZXIuZG9fYXNzb2NpYXRpb25fY2hlY2soJy9t b2NrLWNoZWNrb3V0JywgaG9zdCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzY29wZS5jYXB0 dXJlZF9vdXRwdXQsICgnJywgJycsICcnKSkKIAorICAgIGRlZiB0ZXN0X2xpbnRlcl9hZGRlZF9m aWxlX3dpdGhfZXJyb3Ioc2VsZik6CisgICAgICAgIGZpbGVzID0geworICAgICAgICAgICAgJy9t b2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMnOgorICAgICAgICAgICAg JyMgVGVzdEV4cGVjdGF0aW9uc1xuY3NzMS90ZXN0Lmh0bWwgWyBGYWlsdXJlIF1cbmNzczEvdGVz dC5odG1sIFsgRmFpbHVyZSBdXG4nfQorICAgICAgICBob3N0ID0gc2VsZi5fZ2VuZXJhdGVfdGVz dGluZ19ob3N0KGZpbGVzKQorCisgICAgICAgIHNjb3BlID0gT3V0cHV0Q2FwdHVyZVNjb3BlKCkK KyAgICAgICAgd2l0aCBzY29wZToKKyAgICAgICAgICAgIGZpbGVfcmVhZGVyID0gc2VsZi5fZ2Vu ZXJhdGVfZmlsZV9yZWFkZXIoaG9zdC5maWxlc3lzdGVtKQorICAgICAgICAgICAgZmlsZV9yZWFk ZXIucHJvY2Vzc19maWxlKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRp b25zJywgbGluZV9udW1iZXJzPU5vbmUpCisgICAgICAgICAgICBmaWxlX3JlYWRlci5kb19hc3Nv Y2lhdGlvbl9jaGVjaygnL21vY2stY2hlY2tvdXQnLCBob3N0KQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNjb3BlLmNhcHR1cmVkX291dHB1dCwgKCcnLCAnJywgJy9tb2NrLWNoZWNrb3V0L0xh eW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnM6MzogIER1cGxpY2F0ZSBvciBhbWJpZ3VvdXMgZW50 cnkgbGluZXMgTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9uczoyIGFuZCBMYXlvdXRUZXN0cy9U ZXN0RXhwZWN0YXRpb25zOjMuICBbdGVzdC9leHBlY3RhdGlvbnNdIFs1XVxuJykpCisKICAgICBk ZWYgdGVzdF9saW50ZXJfZGVsZXRlZF9maWxlKHNlbGYpOgogICAgICAgICBmaWxlcyA9IHsKICAg ICAgICAgICAgICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zJzoK