167164 2017-01-18 10:08:12 -0800 check-webkit-style does not work with files being added with a property change and svn 1.9 2017-07-17 11:01:34 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified REOPENED https://bugs.webkit.org/show_bug.cgi?id=166948 https://bugs.webkit.org/show_bug.cgi?id=167167 https://bugs.webkit.org/show_bug.cgi?id=174551 InRadar P2 Normal --- 1 jbedard jbedard buildbot commit-queue dbates glenn lforschler webkit-bug-importer oldest_to_newest 1267770 0 jbedard 2017-01-18 10:08:12 -0800 check-webkit-style will output error messages when a file is added and it's properties are changed in svn 1.9. 1267773 1 webkit-bug-importer 2017-01-18 10:10:05 -0800 <rdar://problem/30077060> 1267813 2 jbedard 2017-01-18 12:14:30 -0800 This error should also occur when simply changing a file's properties, but there is another bug in svn-create-patch, so this issue will only reproduce if a file is both changed and it's properties are changed. Bug 167167 tracks this issue. 1267884 3 299183 jbedard 2017-01-18 14:29:49 -0800 Created attachment 299183 Patch 1267888 4 commit-queue 2017-01-18 14:32:01 -0800 Attachment 299183 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:144: trailing whitespace [pep8/W291] [5] ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:146: trailing whitespace [pep8/W291] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1267928 5 jbedard 2017-01-18 15:28:42 -0800 (In reply to comment #4) > Attachment 299183 [details] did not pass style-queue: > > > ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:144: > trailing whitespace [pep8/W291] [5] > ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:146: > trailing whitespace [pep8/W291] [5] > Total errors found: 2 in 3 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. These are a unique case for check-webkit-style. They are referencing style errors in strings which are representing patches. Bug 167181 tracks this. 1289800 6 305013 jbedard 2017-03-21 12:43:52 -0700 Created attachment 305013 Patch 1290024 7 buildbot 2017-03-22 02:31:13 -0700 Attachment 305013 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:144: trailing whitespace [pep8/W291] [5] ERROR: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py:146: trailing whitespace [pep8/W291] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1329596 8 305013 jbedard 2017-07-17 10:21:54 -0700 Comment on attachment 305013 Patch Sam has a better fix for this issue in <https://bugs.webkit.org/show_bug.cgi?id=174551> 1329597 9 jbedard 2017-07-17 10:23:04 -0700 Resolved in <https://trac.webkit.org/changeset/219540/webkit>. 1329616 10 jbedard 2017-07-17 11:01:34 -0700 I had initially tested this incorrectly. Sam's fix did not address this issue. 299183 2017-01-18 14:29:49 -0800 2017-03-21 12:43:44 -0700 Patch bug-167164-20170118142759.patch text/plain 4461 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMDg4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE3LTAxLTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGUgZG9lcyBub3Qgd29yayB3aXRoIGZpbGVz IGJlaW5nIGFkZGVkIHdpdGggYSBwcm9wZXJ0eSBjaGFuZ2UgYW5kIHN2biAxLjkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzE2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHk6CisgICAgICAgIChEaWZmUGFyc2VyLl9w YXJzZV9pbnRvX2RpZmZfZmlsZXMpOiBJZ25vcmUgcHJvcGVydHkgY2hhbmdlcyBpbiBhIGRpZmYg d2hlbiBzdHlsZSBjaGVja2luZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9kaWZmX3BhcnNlcl91bml0dGVzdC5weToKKyAgICAgICAgKERpZmZQYXJzZXJUZXN0 LnRlc3RfcHJvcGVydHlfaW5faW5kZXgpOiBQcm9wZXJ0eSBjaGFuZ2VzIGFuZCB0ZXh0IHJlbW92 YWwgdGVzdC4KKwogMjAxNy0wMS0xOCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+ CiAKICAgICAgICAgRG9jdW1lbnQ6OnNlY3VyaXR5T3JpZ2luKCkgc2hvdWxkIHJldHVybiBhIHJl ZmVyZW5jZS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2Rp ZmZfcGFyc2VyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5CShyZXZpc2lvbiAyMTA4MjUpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weQkod29ya2luZyBjb3B5 KQpAQCAtOTQsNiArOTQsNyBAQCBkZWYgZ2V0X2RpZmZfY29udmVydGVyKGxpbmVzKToKIF9JTklU SUFMX1NUQVRFID0gMQogX0RFQ0xBUkVEX0ZJTEVfUEFUSCA9IDIKIF9QUk9DRVNTSU5HX0NIVU5L ID0gMworX1BST1BFUlRZX0NIQU5HRSA9IDQKIAogCiBjbGFzcyBEaWZmRmlsZShvYmplY3QpOgpA QCAtMTg0LDEwICsxODUsMTcgQEAgY2xhc3MgRGlmZlBhcnNlcihvYmplY3QpOgogICAgICAgICAg ICAgICAgICAgICBjdXJyZW50X2ZpbGUuYWRkX3VuY2hhbmdlZF9saW5lKG9sZF9kaWZmX2xpbmUs IG5ld19kaWZmX2xpbmUsIGxpbmVbMTpdKQogICAgICAgICAgICAgICAgICAgICBvbGRfZGlmZl9s aW5lICs9IDEKICAgICAgICAgICAgICAgICAgICAgbmV3X2RpZmZfbGluZSArPSAxCi0gICAgICAg ICAgICAgICAgZWxpZiBsaW5lID09ICdcXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlJzoKKyAg ICAgICAgICAgICAgICBlbGlmIGxpbmUuc3RhcnRzd2l0aCgnUHJvcGVydHkgY2hhbmdlcyBvbjon KToKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUgPSBfUFJPUEVSVFlfQ0hBTkdFCisgICAgICAg ICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAgICAgICBlbGlmIGxpbmUgPT0gJ1xcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUnIG9yIGxpbmUgPT0gJyc6CiAgICAgICAgICAgICAgICAgICAg ICMgTm90aGluZyB0byBkby4gIFdlIG1heSBzdGlsbCBoYXZlIHNvbWUgYWRkZWQgbGluZXMuCiAg ICAgICAgICAgICAgICAgICAgIHBhc3MKICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAg ICAgICAgICAgICBfbG9nLmVycm9yKCdVbmV4cGVjdGVkIGRpZmYgZm9ybWF0IHdoZW4gcGFyc2lu ZyBhICcKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnY2h1bms6ICVyJyAlIGxpbmUp CisgICAgICAgICAgICBlbGlmIHN0YXRlID09IF9QUk9QRVJUWV9DSEFOR0U6CisgICAgICAgICAg ICAgICAgIyBJZ25vcmluZyB1bnRpbCBlbXB0eSBsaW5lIG9yIGtub3duIGVuZGluZworICAgICAg ICAgICAgICAgIGlmIGxpbmUgPT0gJ1xcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUnIG9yIGxp bmUgPT0gJyc6CisgICAgICAgICAgICAgICAgICAgIHN0YXRlID0gX1BST0NFU1NJTkdfQ0hVTksK ICAgICAgICAgcmV0dXJuIGZpbGVzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jaGVja291dC9kaWZmX3BhcnNlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlcl91bml0dGVzdC5weQko cmV2aXNpb24gMjEwODI1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tv dXQvZGlmZl9wYXJzZXJfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDEyICsyOCwx NiBAQAogCiBpbXBvcnQgY1N0cmluZ0lPIGFzIFN0cmluZ0lPCiBpbXBvcnQgZGlmZl9wYXJzZXIK K2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5jaGVja291dC5kaWZmX3Rlc3RfZGF0YSBpbXBvcnQgRElGRl9URVNUX0RBVEEK IAogCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCisKKwogY2xhc3MgRGlmZlBh cnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIG1heERpZmYgPSBOb25lCiAKQEAgLTEz MCw2ICsxMzQsNDEgQEAgY2xhc3MgRGlmZlBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAgICAgcGF0Y2ggPSBwLnN1YihsYW1iZGEgeDogIiAlcy8iICUgcHJlZml4W3guZ3Jv dXAoMSldLCBESUZGX1RFU1RfREFUQSkKICAgICAgICAgICAgIHNlbGYudGVzdF9kaWZmX3BhcnNl cihkaWZmX3BhcnNlci5EaWZmUGFyc2VyKHBhdGNoLnNwbGl0bGluZXMoKSkpCiAKKyAgICBkZWYg dGVzdF9wcm9wZXJ0eV9pbl9pbmRleChzZWxmKToKKyAgICAgICAgcmF3RGlmZiA9ICIiIlwKK0lu ZGV4OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQorLS0tIFRvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAyMTA4MjUpCisrKysgVG9vbHMvU2NyaXB0cy9i dWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKK0BAIC0zMiw3ICszMiw2IEBACisgCisgIyBCdWls ZCBzY3JpcHQgd3JhcHBlciBmb3IgdGhlIFdlYktpdCBPcGVuIFNvdXJjZSBQcm9qZWN0LgorIAor LXVzZSBzdHJpY3Q7CisgdXNlIEZpbGU6OkJhc2VuYW1lOworIHVzZSBGaWxlOjpGaW5kOworIHVz ZSBGaWxlOjpTcGVjOworCitQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBUb29scy9TY3JpcHRzL2J1aWxk LXdlYmtpdAorX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXworRGVsZXRlZDogc3ZuOmV4ZWN1dGFibGUKKyMjIC0xICswLDAg IyMKKy0qCitcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIHByb3BlcnR5CisiIiIKKyAgICAgICAgcGFy c2VyID0gZGlmZl9wYXJzZXIuRGlmZlBhcnNlcihyYXdEaWZmLnNwbGl0bGluZXMoKSkKKworICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKDEsIGxlbihwYXJzZXIuZmlsZXMpKQorICAgICAgICBzZWxm LmFzc2VydFRydWUoJ1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0JyBpbiBwYXJzZXIuZmlsZXMp CisKKyAgICAgICAgZGlmZiA9IHBhcnNlci5maWxlc1snVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQnXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCgzMiwgMzIpLCBkaWZmLmxpbmVzWzBdWzA6 Ml0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoKDM1LCAwLCAndXNlIHN0cmljdDsnKSwgZGlm Zi5saW5lc1szXVswOjNdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCgzNiwgMzUsICd1c2Ug RmlsZTo6QmFzZW5hbWU7JyksIGRpZmYubGluZXNbNF1bMDozXSkKKyAgICAgICAgZm9yIGdyb3Vw IGluIGRpZmYubGluZXM6CisgICAgICAgICAgICBmb3IgZWxtIGluIGdyb3VwOgorICAgICAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ1Byb3BlcnR5IGNoYW5nZXMgb246JyBpbiBncm91cCkK KwogICAgIGRlZiB0ZXN0X2dpdF9kaWZmX3RvX3N2bl9kaWZmKHNlbGYpOgogICAgICAgICBvdXRw dXQgPSAiIiJcCiBJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQv ZGlmZl9wYXJzZXIucHkK 305013 2017-03-21 12:43:52 -0700 2017-07-17 10:21:54 -0700 Patch bug-167164-20170321124352.patch text/plain 4602 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNDIyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE3LTAzLTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBjaGVjay13ZWJraXQtc3R5bGUgZG9lcyBub3Qgd29yayB3aXRoIGZpbGVz IGJlaW5nIGFkZGVkIHdpdGggYSBwcm9wZXJ0eSBjaGFuZ2UgYW5kIHN2biAxLjkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzE2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHdlYmtpdHB5IHNob3VsZCBu b3Qgb3V0cHV0IHByb3BlcnR5IGNoYW5nZXMgaW4gdGhlIERpZmZQYXJzZXIgY2xhc3MgYXMgdGhl c2UKKyAgICAgICAgY2hhbmdlcyBkbyBub3QgYXBwbHkgdG8gc3R5bGUgY2hlY2tpbmcuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlci5weToK KyAgICAgICAgKERpZmZQYXJzZXIuX3BhcnNlX2ludG9fZGlmZl9maWxlcyk6IElnbm9yZSBwcm9w ZXJ0eSBjaGFuZ2VzIGluIGEgZGlmZiB3aGVuIHN0eWxlIGNoZWNraW5nLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoRGlmZlBhcnNlclRlc3QudGVzdF9wcm9wZXJ0eV9pbl9pbmRleCk6IFByb3BlcnR5 IGNoYW5nZXMgYW5kIHRleHQgcmVtb3ZhbCB0ZXN0LgorCiAyMDE3LTAzLTIwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIHN5c3RlbSB0cmFj ZSBwb2ludCBmb3IgbWVtb3J5IHdhcm5pbmcgaGFuZGxpbmcKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L2RpZmZfcGFyc2VyLnB5CShyZXZp c2lvbiAyMTQyMjYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9k aWZmX3BhcnNlci5weQkod29ya2luZyBjb3B5KQpAQCAtOTQsNiArOTQsNyBAQCBkZWYgZ2V0X2Rp ZmZfY29udmVydGVyKGxpbmVzKToKIF9JTklUSUFMX1NUQVRFID0gMQogX0RFQ0xBUkVEX0ZJTEVf UEFUSCA9IDIKIF9QUk9DRVNTSU5HX0NIVU5LID0gMworX1BST1BFUlRZX0NIQU5HRSA9IDQKIAog CiBjbGFzcyBEaWZmRmlsZShvYmplY3QpOgpAQCAtMTg0LDEwICsxODUsMTcgQEAgY2xhc3MgRGlm ZlBhcnNlcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBjdXJyZW50X2ZpbGUuYWRkX3Vu Y2hhbmdlZF9saW5lKG9sZF9kaWZmX2xpbmUsIG5ld19kaWZmX2xpbmUsIGxpbmVbMTpdKQogICAg ICAgICAgICAgICAgICAgICBvbGRfZGlmZl9saW5lICs9IDEKICAgICAgICAgICAgICAgICAgICAg bmV3X2RpZmZfbGluZSArPSAxCi0gICAgICAgICAgICAgICAgZWxpZiBsaW5lID09ICdcXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlJzoKKyAgICAgICAgICAgICAgICBlbGlmIGxpbmUuc3RhcnRz d2l0aCgnUHJvcGVydHkgY2hhbmdlcyBvbjonKToKKyAgICAgICAgICAgICAgICAgICAgc3RhdGUg PSBfUFJPUEVSVFlfQ0hBTkdFCisgICAgICAgICAgICAgICAgICAgIHBhc3MKKyAgICAgICAgICAg ICAgICBlbGlmIGxpbmUgPT0gJ1xcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUnIG9yIGxpbmUg PT0gJyc6CiAgICAgICAgICAgICAgICAgICAgICMgTm90aGluZyB0byBkby4gIFdlIG1heSBzdGls bCBoYXZlIHNvbWUgYWRkZWQgbGluZXMuCiAgICAgICAgICAgICAgICAgICAgIHBhc3MKICAgICAg ICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdVbmV4cGVj dGVkIGRpZmYgZm9ybWF0IHdoZW4gcGFyc2luZyBhICcKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnY2h1bms6ICVyJyAlIGxpbmUpCisgICAgICAgICAgICBlbGlmIHN0YXRlID09IF9Q Uk9QRVJUWV9DSEFOR0U6CisgICAgICAgICAgICAgICAgIyBJZ25vcmluZyB1bnRpbCBlbXB0eSBs aW5lIG9yIGtub3duIGVuZGluZworICAgICAgICAgICAgICAgIGlmIGxpbmUgPT0gJ1xcIE5vIG5l d2xpbmUgYXQgZW5kIG9mIGZpbGUnIG9yIGxpbmUgPT0gJyc6CisgICAgICAgICAgICAgICAgICAg IHN0YXRlID0gX1BST0NFU1NJTkdfQ0hVTksKICAgICAgICAgcmV0dXJuIGZpbGVzCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9kaWZmX3BhcnNlcl91bml0dGVz dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9kaWZmX3BhcnNlcl91bml0dGVzdC5weQkocmV2aXNpb24gMjE0MjI2KQorKysgVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXJfdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTI4LDEyICsyOCwxNiBAQAogCiBpbXBvcnQgY1N0cmluZ0lPIGFzIFN0 cmluZ0lPCiBpbXBvcnQgZGlmZl9wYXJzZXIKK2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIGlt cG9ydCB1bml0dGVzdAogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5jaGVja291dC5kaWZmX3Rlc3Rf ZGF0YSBpbXBvcnQgRElGRl9URVNUX0RBVEEKIAogCitfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo X19uYW1lX18pCisKKwogY2xhc3MgRGlmZlBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgIG1heERpZmYgPSBOb25lCiAKQEAgLTEzMCw2ICsxMzQsNDEgQEAgY2xhc3MgRGlmZlBhcnNl clRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgcGF0Y2ggPSBwLnN1YihsYW1i ZGEgeDogIiAlcy8iICUgcHJlZml4W3guZ3JvdXAoMSldLCBESUZGX1RFU1RfREFUQSkKICAgICAg ICAgICAgIHNlbGYudGVzdF9kaWZmX3BhcnNlcihkaWZmX3BhcnNlci5EaWZmUGFyc2VyKHBhdGNo LnNwbGl0bGluZXMoKSkpCiAKKyAgICBkZWYgdGVzdF9wcm9wZXJ0eV9pbl9pbmRleChzZWxmKToK KyAgICAgICAgcmF3RGlmZiA9ICIiIlwKK0luZGV4OiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtp dAorPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQorLS0tIFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAy MTA4MjUpCisrKysgVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQJKHdvcmtpbmcgY29weSkKK0BA IC0zMiw3ICszMiw2IEBACisgCisgIyBCdWlsZCBzY3JpcHQgd3JhcHBlciBmb3IgdGhlIFdlYktp dCBPcGVuIFNvdXJjZSBQcm9qZWN0LgorIAorLXVzZSBzdHJpY3Q7CisgdXNlIEZpbGU6OkJhc2Vu YW1lOworIHVzZSBGaWxlOjpGaW5kOworIHVzZSBGaWxlOjpTcGVjOworCitQcm9wZXJ0eSBjaGFu Z2VzIG9uOiBUb29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXworRGVsZXRlZDog c3ZuOmV4ZWN1dGFibGUKKyMjIC0xICswLDAgIyMKKy0qCitcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IHByb3BlcnR5CisiIiIKKyAgICAgICAgcGFyc2VyID0gZGlmZl9wYXJzZXIuRGlmZlBhcnNlcihy YXdEaWZmLnNwbGl0bGluZXMoKSkKKworICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEsIGxlbihw YXJzZXIuZmlsZXMpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ1Rvb2xzL1NjcmlwdHMvYnVp bGQtd2Via2l0JyBpbiBwYXJzZXIuZmlsZXMpCisKKyAgICAgICAgZGlmZiA9IHBhcnNlci5maWxl c1snVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQnXQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KCgzMiwgMzIpLCBkaWZmLmxpbmVzWzBdWzA6Ml0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo KDM1LCAwLCAndXNlIHN0cmljdDsnKSwgZGlmZi5saW5lc1szXVswOjNdKQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCgzNiwgMzUsICd1c2UgRmlsZTo6QmFzZW5hbWU7JyksIGRpZmYubGluZXNb NF1bMDozXSkKKyAgICAgICAgZm9yIGdyb3VwIGluIGRpZmYubGluZXM6CisgICAgICAgICAgICBm b3IgZWxtIGluIGdyb3VwOgorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ1Byb3Bl cnR5IGNoYW5nZXMgb246JyBpbiBncm91cCkKKwogICAgIGRlZiB0ZXN0X2dpdF9kaWZmX3RvX3N2 bl9kaWZmKHNlbGYpOgogICAgICAgICBvdXRwdXQgPSAiIiJcCiBJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvZGlmZl9wYXJzZXIucHkK