190538 2018-10-12 14:32:09 -0700 Web Inspector: Cleanup Table test utilities 2018-10-15 16:29:37 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 189803 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1468591 0 mattbaker 2018-10-12 14:32:09 -0700 Creating Table instances for tests is pretty inflexible. For example, providing a custom delegate for a test without providing a custom data source is awkward, given that: InspectorTest.createTable = function(delegate, dataSource) {...} The order of these arguments was partly because of an artificial dependency between TableDelegate and TableDataSource (constructing a TableDelegate requires that the data source exist, so that the delegate can access its `items` property). This dependency should be removed, and the utility methods exposed to InspectorTest simplified. 1468595 1 webkit-bug-importer 2018-10-12 14:33:27 -0700 <rdar://problem/45237730> 1468603 2 352205 mattbaker 2018-10-12 14:40:49 -0700 Created attachment 352205 Patch 1468612 3 352208 mattbaker 2018-10-12 14:52:58 -0700 Created attachment 352208 Patch 1468634 4 352216 mattbaker 2018-10-12 15:25:10 -0700 Created attachment 352216 Patch 1468635 5 mattbaker 2018-10-12 15:25:27 -0700 (In reply to Matt Baker from comment #4) > Created attachment 352216 [details] > Patch Removed unnecessary closure. 1468642 6 352216 joepeck 2018-10-12 15:37:26 -0700 Comment on attachment 352216 Patch r=me 1468731 7 352216 commit-queue 2018-10-12 17:12:02 -0700 Comment on attachment 352216 Patch Rejecting attachment 352216 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 352216, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=352216&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=190538&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 352216 from bug 190538. Fetching: https://bugs.webkit.org/attachment.cgi?id=352216 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/table/resources/table-utilities.js M LayoutTests/inspector/table/table-selection-expected.txt M LayoutTests/inspector/table/table-selection.html ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: Commits are currently disabled while we update infrastructure. W: 7524034ce8226809e8cfdcd66f20b506fdfeadbc and refs/remotes/origin/master differ, using rebase: :040000 040000 09d9ef5a4dd8bf66fa3034a72926254b40918d8b 92eda367eb67787361b8f4da2a96959390505aa7 M LayoutTests Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog M LayoutTests/inspector/table/resources/table-utilities.js M LayoutTests/inspector/table/table-selection-expected.txt M LayoutTests/inspector/table/table-selection.html ERROR from SVN: A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with output: Commits are currently disabled while we update infrastructure. W: 7524034ce8226809e8cfdcd66f20b506fdfeadbc and refs/remotes/origin/master differ, using rebase: :040000 040000 09d9ef5a4dd8bf66fa3034a72926254b40918d8b 92eda367eb67787361b8f4da2a96959390505aa7 M LayoutTests Current branch master is up to date. ERROR: Not all changes have been committed into SVN, however the committed ones (if any) seem to be successfully integrated into the working tree. Please see the above messages for details. Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From https://git.webkit.org/git/WebKit eaa251f4427..2fde85661b4 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 237089 = eaa251f4427efa277b980c9fd8a09482dcfe0f06 r237090 = c0de3e0d64fefa6d1ffab293dcbe3fe23a87a49c r237091 = 2fde85661b4bf2a3ad6344694401d91e9220e99e Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/9559620 1469447 8 joepeck 2018-10-15 14:05:04 -0700 Maybe this needs to land manually or be rebased. 1469516 9 352396 mattbaker 2018-10-15 16:12:14 -0700 Created attachment 352396 Patch for landing 1469531 10 352396 commit-queue 2018-10-15 16:29:35 -0700 Comment on attachment 352396 Patch for landing Clearing flags on attachment: 352396 Committed r237155: <https://trac.webkit.org/changeset/237155> 1469532 11 commit-queue 2018-10-15 16:29:37 -0700 All reviewed patches have been landed. Closing bug. 352205 2018-10-12 14:40:49 -0700 2018-10-12 14:52:56 -0700 Patch bug-190538-20181012144048.patch text/plain 8557 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDczCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGVjZjczMDZhODU4MTk4NmJkY2Vk ZTM1ZTQ1M2ViMWI5NTEwNzU4Yy4uODYxOGRhYjg3NTk1MzU5NmU1ZmI5ZWVhMGVlNGM4YTg4ZWFk ODUxZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTEwLTEyICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbnVwIFRhYmxl IHRlc3QgdXRpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA1MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDbGVhbnVwIFRhYmxlIHRlc3QgdXRpbGl0aWVzIGJ5IGV4cG9zaW5nIHJlbW92aW5n IHRoZSBhcnRpZmljaWFsIGRlcGVuZGVuY3kKKyAgICAgICAgYmV0d2VlbiBUYWJsZURlbGVnYXRl IGFuZCBUYWJsZURhdGFTb3VyY2UsIGFuZCBleHBvc2luZyBhIGNsZWFuZXIgc2V0IG9mCisgICAg ICAgIHV0aWxpdHkgbWV0aG9kcyB0byBJbnNwZWN0b3JUZXN0LiBUaGlzIHBhdGNoIGNoYW5nZXMg YEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGVgCisgICAgICAgIHRvIHRha2Ugbm8gcGFyYW1ldGVy cywgYW5kIGFkZHMgYEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGVgIGZvcgor ICAgICAgICB0ZXN0cyB0aGF0IG5lZWQgdG8gc3VwcGx5IGEgY3VzdG9tIGRlbGVnYXRlLiBBZGRp dGlvbmFsbHksIGhlbHBlciBtZXRob2RzCisgICAgICAgIHVzZWQgb25seSBieSB0YWJsZS11dGls aXRpZXMgYXJlIG5vdyBoaWRkZW4gaW5zaWRlIG9mIGEgY2xvc3VyZS4KKworICAgICAgICAqIGlu c3BlY3Rvci90YWJsZS9yZXNvdXJjZXMvdGFibGUtdXRpbGl0aWVzLmpzOgorICAgICAgICAoVGVz dFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci5JbnNwZWN0b3JUZXN0LlRhYmxlRGF0YVNvdXJjZSk6 CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLkluc3BlY3RvclRlc3QuVGFi bGVEZWxlZ2F0ZSk6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLkluc3Bl Y3RvclRlc3QuVGFibGVEZWxlZ2F0ZS5wcm90b3R5cGUudGFibGVQb3B1bGF0ZUNlbGwpOgorICAg ICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci4pOgorICAgICAgICAoVGVzdFBhZ2Uu cmVnaXN0ZXJJbml0aWFsaXplcik6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxp emVyLkluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUpOiBEZWxldGVkLgorICAgICAgICAqIGluc3Bl Y3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24uaHRtbDoKKwogMjAxOC0xMC0xMiAgRGF3ZWkgRmVu dG9uICA8cmVhbGRhd2VpQGFwcGxlLmNvbT4KIAogICAgICAgICBbTW9qYXZlIFdrMl0gTGF5b3V0 IFRlc3QgaHR0cC90ZXN0cy9jYWNoZS9kaXNrLWNhY2hlL2Rpc2stY2FjaGUtdmFsaWRhdGlvbi1h dHRhY2htZW50Lmh0bWwgaXMgZmxha3kKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci90YWJsZS9yZXNvdXJjZXMvdGFibGUtdXRpbGl0aWVzLmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3RhYmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanMKaW5kZXggNDg2MWEzNWIxODY1 ZGJiMzU0NTc0MmNlNjRmMTY3ZGE2OThkZDQyZC4uM2EwMTk5NzEwMzk5MWQ3NWI0NzBmYTI3YmMz N2EyMzA4Y2JmY2U3NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Jl c291cmNlcy90YWJsZS11dGlsaXRpZXMuanMKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Rh YmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanMKQEAgLTMsMjQgKzMsMjIgQEAgVGVzdFBh Z2UucmVnaXN0ZXJJbml0aWFsaXplcigoKSA9PiB7CiAgICAgewogICAgICAgICBjb25zdHJ1Y3Rv cihpdGVtcykKICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5faXRlbXMgPSBpdGVtczsKKyAg ICAgICAgICAgIHRoaXMuX2l0ZW1zID0gaXRlbXMgfHwgW107CiAgICAgICAgIH0KIAogICAgICAg ICBnZXQgaXRlbXMoKSB7IHJldHVybiB0aGlzLl9pdGVtczsgfQogCi0gICAgICAgIC8vIFRhYmxl IERhdGFTb3VyY2UKLQogICAgICAgICB0YWJsZU51bWJlck9mUm93cyh0YWJsZSkKICAgICAgICAg ewogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2l0ZW1zLmxlbmd0aDsKICAgICAgICAgfQotICAg IH0KKyAgICB9OwogCiAgICAgSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRlID0gY2xhc3MgVGFi bGVEZWxlZ2F0ZQogICAgIHsKICAgICAgICAgY29uc3RydWN0b3IoaXRlbXMpCiAgICAgICAgIHsK LSAgICAgICAgICAgIHRoaXMuX2l0ZW1zID0gaXRlbXM7CisgICAgICAgICAgICB0aGlzLml0ZW1z ID0gaXRlbXMgfHwgW107CiAgICAgICAgIH0KIAogICAgICAgICB0YWJsZVNlbGVjdGlvbkRpZENo YW5nZSh0YWJsZSkKQEAgLTMwLDM1ICsyOCw0OSBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxp emVyKCgpID0+IHsKIAogICAgICAgICB0YWJsZVBvcHVsYXRlQ2VsbCh0YWJsZSwgY2VsbCwgY29s dW1uLCByb3dJbmRleCkKICAgICAgICAgewotICAgICAgICAgICAgbGV0IGl0ZW0gPSB0aGlzLl9p dGVtc1tyb3dJbmRleF07CisgICAgICAgICAgICBsZXQgaXRlbSA9IHRoaXMuaXRlbXNbcm93SW5k ZXhdOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoaXRlbSwgIlNob3VsZCBoYXZl IGFuIGl0ZW0gZm9yIHJvdyAiICsgcm93SW5kZXgpOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnQoaXRlbVtjb2x1bW4uaWRlbnRpZmllcl0sICJTaG91bGQgaGF2ZSBkYXRhIGZvciBj b2x1bW4gIiArIGNvbHVtbi5pZGVudGlmaWVyKTsKICAgICAgICAgICAgIGNlbGwudGV4dENvbnRl bnQgPSBpdGVtW2NvbHVtbi5pZGVudGlmaWVyXTsKICAgICAgICAgICAgIHJldHVybiBjZWxsOwog ICAgICAgICB9Ci0gICAgfQorICAgIH07CiAKLSAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxl ID0gZnVuY3Rpb24oZGVsZWdhdGUsIGRhdGFTb3VyY2UpIHsKLSAgICAgICAgaWYgKCFkYXRhU291 cmNlKSB7CisgICAgKCgpID0+IHsKKyAgICAgICAgZnVuY3Rpb24gX2NyZWF0ZURhdGFTb3VyY2Uo KSB7CiAgICAgICAgICAgICBsZXQgaXRlbXMgPSBbXTsKLSAgICAgICAgICAgIGZvciAobGV0IGkg PSAwOyBpIDwgMTA7ICsraSkgewotICAgICAgICAgICAgICAgIGl0ZW1zLnB1c2goewotICAgICAg ICAgICAgICAgICAgICBpbmRleDogaSwKLSAgICAgICAgICAgICAgICAgICAgbmFtZTogIlJvdyAi ICsgaSwKLSAgICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRh dGFTb3VyY2UgPSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURhdGFTb3VyY2UoaXRlbXMpOworICAg ICAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgKytpKQorICAgICAgICAgICAgICAgIGl0 ZW1zLnB1c2goe2luZGV4OiBpLCBuYW1lOiBgUm93ICR7aX1gfSk7CisKKyAgICAgICAgICAgIHJl dHVybiBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURhdGFTb3VyY2UoaXRlbXMpOwogICAgICAgICB9 CiAKLSAgICAgICAgZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8fCBuZXcgSW5zcGVjdG9yVGVzdC5UYWJs ZURlbGVnYXRlKGRhdGFTb3VyY2UuaXRlbXMpOworICAgICAgICBmdW5jdGlvbiBfY3JlYXRlVGFi bGUoZGF0YVNvdXJjZSwgZGVsZWdhdGUpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0KGRhdGFTb3VyY2UgaW5zdGFuY2VvZiBJbnNwZWN0b3JUZXN0LlRhYmxlRGF0YVNvdXJjZSk7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChkZWxlZ2F0ZSBpbnN0YW5jZW9mIElu c3BlY3RvclRlc3QuVGFibGVEZWxlZ2F0ZSk7CisKKyAgICAgICAgICAgIGNvbnN0IHJvd0hlaWdo dCA9IDIwOworICAgICAgICAgICAgbGV0IHRhYmxlID0gbmV3IFdJLlRhYmxlKCJ0ZXN0IiwgZGF0 YVNvdXJjZSwgZGVsZWdhdGUsIHJvd0hlaWdodCk7CisgICAgICAgICAgICB0YWJsZS5hZGRDb2x1 bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJpbmRleCIsICJJbmRleCIpKTsKKyAgICAgICAgICAgIHRh YmxlLmFkZENvbHVtbihuZXcgV0kuVGFibGVDb2x1bW4oIm5hbWUiLCAiTmFtZSIpKTsKKworICAg ICAgICAgICAgdGFibGUudXBkYXRlTGF5b3V0KCk7CisKKyAgICAgICAgICAgIHJldHVybiB0YWJs ZTsKKyAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IHJvd0hlaWdodCA9IDIwOwotICAgICAgICBs ZXQgdGFibGUgPSBuZXcgV0kuVGFibGUoInRlc3QiLCBkYXRhU291cmNlLCBkZWxlZ2F0ZSwgcm93 SGVpZ2h0KTsKLSAgICAgICAgdGFibGUuYWRkQ29sdW1uKG5ldyBXSS5UYWJsZUNvbHVtbigiaW5k ZXgiLCBXSS5VSVN0cmluZygiSW5kZXgiKSkpOwotICAgICAgICB0YWJsZS5hZGRDb2x1bW4obmV3 IFdJLlRhYmxlQ29sdW1uKCJuYW1lIiwgV0kuVUlTdHJpbmcoIk5hbWUiKSkpOworICAgICAgICBJ bnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlID0gZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBsZXQg ZGF0YVNvdXJjZSA9IF9jcmVhdGVEYXRhU291cmNlKCk7CisgICAgICAgICAgICBsZXQgZGVsZWdh dGUgPSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRlKGRhdGFTb3VyY2UuaXRlbXMpOwor ICAgICAgICAgICAgcmV0dXJuIF9jcmVhdGVUYWJsZShkYXRhU291cmNlLCBkZWxlZ2F0ZSk7Cisg ICAgICAgIH07CiAKLSAgICAgICAgdGFibGUudXBkYXRlTGF5b3V0KCk7CisgICAgICAgIEluc3Bl Y3RvclRlc3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGUgPSBmdW5jdGlvbihkZWxlZ2F0ZSkgewor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoZGVsZWdhdGUgaW5zdGFuY2VvZiBJbnNw ZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUpOwogCi0gICAgICAgIHJldHVybiB0YWJsZTsKLSAgICB9 CisgICAgICAgICAgICBsZXQgZGF0YVNvdXJjZSA9IF9jcmVhdGVEYXRhU291cmNlKCk7CisgICAg ICAgICAgICBkZWxlZ2F0ZS5pdGVtcyA9IGRhdGFTb3VyY2UuaXRlbXM7CisgICAgICAgICAgICBy ZXR1cm4gX2NyZWF0ZVRhYmxlKGRhdGFTb3VyY2UsIGRlbGVnYXRlKTsKKyAgICAgICAgfTsKKyAg ICB9KSgpOwogfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvdGFi bGUtc2VsZWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvdGFibGUtc2Vs ZWN0aW9uLmh0bWwKaW5kZXggMzJhZTZjNGMwOGYyZTgzMjljMWY1M2FlYTIwNzhmMTM0M2VhNjY0 Ni4uNjkwZDY1MmM2NmZmNDU3Y2RjNjAyMDNmMGY0YzIzZDQ5ZDUwNDE1ZiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24uaHRtbApAQCAtMTAsMTMg KzEwLDEwIEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVz dC5jcmVhdGVTeW5jU3VpdGUoIlRhYmxlIik7CiAKLSAgICAvLyBJbXBvcnQgbmFtZXMuCi0gICAg bGV0IHtjcmVhdGVUYWJsZSwgY2xlYW51cFRhYmxlfSA9IEluc3BlY3RvclRlc3Q7Ci0KICAgICBz dWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJUYWJsZS5jb25zdHJ1Y3RvciIsCiAg ICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOwor ICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogCiAg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoaXNOYU4odGFibGUuc2VsZWN0ZWRS b3cpLCAic2VsZWN0ZWRSb3cgc2hvdWxkIGJlIE5hTi4iKTsKICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0RXF1YWwodGFibGUuc2VsZWN0ZWRSb3dzLmxlbmd0aCwgMCwgIlNob3VsZCBo YXZlIG5vIHNlbGVjdGVkIHJvd3MuIik7CkBAIC00Miw3ICszOSw3IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0Um93IiwKICAgICAgICAgZGVzY3JpcHRpb246 ICJTZWxlY3QgYSByb3csIHRoZW4gc2VsZWN0IGFub3RoZXIgcm93IGNhdXNpbmcgdGhlIGZyaXN0 IHRvIGJlY29tZSBkZXNlbGVjdGVkLiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBs ZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVj dG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogCiAgICAgICAgICAgICB0cmlnZ2VyU2VsZWN0Um93KHRh YmxlLCAwKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0U2hhbGxvd0VxdWFsKHRh YmxlLnNlbGVjdGVkUm93cywgWzBdLCAic2VsZWN0ZWRSb3dzIHNob3VsZCBiZSBbMF0uIik7CkBA IC01Nyw3ICs1NCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuRGVz ZWxlY3RSb3ciLAogICAgICAgICBkZXNjcmlwdGlvbjogIkRlc2VsZWN0IHRoZSBzZWxlY3RlZCBy b3cuIiwKICAgICAgICAgdGVzdCgpIHsKLSAgICAgICAgICAgIGxldCB0YWJsZSA9IGNyZWF0ZVRh YmxlKCk7CisgICAgICAgICAgICBsZXQgdGFibGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxl KCk7CiAKICAgICAgICAgICAgIHRyaWdnZXJTZWxlY3RSb3codGFibGUsIDApOwogICAgICAgICAg ICAgdHJpZ2dlckRlc2VsZWN0Um93KHRhYmxlLCAwKTsKQEAgLTcxLDcgKzY4LDcgQEAgZnVuY3Rp b24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJUYWJsZS5BbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiIs CiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2hvdWxkIGJlIGFibGUgdG8gZW5hYmxlIG11bHRpcGxl IHNlbGVjdGlvbi4iLAogICAgICAgICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRhYmxlID0g Y3JlYXRlVGFibGUoKTsKKyAgICAgICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRlc3QuY3Jl YXRlVGFibGUoKTsKIAogICAgICAgICAgICAgdGFibGUuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24g PSB0cnVlOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHRhYmxlLmFsbG93 c011bHRpcGxlU2VsZWN0aW9uLCAiYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gZW5hYmxlZC4iKTsK QEAgLTg1LDcgKzgyLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJUYWJsZS5T ZWxlY3RNdWx0aXBsZVJvd3MuRXh0ZW5kU2VsZWN0aW9uIiwKICAgICAgICAgZGVzY3JpcHRpb246 ICJTZWxlY3QgbXVsdGlwbGUgcm93cywgZXh0ZW5kaW5nIHRoZSBzZWxlY3Rpb24uIiwKICAgICAg ICAgdGVzdCgpIHsKLSAgICAgICAgICAgIGxldCB0YWJsZSA9IGNyZWF0ZVRhYmxlKCk7CisgICAg ICAgICAgICBsZXQgdGFibGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlKCk7CiAgICAgICAg ICAgICB0YWJsZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiA9IHRydWU7CiAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQodGFibGUuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24sICJh bGxvd3NNdWx0aXBsZVNlbGVjdGlvbiBlbmFibGVkLiIpOwogCkBAIC0xMDQsNyArMTAxLDcgQEAg ZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJUYWJsZS5TZWxlY3RNdWx0aXBsZVJvd3Mu U2VsZWN0VGhlU2FtZVJvd1R3aWNlLkV4dGVuZFNlbGVjdGlvbiIsCiAgICAgICAgIGRlc2NyaXB0 aW9uOiAiU2VsZWN0IGFuIGFscmVhZHkgc2VsZWN0ZWQgcm93LCBhbmQgZXh0ZW5kIHRoZSBzZWxl Y3Rpb24uIiwKICAgICAgICAgdGVzdCgpIHsKLSAgICAgICAgICAgIGxldCB0YWJsZSA9IGNyZWF0 ZVRhYmxlKCk7CisgICAgICAgICAgICBsZXQgdGFibGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRh YmxlKCk7CiAgICAgICAgICAgICB0YWJsZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiA9IHRydWU7 CiAKICAgICAgICAgICAgIGNvbnN0IGV4dGVuZFNlbGVjdGlvbiA9IHRydWU7CkBAIC0xMjIsNyAr MTE5LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJUYWJsZS5TZWxlY3RNdWx0 aXBsZVJvd3MuU2VsZWN0VGhlU2FtZVJvd1R3aWNlLk5vRXh0ZW5kU2VsZWN0aW9uIiwKICAgICAg ICAgZGVzY3JpcHRpb246ICJTZWxlY3QgYW4gYWxyZWFkeSBzZWxlY3RlZCByb3csIGFuZCBkbyBu b3QgZXh0ZW5kIHRoZSBzZWxlY3Rpb24uIiwKICAgICAgICAgdGVzdCgpIHsKLSAgICAgICAgICAg IGxldCB0YWJsZSA9IGNyZWF0ZVRhYmxlKCk7CisgICAgICAgICAgICBsZXQgdGFibGUgPSBJbnNw ZWN0b3JUZXN0LmNyZWF0ZVRhYmxlKCk7CiAgICAgICAgICAgICB0YWJsZS5hbGxvd3NNdWx0aXBs ZVNlbGVjdGlvbiA9IHRydWU7CiAKICAgICAgICAgICAgIGNvbnN0IGV4dGVuZFNlbGVjdGlvbiA9 IHRydWU7Cg== 352208 2018-10-12 14:52:58 -0700 2018-10-12 15:25:09 -0700 Patch bug-190538-20181012145257.patch text/plain 9525 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDczCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGVjZjczMDZhODU4MTk4NmJkY2Vk ZTM1ZTQ1M2ViMWI5NTEwNzU4Yy4uNTkxYjMzMTQ3OGU4ZTM2MDYzOTU1NmE4MDZmZmUwODQ2NmU2 OGIzZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE4LTEwLTEyICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbnVwIFRhYmxl IHRlc3QgdXRpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA1MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjM3NzMwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFudXAgVGFibGUg dGVzdCB1dGlsaXRpZXMgYnkgZXhwb3NpbmcgcmVtb3ZpbmcgdGhlIGFydGlmaWNpYWwgZGVwZW5k ZW5jeQorICAgICAgICBiZXR3ZWVuIFRhYmxlRGVsZWdhdGUgYW5kIFRhYmxlRGF0YVNvdXJjZSwg YW5kIGV4cG9zaW5nIGEgY2xlYW5lciBzZXQgb2YKKyAgICAgICAgdXRpbGl0eSBtZXRob2RzIHRv IEluc3BlY3RvclRlc3QuIFRoaXMgcGF0Y2ggY2hhbmdlcyBgSW5zcGVjdG9yVGVzdC5jcmVhdGVU YWJsZWAKKyAgICAgICAgdG8gdGFrZSBubyBwYXJhbWV0ZXJzLCBhbmQgYWRkcyBgSW5zcGVjdG9y VGVzdC5jcmVhdGVUYWJsZVdpdGhEZWxlZ2F0ZWAgZm9yCisgICAgICAgIHRlc3RzIHRoYXQgbmVl ZCB0byBzdXBwbHkgYSBjdXN0b20gZGVsZWdhdGUuIEFkZGl0aW9uYWxseSwgaGVscGVyIG1ldGhv ZHMKKyAgICAgICAgdXNlZCBvbmx5IGJ5IHRhYmxlLXV0aWxpdGllcyBhcmUgbm93IGhpZGRlbiBp bnNpZGUgb2YgYSBjbG9zdXJlLgorCisgICAgICAgICogaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNl cy90YWJsZS11dGlsaXRpZXMuanM6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxp emVyLkluc3BlY3RvclRlc3QuVGFibGVEYXRhU291cmNlKToKKyAgICAgICAgKFRlc3RQYWdlLnJl Z2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRlKToKKyAgICAgICAg KFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRl LnByb3RvdHlwZS50YWJsZVBvcHVsYXRlQ2VsbCk6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3Rl ckluaXRpYWxpemVyLik6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKToK KyAgICAgICAgKFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5jcmVh dGVUYWJsZSk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdGFibGUvdGFibGUtc2Vs ZWN0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgVXBkYXRlIHdpdGggbmV3IHRlc3Qgc3VpdGUg bmFtZS4KKworICAgICAgICAqIGluc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24uaHRtbDoK KwogMjAxOC0xMC0xMiAgRGF3ZWkgRmVudG9uICA8cmVhbGRhd2VpQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTW9qYXZlIFdrMl0gTGF5b3V0IFRlc3QgaHR0cC90ZXN0cy9jYWNoZS9kaXNrLWNhY2hl L2Rpc2stY2FjaGUtdmFsaWRhdGlvbi1hdHRhY2htZW50Lmh0bWwgaXMgZmxha3kKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90YWJsZS9yZXNvdXJjZXMvdGFibGUtdXRpbGl0aWVz LmpzIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRp ZXMuanMKaW5kZXggNDg2MWEzNWIxODY1ZGJiMzU0NTc0MmNlNjRmMTY3ZGE2OThkZDQyZC4uM2Ew MTk5NzEwMzk5MWQ3NWI0NzBmYTI3YmMzN2EyMzA4Y2JmY2U3NSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanMKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanMK QEAgLTMsMjQgKzMsMjIgQEAgVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplcigoKSA9PiB7CiAg ICAgewogICAgICAgICBjb25zdHJ1Y3RvcihpdGVtcykKICAgICAgICAgewotICAgICAgICAgICAg dGhpcy5faXRlbXMgPSBpdGVtczsKKyAgICAgICAgICAgIHRoaXMuX2l0ZW1zID0gaXRlbXMgfHwg W107CiAgICAgICAgIH0KIAogICAgICAgICBnZXQgaXRlbXMoKSB7IHJldHVybiB0aGlzLl9pdGVt czsgfQogCi0gICAgICAgIC8vIFRhYmxlIERhdGFTb3VyY2UKLQogICAgICAgICB0YWJsZU51bWJl ck9mUm93cyh0YWJsZSkKICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2l0ZW1z Lmxlbmd0aDsKICAgICAgICAgfQotICAgIH0KKyAgICB9OwogCiAgICAgSW5zcGVjdG9yVGVzdC5U YWJsZURlbGVnYXRlID0gY2xhc3MgVGFibGVEZWxlZ2F0ZQogICAgIHsKICAgICAgICAgY29uc3Ry dWN0b3IoaXRlbXMpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX2l0ZW1zID0gaXRlbXM7 CisgICAgICAgICAgICB0aGlzLml0ZW1zID0gaXRlbXMgfHwgW107CiAgICAgICAgIH0KIAogICAg ICAgICB0YWJsZVNlbGVjdGlvbkRpZENoYW5nZSh0YWJsZSkKQEAgLTMwLDM1ICsyOCw0OSBAQCBU ZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsKIAogICAgICAgICB0YWJsZVBvcHVs YXRlQ2VsbCh0YWJsZSwgY2VsbCwgY29sdW1uLCByb3dJbmRleCkKICAgICAgICAgewotICAgICAg ICAgICAgbGV0IGl0ZW0gPSB0aGlzLl9pdGVtc1tyb3dJbmRleF07CisgICAgICAgICAgICBsZXQg aXRlbSA9IHRoaXMuaXRlbXNbcm93SW5kZXhdOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5h c3NlcnQoaXRlbSwgIlNob3VsZCBoYXZlIGFuIGl0ZW0gZm9yIHJvdyAiICsgcm93SW5kZXgpOwog ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoaXRlbVtjb2x1bW4uaWRlbnRpZmllcl0s ICJTaG91bGQgaGF2ZSBkYXRhIGZvciBjb2x1bW4gIiArIGNvbHVtbi5pZGVudGlmaWVyKTsKICAg ICAgICAgICAgIGNlbGwudGV4dENvbnRlbnQgPSBpdGVtW2NvbHVtbi5pZGVudGlmaWVyXTsKICAg ICAgICAgICAgIHJldHVybiBjZWxsOwogICAgICAgICB9Ci0gICAgfQorICAgIH07CiAKLSAgICBJ bnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlID0gZnVuY3Rpb24oZGVsZWdhdGUsIGRhdGFTb3VyY2Up IHsKLSAgICAgICAgaWYgKCFkYXRhU291cmNlKSB7CisgICAgKCgpID0+IHsKKyAgICAgICAgZnVu Y3Rpb24gX2NyZWF0ZURhdGFTb3VyY2UoKSB7CiAgICAgICAgICAgICBsZXQgaXRlbXMgPSBbXTsK LSAgICAgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgMTA7ICsraSkgewotICAgICAgICAgICAg ICAgIGl0ZW1zLnB1c2goewotICAgICAgICAgICAgICAgICAgICBpbmRleDogaSwKLSAgICAgICAg ICAgICAgICAgICAgbmFtZTogIlJvdyAiICsgaSwKLSAgICAgICAgICAgICAgICB9KTsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIGRhdGFTb3VyY2UgPSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJs ZURhdGFTb3VyY2UoaXRlbXMpOworICAgICAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsg KytpKQorICAgICAgICAgICAgICAgIGl0ZW1zLnB1c2goe2luZGV4OiBpLCBuYW1lOiBgUm93ICR7 aX1gfSk7CisKKyAgICAgICAgICAgIHJldHVybiBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURhdGFT b3VyY2UoaXRlbXMpOwogICAgICAgICB9CiAKLSAgICAgICAgZGVsZWdhdGUgPSBkZWxlZ2F0ZSB8 fCBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRlKGRhdGFTb3VyY2UuaXRlbXMpOworICAg ICAgICBmdW5jdGlvbiBfY3JlYXRlVGFibGUoZGF0YVNvdXJjZSwgZGVsZWdhdGUpIHsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KGRhdGFTb3VyY2UgaW5zdGFuY2VvZiBJbnNwZWN0 b3JUZXN0LlRhYmxlRGF0YVNvdXJjZSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2Vy dChkZWxlZ2F0ZSBpbnN0YW5jZW9mIEluc3BlY3RvclRlc3QuVGFibGVEZWxlZ2F0ZSk7CisKKyAg ICAgICAgICAgIGNvbnN0IHJvd0hlaWdodCA9IDIwOworICAgICAgICAgICAgbGV0IHRhYmxlID0g bmV3IFdJLlRhYmxlKCJ0ZXN0IiwgZGF0YVNvdXJjZSwgZGVsZWdhdGUsIHJvd0hlaWdodCk7Cisg ICAgICAgICAgICB0YWJsZS5hZGRDb2x1bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJpbmRleCIsICJJ bmRleCIpKTsKKyAgICAgICAgICAgIHRhYmxlLmFkZENvbHVtbihuZXcgV0kuVGFibGVDb2x1bW4o Im5hbWUiLCAiTmFtZSIpKTsKKworICAgICAgICAgICAgdGFibGUudXBkYXRlTGF5b3V0KCk7CisK KyAgICAgICAgICAgIHJldHVybiB0YWJsZTsKKyAgICAgICAgfQogCi0gICAgICAgIGNvbnN0IHJv d0hlaWdodCA9IDIwOwotICAgICAgICBsZXQgdGFibGUgPSBuZXcgV0kuVGFibGUoInRlc3QiLCBk YXRhU291cmNlLCBkZWxlZ2F0ZSwgcm93SGVpZ2h0KTsKLSAgICAgICAgdGFibGUuYWRkQ29sdW1u KG5ldyBXSS5UYWJsZUNvbHVtbigiaW5kZXgiLCBXSS5VSVN0cmluZygiSW5kZXgiKSkpOwotICAg ICAgICB0YWJsZS5hZGRDb2x1bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJuYW1lIiwgV0kuVUlTdHJp bmcoIk5hbWUiKSkpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlID0gZnVuY3Rp b24oKSB7CisgICAgICAgICAgICBsZXQgZGF0YVNvdXJjZSA9IF9jcmVhdGVEYXRhU291cmNlKCk7 CisgICAgICAgICAgICBsZXQgZGVsZWdhdGUgPSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVn YXRlKGRhdGFTb3VyY2UuaXRlbXMpOworICAgICAgICAgICAgcmV0dXJuIF9jcmVhdGVUYWJsZShk YXRhU291cmNlLCBkZWxlZ2F0ZSk7CisgICAgICAgIH07CiAKLSAgICAgICAgdGFibGUudXBkYXRl TGF5b3V0KCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGUg PSBmdW5jdGlvbihkZWxlZ2F0ZSkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQo ZGVsZWdhdGUgaW5zdGFuY2VvZiBJbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUpOwogCi0gICAg ICAgIHJldHVybiB0YWJsZTsKLSAgICB9CisgICAgICAgICAgICBsZXQgZGF0YVNvdXJjZSA9IF9j cmVhdGVEYXRhU291cmNlKCk7CisgICAgICAgICAgICBkZWxlZ2F0ZS5pdGVtcyA9IGRhdGFTb3Vy Y2UuaXRlbXM7CisgICAgICAgICAgICByZXR1cm4gX2NyZWF0ZVRhYmxlKGRhdGFTb3VyY2UsIGRl bGVnYXRlKTsKKyAgICAgICAgfTsKKyAgICB9KSgpOwogfSk7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGFibGUvdGFibGUtc2VsZWN0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CmluZGV4 IDYzMDQ1ZjhjMjM5YjkzY2Y0Njg1ZDYwMGM3NDUzOTNiOGFiMTg0MGQuLjcxN2ZjZThlNzYwNTY4 NjNmN2NiOTZjMGQwYzg2NDVkZDhlOGNhYjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEs NyBAQAogVGVzdHMgZm9yIFdJLlRhYmxlLgogCiAKLT09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogVGFi bGUKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogVGFibGUuUm93U2VsZWN0aW9uCiAtLSBSdW5uaW5n IHRlc3QgY2FzZTogVGFibGUuY29uc3RydWN0b3IKIFBBU1M6IHNlbGVjdGVkUm93IHNob3VsZCBi ZSBOYU4uCiBQQVNTOiBTaG91bGQgaGF2ZSBubyBzZWxlY3RlZCByb3dzLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi5odG1sIGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi5odG1sCmluZGV4IDMyYWU2YzRj MDhmMmU4MzI5YzFmNTNhZWEyMDc4ZjEzNDNlYTY2NDYuLmY2MWI1NDQxOWQyNmVkYTA5OThhOGFl MTAxZTg1YjUzNmJiMDBiNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90YWJs ZS90YWJsZS1zZWxlY3Rpb24uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUv dGFibGUtc2VsZWN0aW9uLmh0bWwKQEAgLTgsMTUgKzgsMTIgQEAgZnVuY3Rpb24gdGVzdCgpCiB7 CiAgICAgSW5zcGVjdG9yVGVzdC5yZWRpcmVjdFJlcXVlc3RBbmltYXRpb25GcmFtZSgpOwogCi0g ICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVTeW5jU3VpdGUoIlRhYmxlIik7Ci0K LSAgICAvLyBJbXBvcnQgbmFtZXMuCi0gICAgbGV0IHtjcmVhdGVUYWJsZSwgY2xlYW51cFRhYmxl fSA9IEluc3BlY3RvclRlc3Q7CisgICAgbGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVT eW5jU3VpdGUoIlRhYmxlLlJvd1NlbGVjdGlvbiIpOwogCiAgICAgc3VpdGUuYWRkVGVzdENhc2Uo ewogICAgICAgICBuYW1lOiAiVGFibGUuY29uc3RydWN0b3IiLAogICAgICAgICB0ZXN0KCkgewot ICAgICAgICAgICAgbGV0IHRhYmxlID0gY3JlYXRlVGFibGUoKTsKKyAgICAgICAgICAgIGxldCB0 YWJsZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUoKTsKIAogICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KGlzTmFOKHRhYmxlLnNlbGVjdGVkUm93KSwgInNlbGVjdGVkUm93 IHNob3VsZCBiZSBOYU4uIik7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFs KHRhYmxlLnNlbGVjdGVkUm93cy5sZW5ndGgsIDAsICJTaG91bGQgaGF2ZSBubyBzZWxlY3RlZCBy b3dzLiIpOwpAQCAtNDAsOSArMzcsOSBAQCBmdW5jdGlvbiB0ZXN0KCkKIAogICAgIHN1aXRlLmFk ZFRlc3RDYXNlKHsKICAgICAgICAgbmFtZTogIlRhYmxlLlNlbGVjdFJvdyIsCi0gICAgICAgIGRl c2NyaXB0aW9uOiAiU2VsZWN0IGEgcm93LCB0aGVuIHNlbGVjdCBhbm90aGVyIHJvdyBjYXVzaW5n IHRoZSBmcmlzdCB0byBiZWNvbWUgZGVzZWxlY3RlZC4iLAorICAgICAgICBkZXNjcmlwdGlvbjog IlNlbGVjdCBhIHJvdywgdGhlbiBzZWxlY3QgYW5vdGhlciByb3cgY2F1c2luZyB0aGUgZmlyc3Qg dG8gYmVjb21lIGRlc2VsZWN0ZWQuIiwKICAgICAgICAgdGVzdCgpIHsKLSAgICAgICAgICAgIGxl dCB0YWJsZSA9IGNyZWF0ZVRhYmxlKCk7CisgICAgICAgICAgICBsZXQgdGFibGUgPSBJbnNwZWN0 b3JUZXN0LmNyZWF0ZVRhYmxlKCk7CiAKICAgICAgICAgICAgIHRyaWdnZXJTZWxlY3RSb3codGFi bGUsIDApOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RTaGFsbG93RXF1YWwodGFi bGUuc2VsZWN0ZWRSb3dzLCBbMF0sICJzZWxlY3RlZFJvd3Mgc2hvdWxkIGJlIFswXS4iKTsKQEAg LTU3LDcgKzU0LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIG5hbWU6ICJUYWJsZS5EZXNl bGVjdFJvdyIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiRGVzZWxlY3QgdGhlIHNlbGVjdGVkIHJv dy4iLAogICAgICAgICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRhYmxlID0gY3JlYXRlVGFi bGUoKTsKKyAgICAgICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUo KTsKIAogICAgICAgICAgICAgdHJpZ2dlclNlbGVjdFJvdyh0YWJsZSwgMCk7CiAgICAgICAgICAg ICB0cmlnZ2VyRGVzZWxlY3RSb3codGFibGUsIDApOwpAQCAtNzEsNyArNjgsNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICAgICAgbmFtZTogIlRhYmxlLkFsbG93c011bHRpcGxlU2VsZWN0aW9uIiwK ICAgICAgICAgZGVzY3JpcHRpb246ICJTaG91bGQgYmUgYWJsZSB0byBlbmFibGUgbXVsdGlwbGUg c2VsZWN0aW9uLiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBj cmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVh dGVUYWJsZSgpOwogCiAgICAgICAgICAgICB0YWJsZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiA9 IHRydWU7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQodGFibGUuYWxsb3dz TXVsdGlwbGVTZWxlY3Rpb24sICJhbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiBlbmFibGVkLiIpOwpA QCAtODUsNyArODIsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgbmFtZTogIlRhYmxlLlNl bGVjdE11bHRpcGxlUm93cy5FeHRlbmRTZWxlY3Rpb24iLAogICAgICAgICBkZXNjcmlwdGlvbjog IlNlbGVjdCBtdWx0aXBsZSByb3dzLCBleHRlbmRpbmcgdGhlIHNlbGVjdGlvbi4iLAogICAgICAg ICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRhYmxlID0gY3JlYXRlVGFibGUoKTsKKyAgICAg ICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUoKTsKICAgICAgICAg ICAgIHRhYmxlLmFsbG93c011bHRpcGxlU2VsZWN0aW9uID0gdHJ1ZTsKICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0VGhhdCh0YWJsZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiwgImFs bG93c011bHRpcGxlU2VsZWN0aW9uIGVuYWJsZWQuIik7CiAKQEAgLTEwNCw3ICsxMDEsNyBAQCBm dW5jdGlvbiB0ZXN0KCkKICAgICAgICAgbmFtZTogIlRhYmxlLlNlbGVjdE11bHRpcGxlUm93cy5T ZWxlY3RUaGVTYW1lUm93VHdpY2UuRXh0ZW5kU2VsZWN0aW9uIiwKICAgICAgICAgZGVzY3JpcHRp b246ICJTZWxlY3QgYW4gYWxyZWFkeSBzZWxlY3RlZCByb3csIGFuZCBleHRlbmQgdGhlIHNlbGVj dGlvbi4iLAogICAgICAgICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRhYmxlID0gY3JlYXRl VGFibGUoKTsKKyAgICAgICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlVGFi bGUoKTsKICAgICAgICAgICAgIHRhYmxlLmFsbG93c011bHRpcGxlU2VsZWN0aW9uID0gdHJ1ZTsK IAogICAgICAgICAgICAgY29uc3QgZXh0ZW5kU2VsZWN0aW9uID0gdHJ1ZTsKQEAgLTEyMiw3ICsx MTksNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgbmFtZTogIlRhYmxlLlNlbGVjdE11bHRp cGxlUm93cy5TZWxlY3RUaGVTYW1lUm93VHdpY2UuTm9FeHRlbmRTZWxlY3Rpb24iLAogICAgICAg ICBkZXNjcmlwdGlvbjogIlNlbGVjdCBhbiBhbHJlYWR5IHNlbGVjdGVkIHJvdywgYW5kIGRvIG5v dCBleHRlbmQgdGhlIHNlbGVjdGlvbi4iLAogICAgICAgICB0ZXN0KCkgewotICAgICAgICAgICAg bGV0IHRhYmxlID0gY3JlYXRlVGFibGUoKTsKKyAgICAgICAgICAgIGxldCB0YWJsZSA9IEluc3Bl Y3RvclRlc3QuY3JlYXRlVGFibGUoKTsKICAgICAgICAgICAgIHRhYmxlLmFsbG93c011bHRpcGxl U2VsZWN0aW9uID0gdHJ1ZTsKIAogICAgICAgICAgICAgY29uc3QgZXh0ZW5kU2VsZWN0aW9uID0g dHJ1ZTsK 352216 2018-10-12 15:25:10 -0700 2018-10-15 16:12:13 -0700 Patch bug-190538-20181012152510.patch text/plain 9326 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDczCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGVjZjczMDZhODU4MTk4NmJkY2Vk ZTM1ZTQ1M2ViMWI5NTEwNzU4Yy4uNTk1NmNjZTA5OTQyNTdhNTRmZDdmNWM1MTdkMjFlNzIyNDY1 OGI2NCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE4LTEwLTEyICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbnVwIFRhYmxl IHRlc3QgdXRpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA1MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjM3NzMwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFudXAgVGFibGUg dGVzdCB1dGlsaXRpZXMgYnkgZXhwb3NpbmcgcmVtb3ZpbmcgdGhlIGFydGlmaWNpYWwgZGVwZW5k ZW5jeQorICAgICAgICBiZXR3ZWVuIFRhYmxlRGVsZWdhdGUgYW5kIFRhYmxlRGF0YVNvdXJjZSwg YW5kIGV4cG9zaW5nIGEgY2xlYW5lciBzZXQgb2YKKyAgICAgICAgdXRpbGl0eSBtZXRob2RzIHRv IEluc3BlY3RvclRlc3QuIFRoaXMgcGF0Y2ggY2hhbmdlcyBgSW5zcGVjdG9yVGVzdC5jcmVhdGVU YWJsZWAKKyAgICAgICAgdG8gdGFrZSBubyBwYXJhbWV0ZXJzLCBhbmQgYWRkcyBgSW5zcGVjdG9y VGVzdC5jcmVhdGVUYWJsZVdpdGhEZWxlZ2F0ZWAgZm9yCisgICAgICAgIHRlc3RzIHRoYXQgbmVl ZCB0byBzdXBwbHkgYSBjdXN0b20gZGVsZWdhdGUuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdGFi bGUvcmVzb3VyY2VzL3RhYmxlLXV0aWxpdGllcy5qczoKKyAgICAgICAgKFRlc3RQYWdlLnJlZ2lz dGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5UYWJsZURhdGFTb3VyY2UpOgorICAgICAgICAo VGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci5JbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUp OgorICAgICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci5JbnNwZWN0b3JUZXN0LlRh YmxlRGVsZWdhdGUucHJvdG90eXBlLnRhYmxlUG9wdWxhdGVDZWxsKToKKyAgICAgICAgKFRlc3RQ YWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuY3JlYXRlRGF0YVNvdXJjZSk6CisgICAgICAgIChUZXN0 UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLmNyZWF0ZVRhYmxlSW50ZXJuYWwpOgorICAgICAgICAo VGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci5JbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlKToK KyAgICAgICAgKFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5jcmVh dGVUYWJsZVdpdGhEZWxlZ2F0ZSk6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxp emVyKToKKworICAgICAgICAqIGluc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24tZXhwZWN0 ZWQudHh0OgorICAgICAgICBVcGRhdGUgd2l0aCBuZXcgdGVzdCBzdWl0ZSBuYW1lLgorCisgICAg ICAgICogaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi5odG1sOgorCiAyMDE4LTEwLTEy ICBEYXdlaSBGZW50b24gIDxyZWFsZGF3ZWlAYXBwbGUuY29tPgogCiAgICAgICAgIFtNb2phdmUg V2syXSBMYXlvdXQgVGVzdCBodHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUvZGlzay1jYWNoZS12 YWxpZGF0aW9uLWF0dGFjaG1lbnQuaHRtbCBpcyBmbGFreQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanMgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvdGFibGUvcmVzb3VyY2VzL3RhYmxlLXV0aWxpdGllcy5qcwppbmRleCA0 ODYxYTM1YjE4NjVkYmIzNTQ1NzQyY2U2NGYxNjdkYTY5OGRkNDJkLi5jMGQ5NmQ5ZWJhZTVjYzdk NzBjN2I5NGU4MmJiMDEyNmE3YzgxNGIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0 b3IvdGFibGUvcmVzb3VyY2VzL3RhYmxlLXV0aWxpdGllcy5qcworKysgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvdGFibGUvcmVzb3VyY2VzL3RhYmxlLXV0aWxpdGllcy5qcwpAQCAtMywyNCArMywy MiBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsKICAgICB7CiAgICAgICAg IGNvbnN0cnVjdG9yKGl0ZW1zKQogICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9pdGVtcyA9 IGl0ZW1zOworICAgICAgICAgICAgdGhpcy5faXRlbXMgPSBpdGVtcyB8fCBbXTsKICAgICAgICAg fQogCiAgICAgICAgIGdldCBpdGVtcygpIHsgcmV0dXJuIHRoaXMuX2l0ZW1zOyB9CiAKLSAgICAg ICAgLy8gVGFibGUgRGF0YVNvdXJjZQotCiAgICAgICAgIHRhYmxlTnVtYmVyT2ZSb3dzKHRhYmxl KQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5faXRlbXMubGVuZ3RoOwogICAg ICAgICB9Ci0gICAgfQorICAgIH07CiAKICAgICBJbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUg PSBjbGFzcyBUYWJsZURlbGVnYXRlCiAgICAgewogICAgICAgICBjb25zdHJ1Y3RvcihpdGVtcykK ICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5faXRlbXMgPSBpdGVtczsKKyAgICAgICAgICAg IHRoaXMuaXRlbXMgPSBpdGVtcyB8fCBbXTsKICAgICAgICAgfQogCiAgICAgICAgIHRhYmxlU2Vs ZWN0aW9uRGlkQ2hhbmdlKHRhYmxlKQpAQCAtMzAsMzUgKzI4LDQ3IEBAIFRlc3RQYWdlLnJlZ2lz dGVySW5pdGlhbGl6ZXIoKCkgPT4gewogCiAgICAgICAgIHRhYmxlUG9wdWxhdGVDZWxsKHRhYmxl LCBjZWxsLCBjb2x1bW4sIHJvd0luZGV4KQogICAgICAgICB7Ci0gICAgICAgICAgICBsZXQgaXRl bSA9IHRoaXMuX2l0ZW1zW3Jvd0luZGV4XTsKKyAgICAgICAgICAgIGxldCBpdGVtID0gdGhpcy5p dGVtc1tyb3dJbmRleF07CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChpdGVtLCAi U2hvdWxkIGhhdmUgYW4gaXRlbSBmb3Igcm93ICIgKyByb3dJbmRleCk7CiAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmFzc2VydChpdGVtW2NvbHVtbi5pZGVudGlmaWVyXSwgIlNob3VsZCBoYXZl IGRhdGEgZm9yIGNvbHVtbiAiICsgY29sdW1uLmlkZW50aWZpZXIpOwogICAgICAgICAgICAgY2Vs bC50ZXh0Q29udGVudCA9IGl0ZW1bY29sdW1uLmlkZW50aWZpZXJdOwogICAgICAgICAgICAgcmV0 dXJuIGNlbGw7CiAgICAgICAgIH0KLSAgICB9CisgICAgfTsKIAotICAgIEluc3BlY3RvclRlc3Qu Y3JlYXRlVGFibGUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgZGF0YVNvdXJjZSkgewotICAgICAgICBp ZiAoIWRhdGFTb3VyY2UpIHsKLSAgICAgICAgICAgIGxldCBpdGVtcyA9IFtdOwotICAgICAgICAg ICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaXRlbXMu cHVzaCh7Ci0gICAgICAgICAgICAgICAgICAgIGluZGV4OiBpLAotICAgICAgICAgICAgICAgICAg ICBuYW1lOiAiUm93ICIgKyBpLAotICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgfQot ICAgICAgICAgICAgZGF0YVNvdXJjZSA9IG5ldyBJbnNwZWN0b3JUZXN0LlRhYmxlRGF0YVNvdXJj ZShpdGVtcyk7Ci0gICAgICAgIH0KKyAgICBmdW5jdGlvbiBjcmVhdGVEYXRhU291cmNlKCkgewor ICAgICAgICBsZXQgaXRlbXMgPSBbXTsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsg KytpKQorICAgICAgICAgICAgaXRlbXMucHVzaCh7aW5kZXg6IGksIG5hbWU6IGBSb3cgJHtpfWB9 KTsKIAotICAgICAgICBkZWxlZ2F0ZSA9IGRlbGVnYXRlIHx8IG5ldyBJbnNwZWN0b3JUZXN0LlRh YmxlRGVsZWdhdGUoZGF0YVNvdXJjZS5pdGVtcyk7CisgICAgICAgIHJldHVybiBuZXcgSW5zcGVj dG9yVGVzdC5UYWJsZURhdGFTb3VyY2UoaXRlbXMpOworICAgIH0KKworICAgIGZ1bmN0aW9uIGNy ZWF0ZVRhYmxlSW50ZXJuYWwoZGF0YVNvdXJjZSwgZGVsZWdhdGUpIHsKKyAgICAgICAgSW5zcGVj dG9yVGVzdC5hc3NlcnQoZGF0YVNvdXJjZSBpbnN0YW5jZW9mIEluc3BlY3RvclRlc3QuVGFibGVE YXRhU291cmNlKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoZGVsZWdhdGUgaW5zdGFu Y2VvZiBJbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUpOwogCiAgICAgICAgIGNvbnN0IHJvd0hl aWdodCA9IDIwOwogICAgICAgICBsZXQgdGFibGUgPSBuZXcgV0kuVGFibGUoInRlc3QiLCBkYXRh U291cmNlLCBkZWxlZ2F0ZSwgcm93SGVpZ2h0KTsKLSAgICAgICAgdGFibGUuYWRkQ29sdW1uKG5l dyBXSS5UYWJsZUNvbHVtbigiaW5kZXgiLCBXSS5VSVN0cmluZygiSW5kZXgiKSkpOwotICAgICAg ICB0YWJsZS5hZGRDb2x1bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJuYW1lIiwgV0kuVUlTdHJpbmco Ik5hbWUiKSkpOworICAgICAgICB0YWJsZS5hZGRDb2x1bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJp bmRleCIsICJJbmRleCIpKTsKKyAgICAgICAgdGFibGUuYWRkQ29sdW1uKG5ldyBXSS5UYWJsZUNv bHVtbigibmFtZSIsICJOYW1lIikpOwogCiAgICAgICAgIHRhYmxlLnVwZGF0ZUxheW91dCgpOwog CiAgICAgICAgIHJldHVybiB0YWJsZTsKICAgICB9CisKKyAgICBJbnNwZWN0b3JUZXN0LmNyZWF0 ZVRhYmxlID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGxldCBkYXRhU291cmNlID0gY3JlYXRlRGF0 YVNvdXJjZSgpOworICAgICAgICBsZXQgZGVsZWdhdGUgPSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJs ZURlbGVnYXRlKGRhdGFTb3VyY2UuaXRlbXMpOworICAgICAgICByZXR1cm4gY3JlYXRlVGFibGVJ bnRlcm5hbChkYXRhU291cmNlLCBkZWxlZ2F0ZSk7CisgICAgfTsKKworICAgIEluc3BlY3RvclRl c3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGUgPSBmdW5jdGlvbihkZWxlZ2F0ZSkgeworICAgICAg ICBJbnNwZWN0b3JUZXN0LmFzc2VydChkZWxlZ2F0ZSBpbnN0YW5jZW9mIEluc3BlY3RvclRlc3Qu VGFibGVEZWxlZ2F0ZSk7CisKKyAgICAgICAgbGV0IGRhdGFTb3VyY2UgPSBjcmVhdGVEYXRhU291 cmNlKCk7CisgICAgICAgIGRlbGVnYXRlLml0ZW1zID0gZGF0YVNvdXJjZS5pdGVtczsKKyAgICAg ICAgcmV0dXJuIGNyZWF0ZVRhYmxlSW50ZXJuYWwoZGF0YVNvdXJjZSwgZGVsZWdhdGUpOworICAg IH07CiB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci90YWJsZS90YWJsZS1z ZWxlY3Rpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxl LXNlbGVjdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNjMwNDVmOGMyMzliOTNjZjQ2ODVkNjAwYzc0 NTM5M2I4YWIxODQwZC4uNzE3ZmNlOGU3NjA1Njg2M2Y3Y2I5NmMwZDBjODY0NWRkOGU4Y2FiMiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVj dGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNyArMSw3IEBACiBUZXN0cyBmb3IgV0kuVGFibGUuCiAK IAotPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBUYWJsZQorPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBU YWJsZS5Sb3dTZWxlY3Rpb24KIC0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBUYWJsZS5jb25zdHJ1Y3Rv cgogUEFTUzogc2VsZWN0ZWRSb3cgc2hvdWxkIGJlIE5hTi4KIFBBU1M6IFNob3VsZCBoYXZlIG5v IHNlbGVjdGVkIHJvd3MuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUv dGFibGUtc2VsZWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvdGFibGUt c2VsZWN0aW9uLmh0bWwKaW5kZXggMzJhZTZjNGMwOGYyZTgzMjljMWY1M2FlYTIwNzhmMTM0M2Vh NjY0Ni4uZjYxYjU0NDE5ZDI2ZWRhMDk5OGE4YWUxMDFlODViNTM2YmIwMGI1MCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24uaHRtbApAQCAtOCwx NSArOCwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkKIHsKICAgICBJbnNwZWN0b3JUZXN0LnJlZGlyZWN0 UmVxdWVzdEFuaW1hdGlvbkZyYW1lKCk7CiAKLSAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0 LmNyZWF0ZVN5bmNTdWl0ZSgiVGFibGUiKTsKLQotICAgIC8vIEltcG9ydCBuYW1lcy4KLSAgICBs ZXQge2NyZWF0ZVRhYmxlLCBjbGVhbnVwVGFibGV9ID0gSW5zcGVjdG9yVGVzdDsKKyAgICBsZXQg c3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVN5bmNTdWl0ZSgiVGFibGUuUm93U2VsZWN0aW9u Iik7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAgICAgICAgIG5hbWU6ICJUYWJsZS5jb25z dHJ1Y3RvciIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVh dGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVU YWJsZSgpOwogCiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoaXNOYU4odGFi bGUuc2VsZWN0ZWRSb3cpLCAic2VsZWN0ZWRSb3cgc2hvdWxkIGJlIE5hTi4iKTsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwodGFibGUuc2VsZWN0ZWRSb3dzLmxlbmd0aCwg MCwgIlNob3VsZCBoYXZlIG5vIHNlbGVjdGVkIHJvd3MuIik7CkBAIC00MCw5ICszNyw5IEBAIGZ1 bmN0aW9uIHRlc3QoKQogCiAgICAgc3VpdGUuYWRkVGVzdENhc2UoewogICAgICAgICBuYW1lOiAi VGFibGUuU2VsZWN0Um93IiwKLSAgICAgICAgZGVzY3JpcHRpb246ICJTZWxlY3QgYSByb3csIHRo ZW4gc2VsZWN0IGFub3RoZXIgcm93IGNhdXNpbmcgdGhlIGZyaXN0IHRvIGJlY29tZSBkZXNlbGVj dGVkLiIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiU2VsZWN0IGEgcm93LCB0aGVuIHNlbGVjdCBh bm90aGVyIHJvdyBjYXVzaW5nIHRoZSBmaXJzdCB0byBiZWNvbWUgZGVzZWxlY3RlZC4iLAogICAg ICAgICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRhYmxlID0gY3JlYXRlVGFibGUoKTsKKyAg ICAgICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUoKTsKIAogICAg ICAgICAgICAgdHJpZ2dlclNlbGVjdFJvdyh0YWJsZSwgMCk7CiAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdFNoYWxsb3dFcXVhbCh0YWJsZS5zZWxlY3RlZFJvd3MsIFswXSwgInNlbGVj dGVkUm93cyBzaG91bGQgYmUgWzBdLiIpOwpAQCAtNTcsNyArNTQsNyBAQCBmdW5jdGlvbiB0ZXN0 KCkKICAgICAgICAgbmFtZTogIlRhYmxlLkRlc2VsZWN0Um93IiwKICAgICAgICAgZGVzY3JpcHRp b246ICJEZXNlbGVjdCB0aGUgc2VsZWN0ZWQgcm93LiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAg ICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxl ID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogCiAgICAgICAgICAgICB0cmlnZ2VyU2Vs ZWN0Um93KHRhYmxlLCAwKTsKICAgICAgICAgICAgIHRyaWdnZXJEZXNlbGVjdFJvdyh0YWJsZSwg MCk7CkBAIC03MSw3ICs2OCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiVGFi bGUuQWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24iLAogICAgICAgICBkZXNjcmlwdGlvbjogIlNob3Vs ZCBiZSBhYmxlIHRvIGVuYWJsZSBtdWx0aXBsZSBzZWxlY3Rpb24uIiwKICAgICAgICAgdGVzdCgp IHsKLSAgICAgICAgICAgIGxldCB0YWJsZSA9IGNyZWF0ZVRhYmxlKCk7CisgICAgICAgICAgICBs ZXQgdGFibGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlKCk7CiAKICAgICAgICAgICAgIHRh YmxlLmFsbG93c011bHRpcGxlU2VsZWN0aW9uID0gdHJ1ZTsKICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0VGhhdCh0YWJsZS5hbGxvd3NNdWx0aXBsZVNlbGVjdGlvbiwgImFsbG93c011 bHRpcGxlU2VsZWN0aW9uIGVuYWJsZWQuIik7CkBAIC04NSw3ICs4Miw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0TXVsdGlwbGVSb3dzLkV4dGVuZFNlbGVj dGlvbiIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2VsZWN0IG11bHRpcGxlIHJvd3MsIGV4dGVu ZGluZyB0aGUgc2VsZWN0aW9uLiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQg dGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9y VGVzdC5jcmVhdGVUYWJsZSgpOwogICAgICAgICAgICAgdGFibGUuYWxsb3dzTXVsdGlwbGVTZWxl Y3Rpb24gPSB0cnVlOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHRhYmxl LmFsbG93c011bHRpcGxlU2VsZWN0aW9uLCAiYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gZW5hYmxl ZC4iKTsKIApAQCAtMTA0LDcgKzEwMSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1l OiAiVGFibGUuU2VsZWN0TXVsdGlwbGVSb3dzLlNlbGVjdFRoZVNhbWVSb3dUd2ljZS5FeHRlbmRT ZWxlY3Rpb24iLAogICAgICAgICBkZXNjcmlwdGlvbjogIlNlbGVjdCBhbiBhbHJlYWR5IHNlbGVj dGVkIHJvdywgYW5kIGV4dGVuZCB0aGUgc2VsZWN0aW9uLiIsCiAgICAgICAgIHRlc3QoKSB7Ci0g ICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRh YmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogICAgICAgICAgICAgdGFibGUuYWxs b3dzTXVsdGlwbGVTZWxlY3Rpb24gPSB0cnVlOwogCiAgICAgICAgICAgICBjb25zdCBleHRlbmRT ZWxlY3Rpb24gPSB0cnVlOwpAQCAtMTIyLDcgKzExOSw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg ICAgICBuYW1lOiAiVGFibGUuU2VsZWN0TXVsdGlwbGVSb3dzLlNlbGVjdFRoZVNhbWVSb3dUd2lj ZS5Ob0V4dGVuZFNlbGVjdGlvbiIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2VsZWN0IGFuIGFs cmVhZHkgc2VsZWN0ZWQgcm93LCBhbmQgZG8gbm90IGV4dGVuZCB0aGUgc2VsZWN0aW9uLiIsCiAg ICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOwor ICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogICAg ICAgICAgICAgdGFibGUuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gPSB0cnVlOwogCiAgICAgICAg ICAgICBjb25zdCBleHRlbmRTZWxlY3Rpb24gPSB0cnVlOwo= 352396 2018-10-15 16:12:14 -0700 2018-10-15 16:29:35 -0700 Patch for landing bug-190538-20181015161210.patch text/plain 9293 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MTUxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTEzYTU0MDk1MWEyMzM3ZjY0ODgx YmFhN2RmNTZmZGU3YThmMjVlMi4uMjc3ODE2MjAzYjU5MThkNTBhNTA3MmEyYjMzYTRmNjU3NzE5 MjdjNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE4LTEwLTE2ICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBDbGVhbnVwIFRhYmxl IHRlc3QgdXRpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA1MzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ1MjM3NzMwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICBDbGVhbnVwIFRhYmxl IHRlc3QgdXRpbGl0aWVzIGJ5IGV4cG9zaW5nIHJlbW92aW5nIHRoZSBhcnRpZmljaWFsIGRlcGVu ZGVuY3kKKyAgICAgICAgYmV0d2VlbiBUYWJsZURlbGVnYXRlIGFuZCBUYWJsZURhdGFTb3VyY2Us IGFuZCBleHBvc2luZyBhIGNsZWFuZXIgc2V0IG9mCisgICAgICAgIHV0aWxpdHkgbWV0aG9kcyB0 byBJbnNwZWN0b3JUZXN0LiBUaGlzIHBhdGNoIGNoYW5nZXMgYEluc3BlY3RvclRlc3QuY3JlYXRl VGFibGVgCisgICAgICAgIHRvIHRha2Ugbm8gcGFyYW1ldGVycywgYW5kIGFkZHMgYEluc3BlY3Rv clRlc3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGVgIGZvcgorICAgICAgICB0ZXN0cyB0aGF0IG5l ZWQgdG8gc3VwcGx5IGEgY3VzdG9tIGRlbGVnYXRlLgorCisgICAgICAgICogaW5zcGVjdG9yL3Rh YmxlL3Jlc291cmNlcy90YWJsZS11dGlsaXRpZXMuanM6CisgICAgICAgIChUZXN0UGFnZS5yZWdp c3RlckluaXRpYWxpemVyLkluc3BlY3RvclRlc3QuVGFibGVEYXRhU291cmNlKToKKyAgICAgICAg KFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRl KToKKyAgICAgICAgKFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5U YWJsZURlbGVnYXRlLnByb3RvdHlwZS50YWJsZVBvcHVsYXRlQ2VsbCk6CisgICAgICAgIChUZXN0 UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLmNyZWF0ZURhdGFTb3VyY2UpOgorICAgICAgICAoVGVz dFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci5jcmVhdGVUYWJsZUludGVybmFsKToKKyAgICAgICAg KFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIuSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSk6 CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyLkluc3BlY3RvclRlc3QuY3Jl YXRlVGFibGVXaXRoRGVsZWdhdGUpOgorICAgICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFs aXplcik6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvdGFibGUvdGFibGUtc2VsZWN0aW9uLWV4cGVj dGVkLnR4dDoKKyAgICAgICAgVXBkYXRlIHdpdGggbmV3IHRlc3Qgc3VpdGUgbmFtZS4KKworICAg ICAgICAqIGluc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24uaHRtbDoKKwogMjAxOC0xMC0x NSAgQ2hhcmxlcyBWYXphYyAgPGN2YXphY0BnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogRXhwb3NlIFNlcnZlciBUaW1pbmcgUmVzcG9uc2UgSGVhZGVycyBpbiBOZXR3b3JrIFRh YgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Jlc291cmNlcy90YWJs ZS11dGlsaXRpZXMuanMgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvcmVzb3VyY2VzL3Rh YmxlLXV0aWxpdGllcy5qcwppbmRleCA0ODYxYTM1YjE4NjVkYmIzNTQ1NzQyY2U2NGYxNjdkYTY5 OGRkNDJkLi5jMGQ5NmQ5ZWJhZTVjYzdkNzBjN2I5NGU4MmJiMDEyNmE3YzgxNGIxIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvcmVzb3VyY2VzL3RhYmxlLXV0aWxpdGll cy5qcworKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvcmVzb3VyY2VzL3RhYmxlLXV0 aWxpdGllcy5qcwpAQCAtMywyNCArMywyMiBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVy KCgpID0+IHsKICAgICB7CiAgICAgICAgIGNvbnN0cnVjdG9yKGl0ZW1zKQogICAgICAgICB7Ci0g ICAgICAgICAgICB0aGlzLl9pdGVtcyA9IGl0ZW1zOworICAgICAgICAgICAgdGhpcy5faXRlbXMg PSBpdGVtcyB8fCBbXTsKICAgICAgICAgfQogCiAgICAgICAgIGdldCBpdGVtcygpIHsgcmV0dXJu IHRoaXMuX2l0ZW1zOyB9CiAKLSAgICAgICAgLy8gVGFibGUgRGF0YVNvdXJjZQotCiAgICAgICAg IHRhYmxlTnVtYmVyT2ZSb3dzKHRhYmxlKQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4g dGhpcy5faXRlbXMubGVuZ3RoOwogICAgICAgICB9Ci0gICAgfQorICAgIH07CiAKICAgICBJbnNw ZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUgPSBjbGFzcyBUYWJsZURlbGVnYXRlCiAgICAgewogICAg ICAgICBjb25zdHJ1Y3RvcihpdGVtcykKICAgICAgICAgewotICAgICAgICAgICAgdGhpcy5faXRl bXMgPSBpdGVtczsKKyAgICAgICAgICAgIHRoaXMuaXRlbXMgPSBpdGVtcyB8fCBbXTsKICAgICAg ICAgfQogCiAgICAgICAgIHRhYmxlU2VsZWN0aW9uRGlkQ2hhbmdlKHRhYmxlKQpAQCAtMzAsMzUg KzI4LDQ3IEBAIFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIoKCkgPT4gewogCiAgICAgICAg IHRhYmxlUG9wdWxhdGVDZWxsKHRhYmxlLCBjZWxsLCBjb2x1bW4sIHJvd0luZGV4KQogICAgICAg ICB7Ci0gICAgICAgICAgICBsZXQgaXRlbSA9IHRoaXMuX2l0ZW1zW3Jvd0luZGV4XTsKKyAgICAg ICAgICAgIGxldCBpdGVtID0gdGhpcy5pdGVtc1tyb3dJbmRleF07CiAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmFzc2VydChpdGVtLCAiU2hvdWxkIGhhdmUgYW4gaXRlbSBmb3Igcm93ICIgKyBy b3dJbmRleCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChpdGVtW2NvbHVtbi5p ZGVudGlmaWVyXSwgIlNob3VsZCBoYXZlIGRhdGEgZm9yIGNvbHVtbiAiICsgY29sdW1uLmlkZW50 aWZpZXIpOwogICAgICAgICAgICAgY2VsbC50ZXh0Q29udGVudCA9IGl0ZW1bY29sdW1uLmlkZW50 aWZpZXJdOwogICAgICAgICAgICAgcmV0dXJuIGNlbGw7CiAgICAgICAgIH0KLSAgICB9CisgICAg fTsKIAotICAgIEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwg ZGF0YVNvdXJjZSkgewotICAgICAgICBpZiAoIWRhdGFTb3VyY2UpIHsKLSAgICAgICAgICAgIGxl dCBpdGVtcyA9IFtdOwotICAgICAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgKytpKSB7 Ci0gICAgICAgICAgICAgICAgaXRlbXMucHVzaCh7Ci0gICAgICAgICAgICAgICAgICAgIGluZGV4 OiBpLAotICAgICAgICAgICAgICAgICAgICBuYW1lOiAiUm93ICIgKyBpLAotICAgICAgICAgICAg ICAgIH0pOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgZGF0YVNvdXJjZSA9IG5ldyBJbnNw ZWN0b3JUZXN0LlRhYmxlRGF0YVNvdXJjZShpdGVtcyk7Ci0gICAgICAgIH0KKyAgICBmdW5jdGlv biBjcmVhdGVEYXRhU291cmNlKCkgeworICAgICAgICBsZXQgaXRlbXMgPSBbXTsKKyAgICAgICAg Zm9yIChsZXQgaSA9IDA7IGkgPCAxMDsgKytpKQorICAgICAgICAgICAgaXRlbXMucHVzaCh7aW5k ZXg6IGksIG5hbWU6IGBSb3cgJHtpfWB9KTsKIAotICAgICAgICBkZWxlZ2F0ZSA9IGRlbGVnYXRl IHx8IG5ldyBJbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUoZGF0YVNvdXJjZS5pdGVtcyk7Cisg ICAgICAgIHJldHVybiBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURhdGFTb3VyY2UoaXRlbXMpOwor ICAgIH0KKworICAgIGZ1bmN0aW9uIGNyZWF0ZVRhYmxlSW50ZXJuYWwoZGF0YVNvdXJjZSwgZGVs ZWdhdGUpIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoZGF0YVNvdXJjZSBpbnN0YW5j ZW9mIEluc3BlY3RvclRlc3QuVGFibGVEYXRhU291cmNlKTsKKyAgICAgICAgSW5zcGVjdG9yVGVz dC5hc3NlcnQoZGVsZWdhdGUgaW5zdGFuY2VvZiBJbnNwZWN0b3JUZXN0LlRhYmxlRGVsZWdhdGUp OwogCiAgICAgICAgIGNvbnN0IHJvd0hlaWdodCA9IDIwOwogICAgICAgICBsZXQgdGFibGUgPSBu ZXcgV0kuVGFibGUoInRlc3QiLCBkYXRhU291cmNlLCBkZWxlZ2F0ZSwgcm93SGVpZ2h0KTsKLSAg ICAgICAgdGFibGUuYWRkQ29sdW1uKG5ldyBXSS5UYWJsZUNvbHVtbigiaW5kZXgiLCBXSS5VSVN0 cmluZygiSW5kZXgiKSkpOwotICAgICAgICB0YWJsZS5hZGRDb2x1bW4obmV3IFdJLlRhYmxlQ29s dW1uKCJuYW1lIiwgV0kuVUlTdHJpbmcoIk5hbWUiKSkpOworICAgICAgICB0YWJsZS5hZGRDb2x1 bW4obmV3IFdJLlRhYmxlQ29sdW1uKCJpbmRleCIsICJJbmRleCIpKTsKKyAgICAgICAgdGFibGUu YWRkQ29sdW1uKG5ldyBXSS5UYWJsZUNvbHVtbigibmFtZSIsICJOYW1lIikpOwogCiAgICAgICAg IHRhYmxlLnVwZGF0ZUxheW91dCgpOwogCiAgICAgICAgIHJldHVybiB0YWJsZTsKICAgICB9CisK KyAgICBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRhYmxlID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGxl dCBkYXRhU291cmNlID0gY3JlYXRlRGF0YVNvdXJjZSgpOworICAgICAgICBsZXQgZGVsZWdhdGUg PSBuZXcgSW5zcGVjdG9yVGVzdC5UYWJsZURlbGVnYXRlKGRhdGFTb3VyY2UuaXRlbXMpOworICAg ICAgICByZXR1cm4gY3JlYXRlVGFibGVJbnRlcm5hbChkYXRhU291cmNlLCBkZWxlZ2F0ZSk7Cisg ICAgfTsKKworICAgIEluc3BlY3RvclRlc3QuY3JlYXRlVGFibGVXaXRoRGVsZWdhdGUgPSBmdW5j dGlvbihkZWxlZ2F0ZSkgeworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChkZWxlZ2F0ZSBp bnN0YW5jZW9mIEluc3BlY3RvclRlc3QuVGFibGVEZWxlZ2F0ZSk7CisKKyAgICAgICAgbGV0IGRh dGFTb3VyY2UgPSBjcmVhdGVEYXRhU291cmNlKCk7CisgICAgICAgIGRlbGVnYXRlLml0ZW1zID0g ZGF0YVNvdXJjZS5pdGVtczsKKyAgICAgICAgcmV0dXJuIGNyZWF0ZVRhYmxlSW50ZXJuYWwoZGF0 YVNvdXJjZSwgZGVsZWdhdGUpOworICAgIH07CiB9KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci90YWJsZS90YWJsZS1zZWxlY3Rpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNjMw NDVmOGMyMzliOTNjZjQ2ODVkNjAwYzc0NTM5M2I4YWIxODQwZC4uNzE3ZmNlOGU3NjA1Njg2M2Y3 Y2I5NmMwZDBjODY0NWRkOGU4Y2FiMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3RhYmxlL3RhYmxlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3RhYmxlL3RhYmxlLXNlbGVjdGlvbi1leHBlY3RlZC50eHQKQEAgLTEsNyArMSw3IEBA CiBUZXN0cyBmb3IgV0kuVGFibGUuCiAKIAotPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBUYWJsZQor PT0gUnVubmluZyB0ZXN0IHN1aXRlOiBUYWJsZS5Sb3dTZWxlY3Rpb24KIC0tIFJ1bm5pbmcgdGVz dCBjYXNlOiBUYWJsZS5jb25zdHJ1Y3RvcgogUEFTUzogc2VsZWN0ZWRSb3cgc2hvdWxkIGJlIE5h Ti4KIFBBU1M6IFNob3VsZCBoYXZlIG5vIHNlbGVjdGVkIHJvd3MuCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvdGFibGUvdGFibGUtc2VsZWN0aW9uLmh0bWwgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdGFibGUvdGFibGUtc2VsZWN0aW9uLmh0bWwKaW5kZXggMzJhZTZjNGMwOGYy ZTgzMjljMWY1M2FlYTIwNzhmMTM0M2VhNjY0Ni4uZjYxYjU0NDE5ZDI2ZWRhMDk5OGE4YWUxMDFl ODViNTM2YmIwMGI1MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3RhYmxlL3Rh YmxlLXNlbGVjdGlvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci90YWJsZS90YWJs ZS1zZWxlY3Rpb24uaHRtbApAQCAtOCwxNSArOCwxMiBAQCBmdW5jdGlvbiB0ZXN0KCkKIHsKICAg ICBJbnNwZWN0b3JUZXN0LnJlZGlyZWN0UmVxdWVzdEFuaW1hdGlvbkZyYW1lKCk7CiAKLSAgICBs ZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVN5bmNTdWl0ZSgiVGFibGUiKTsKLQotICAg IC8vIEltcG9ydCBuYW1lcy4KLSAgICBsZXQge2NyZWF0ZVRhYmxlLCBjbGVhbnVwVGFibGV9ID0g SW5zcGVjdG9yVGVzdDsKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVN5bmNT dWl0ZSgiVGFibGUuUm93U2VsZWN0aW9uIik7CiAKICAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CiAg ICAgICAgIG5hbWU6ICJUYWJsZS5jb25zdHJ1Y3RvciIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAg ICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxl ID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogCiAgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdFRoYXQoaXNOYU4odGFibGUuc2VsZWN0ZWRSb3cpLCAic2VsZWN0ZWRSb3cgc2hv dWxkIGJlIE5hTi4iKTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwodGFi bGUuc2VsZWN0ZWRSb3dzLmxlbmd0aCwgMCwgIlNob3VsZCBoYXZlIG5vIHNlbGVjdGVkIHJvd3Mu Iik7CkBAIC00MCw5ICszNyw5IEBAIGZ1bmN0aW9uIHRlc3QoKQogCiAgICAgc3VpdGUuYWRkVGVz dENhc2UoewogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0Um93IiwKLSAgICAgICAgZGVzY3Jp cHRpb246ICJTZWxlY3QgYSByb3csIHRoZW4gc2VsZWN0IGFub3RoZXIgcm93IGNhdXNpbmcgdGhl IGZyaXN0IHRvIGJlY29tZSBkZXNlbGVjdGVkLiIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiU2Vs ZWN0IGEgcm93LCB0aGVuIHNlbGVjdCBhbm90aGVyIHJvdyBjYXVzaW5nIHRoZSBmaXJzdCB0byBi ZWNvbWUgZGVzZWxlY3RlZC4iLAogICAgICAgICB0ZXN0KCkgewotICAgICAgICAgICAgbGV0IHRh YmxlID0gY3JlYXRlVGFibGUoKTsKKyAgICAgICAgICAgIGxldCB0YWJsZSA9IEluc3BlY3RvclRl c3QuY3JlYXRlVGFibGUoKTsKIAogICAgICAgICAgICAgdHJpZ2dlclNlbGVjdFJvdyh0YWJsZSwg MCk7CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFNoYWxsb3dFcXVhbCh0YWJsZS5z ZWxlY3RlZFJvd3MsIFswXSwgInNlbGVjdGVkUm93cyBzaG91bGQgYmUgWzBdLiIpOwpAQCAtNTcs NyArNTQsNyBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgbmFtZTogIlRhYmxlLkRlc2VsZWN0 Um93IiwKICAgICAgICAgZGVzY3JpcHRpb246ICJEZXNlbGVjdCB0aGUgc2VsZWN0ZWQgcm93LiIs CiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgp OworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwog CiAgICAgICAgICAgICB0cmlnZ2VyU2VsZWN0Um93KHRhYmxlLCAwKTsKICAgICAgICAgICAgIHRy aWdnZXJEZXNlbGVjdFJvdyh0YWJsZSwgMCk7CkBAIC03MSw3ICs2OCw3IEBAIGZ1bmN0aW9uIHRl c3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuQWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24iLAogICAg ICAgICBkZXNjcmlwdGlvbjogIlNob3VsZCBiZSBhYmxlIHRvIGVuYWJsZSBtdWx0aXBsZSBzZWxl Y3Rpb24uIiwKICAgICAgICAgdGVzdCgpIHsKLSAgICAgICAgICAgIGxldCB0YWJsZSA9IGNyZWF0 ZVRhYmxlKCk7CisgICAgICAgICAgICBsZXQgdGFibGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVRh YmxlKCk7CiAKICAgICAgICAgICAgIHRhYmxlLmFsbG93c011bHRpcGxlU2VsZWN0aW9uID0gdHJ1 ZTsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdCh0YWJsZS5hbGxvd3NNdWx0 aXBsZVNlbGVjdGlvbiwgImFsbG93c011bHRpcGxlU2VsZWN0aW9uIGVuYWJsZWQuIik7CkBAIC04 NSw3ICs4Miw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0 TXVsdGlwbGVSb3dzLkV4dGVuZFNlbGVjdGlvbiIsCiAgICAgICAgIGRlc2NyaXB0aW9uOiAiU2Vs ZWN0IG11bHRpcGxlIHJvd3MsIGV4dGVuZGluZyB0aGUgc2VsZWN0aW9uLiIsCiAgICAgICAgIHRl c3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAg ICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgpOwogICAgICAgICAgICAg dGFibGUuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gPSB0cnVlOwogICAgICAgICAgICAgSW5zcGVj dG9yVGVzdC5leHBlY3RUaGF0KHRhYmxlLmFsbG93c011bHRpcGxlU2VsZWN0aW9uLCAiYWxsb3dz TXVsdGlwbGVTZWxlY3Rpb24gZW5hYmxlZC4iKTsKIApAQCAtMTA0LDcgKzEwMSw3IEBAIGZ1bmN0 aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0TXVsdGlwbGVSb3dzLlNlbGVj dFRoZVNhbWVSb3dUd2ljZS5FeHRlbmRTZWxlY3Rpb24iLAogICAgICAgICBkZXNjcmlwdGlvbjog IlNlbGVjdCBhbiBhbHJlYWR5IHNlbGVjdGVkIHJvdywgYW5kIGV4dGVuZCB0aGUgc2VsZWN0aW9u LiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQgdGFibGUgPSBjcmVhdGVUYWJs ZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVUYWJsZSgp OwogICAgICAgICAgICAgdGFibGUuYWxsb3dzTXVsdGlwbGVTZWxlY3Rpb24gPSB0cnVlOwogCiAg ICAgICAgICAgICBjb25zdCBleHRlbmRTZWxlY3Rpb24gPSB0cnVlOwpAQCAtMTIyLDcgKzExOSw3 IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICBuYW1lOiAiVGFibGUuU2VsZWN0TXVsdGlwbGVS b3dzLlNlbGVjdFRoZVNhbWVSb3dUd2ljZS5Ob0V4dGVuZFNlbGVjdGlvbiIsCiAgICAgICAgIGRl c2NyaXB0aW9uOiAiU2VsZWN0IGFuIGFscmVhZHkgc2VsZWN0ZWQgcm93LCBhbmQgZG8gbm90IGV4 dGVuZCB0aGUgc2VsZWN0aW9uLiIsCiAgICAgICAgIHRlc3QoKSB7Ci0gICAgICAgICAgICBsZXQg dGFibGUgPSBjcmVhdGVUYWJsZSgpOworICAgICAgICAgICAgbGV0IHRhYmxlID0gSW5zcGVjdG9y VGVzdC5jcmVhdGVUYWJsZSgpOwogICAgICAgICAgICAgdGFibGUuYWxsb3dzTXVsdGlwbGVTZWxl Y3Rpb24gPSB0cnVlOwogCiAgICAgICAgICAgICBjb25zdCBleHRlbmRTZWxlY3Rpb24gPSB0cnVl Owo=