197922 2019-05-15 12:30:59 -0700 [ews-build] Add build step to Transfer archive to S3 2019-05-17 07:33:19 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197949 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue ews-watchlist jbedard kocsen_chung lforschler webkit-bug-importer oldest_to_newest 1536543 0 aakash_jain 2019-05-15 12:30:59 -0700 https://bugs.webkit.org/show_bug.cgi?id=197914 add support to transfer to S3 for EWS. We should add build step to start using that. 1536544 1 369983 aakash_jain 2019-05-15 12:36:18 -0700 Created attachment 369983 Patch 1536545 2 ews-watchlist 2019-05-15 12:38:26 -0700 Attachment 369983 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:772: [UploadBuiltProduct.getResultSummary] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:773: [UploadBuiltProduct.getResultSummary] Instance of 'UploadBuiltProduct' has no 'results' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1102: [TestTransferToS3.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1102: [TestTransferToS3.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1121: [TestTransferToS3.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1121: [TestTransferToS3.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1536598 3 369983 jbedard 2019-05-15 14:33:47 -0700 Comment on attachment 369983 Patch Patch needs to be updated after changes to <https://bugs.webkit.org/show_bug.cgi?id=197914> 1536607 4 aakash_jain 2019-05-15 14:54:28 -0700 > Patch needs to be updated after changes to <https://bugs.webkit.org/show_bug.cgi?id=197914> This patch is still good. We still have the --patch_id parameter in https://bugs.webkit.org/show_bug.cgi?id=197914 1536608 5 aakash_jain 2019-05-15 14:58:23 -0700 actually need to remove --ews parameter. 1536625 6 369998 aakash_jain 2019-05-15 15:36:01 -0700 Created attachment 369998 Patch 1536630 7 ews-watchlist 2019-05-15 15:37:53 -0700 Attachment 369998 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:772: [UploadBuiltProduct.getResultSummary] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:773: [UploadBuiltProduct.getResultSummary] Instance of 'UploadBuiltProduct' has no 'results' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1101: [TestTransferToS3.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1101: [TestTransferToS3.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1119: [TestTransferToS3.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1119: [TestTransferToS3.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1536638 8 370000 aakash_jain 2019-05-15 15:44:00 -0700 Created attachment 370000 Patch 1536642 9 ews-watchlist 2019-05-15 15:45:58 -0700 Attachment 370000 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:772: [UploadBuiltProduct.getResultSummary] Use of super on an old style class [pylint/E1002] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps.py:773: [UploadBuiltProduct.getResultSummary] Instance of 'UploadBuiltProduct' has no 'results' member [pylint/E1101] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1101: [TestTransferToS3.test_success] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1101: [TestTransferToS3.test_success] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1119: [TestTransferToS3.test_failure] Passing unexpected keyword argument 'state_string' in function call [pylint/E1123] [5] ERROR: Tools/BuildSlaveSupport/ews-build/steps_unittest.py:1119: [TestTransferToS3.test_failure] No value passed for parameter 'status_text' in function call [pylint/E1120] [5] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1537027 10 370000 commit-queue 2019-05-16 21:30:48 -0700 Comment on attachment 370000 Patch Rejecting attachment 370000 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 370000, '--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=370000&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=197922&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 370000 from bug 197922. Fetching: https://bugs.webkit.org/attachment.cgi?id=370000 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 Tools/BuildSlaveSupport/ews-build/steps.py ERROR from SVN: Item is out of date: File '/trunk/Tools/BuildSlaveSupport/ews-build/steps.py' is out of date W: 7c96ca51f33c853306d8b8fb6b59e32aede4d6f8 and refs/remotes/origin/master differ, using rebase: :040000 040000 7b09d0ff72efd591203a5dfe5afd5c113d0be4f4 4c70e70207a9507ed8b9edbe23cc3573d89dd666 M Tools 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 Tools/BuildSlaveSupport/ews-build/steps.py ERROR from SVN: Item is out of date: File '/trunk/Tools/BuildSlaveSupport/ews-build/steps.py' is out of date W: 7c96ca51f33c853306d8b8fb6b59e32aede4d6f8 and refs/remotes/origin/master differ, using rebase: :040000 040000 7b09d0ff72efd591203a5dfe5afd5c113d0be4f4 4c70e70207a9507ed8b9edbe23cc3573d89dd666 M Tools 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 Current branch master is up to date. Full output: https://webkit-queues.webkit.org/results/12212519 1537101 11 370000 aakash_jain 2019-05-17 07:32:20 -0700 Comment on attachment 370000 Patch Clearing flags on attachment: 370000 Committed r245461: <https://trac.webkit.org/changeset/245461> 1537102 12 aakash_jain 2019-05-17 07:32:23 -0700 All reviewed patches have been landed. Closing bug. 1537103 13 webkit-bug-importer 2019-05-17 07:33:19 -0700 <rdar://problem/50892140> 369983 2019-05-15 12:36:18 -0700 2019-05-15 15:35:58 -0700 Patch bug-197922-20190515153617.patch text/plain 6745 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NTMzOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA1LTE1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBUcmFuc2ZlciBhcmNo aXZlIHRvIFMzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTc5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAgICAgKFRyYW5z ZmVyVG9TMyk6CisgICAgICAgIChUcmFuc2ZlclRvUzMuZmluaXNoZWQpOiBJbnZva2UgdHJpZ2dl cnMgYWZ0ZXIgdHJhbnNmZXIgaXMgc3VjY2Vzc2Z1bC4KKyAgICAgICAgKFRyYW5zZmVyVG9TMy5n ZXRSZXN1bHRTdW1tYXJ5KTogQ3JlYXRlIG1vcmUgcmVhZGFibGUgZmFpbHVyZSBzdHJpbmcuCisg ICAgICAgIChVcGxvYWRCdWlsdFByb2R1Y3QuZmluaXNoZWQpOiBEZWxldGVkLiBNb3ZlZCB0aGUg dHJpZ2dlciBpbnZvY2F0aW9uIGFmdGVyIFRyYW5zZmVyVG9TMy4KKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVzdHMu CisKIDIwMTktMDUtMTUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAK ICAgICAgICAgaW5wdXRtb2RlPSJudW1lcmljIiBzaG91bGQgc2hvdyBhIG51bWJlciBwYWQgd2l0 aCBkaWdpdHMgMC05LCBpbnN0ZWFkIG9mIHRoZSBudW1lcmljIGtleXBsYW5lCkluZGV4OiBUb29s cy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CShyZXZpc2lvbiAyNDUzMzcp CisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHdvcmtpbmcg Y29weSkKQEAgLTc2OSwxOCArNzY5LDM5IEBAIGNsYXNzIFVwbG9hZEJ1aWx0UHJvZHVjdCh0cmFu c2Zlci5GaWxlVXAKICAgICAgICAga3dhcmdzWydibG9ja3NpemUnXSA9IDEwMjQgKiAyNTYKICAg ICAgICAgdHJhbnNmZXIuRmlsZVVwbG9hZC5fX2luaXRfXyhzZWxmLCAqKmt3YXJncykKIAorICAg IGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgorICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0g U1VDQ0VTUzoKKyAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgdG8gdXBsb2Fk IGJ1aWx0IHByb2R1Y3QnfQorICAgICAgICByZXR1cm4gc3VwZXIoVXBsb2FkQnVpbHRQcm9kdWN0 LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKworCitjbGFzcyBUcmFuc2ZlclRvUzMobWFzdGVy Lk1hc3RlclNoZWxsQ29tbWFuZCk6CisgICAgbmFtZSA9ICd0cmFuc2Zlci10by1zMycKKyAgICBk ZXNjcmlwdGlvbiA9IFsndHJhbnNmZXJyaW5nIHRvIHMzJ10KKyAgICBkZXNjcmlwdGlvbkRvbmUg PSBbJ1RyYW5zZmVycmVkIGFyY2hpdmUgdG8gUzMnXQorICAgIGFyY2hpdmUgPSBXaXRoUHJvcGVy dGllcygncHVibGljX2h0bWwvYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVy ZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKQorICAgIGlkZW50aWZpZXIg PSBXaXRoUHJvcGVydGllcygnJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUoY29u ZmlndXJhdGlvbilzJykKKyAgICBwYXRjaF9pZCA9IFdpdGhQcm9wZXJ0aWVzKCclKHBhdGNoX2lk KXMnKQorICAgIGNvbW1hbmQgPSBbJ3B5dGhvbicsICcuLi9TaGFyZWQvdHJhbnNmZXItYXJjaGl2 ZS10by1zMycsICctLXBhdGNoX2lkJywgcGF0Y2hfaWQsICctLWlkZW50aWZpZXInLCBpZGVudGlm aWVyLCAnLS1hcmNoaXZlJywgYXJjaGl2ZSwgJy0tZXdzJ10KKyAgICBoYWx0T25GYWlsdXJlID0g VHJ1ZQorICAgIGZsdW5rT25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYs ICoqa3dhcmdzKToKKyAgICAgICAga3dhcmdzWydjb21tYW5kJ10gPSBzZWxmLmNvbW1hbmQKKyAg ICAgICAgbWFzdGVyLk1hc3RlclNoZWxsQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBsb2dFbnZpcm9u PUZhbHNlLCAqKmt3YXJncykKKwogICAgIGRlZiBmaW5pc2hlZChzZWxmLCByZXN1bHRzKToKICAg ICAgICAgaWYgcmVzdWx0cyA9PSBTVUNDRVNTOgogICAgICAgICAgICAgdHJpZ2dlcnMgPSBzZWxm LmdldFByb3BlcnR5KCd0cmlnZ2VycycsIE5vbmUpCiAgICAgICAgICAgICBpZiB0cmlnZ2VyczoK ICAgICAgICAgICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbVHJp Z2dlcihzY2hlZHVsZXJOYW1lcz10cmlnZ2VycyldKQogCi0gICAgICAgIHJldHVybiBzdXBlcihV cGxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLmZpbmlzaGVkKHJlc3VsdHMpCisgICAgICAgIHJldHVy biBzdXBlcihUcmFuc2ZlclRvUzMsIHNlbGYpLmZpbmlzaGVkKHJlc3VsdHMpCiAKICAgICBkZWYg Z2V0UmVzdWx0U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NF U1M6Ci0gICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnRmFpbGVkIHRvIHVwbG9hZCBidWls dCBwcm9kdWN0J30KLSAgICAgICAgcmV0dXJuIHN1cGVyKFVwbG9hZEJ1aWx0UHJvZHVjdCwgc2Vs ZikuZ2V0UmVzdWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnRmFp bGVkIHRvIHRyYW5zZmVyIGFyY2hpdmUgdG8gUzMnfQorICAgICAgICByZXR1cm4gc3VwZXIoVHJh bnNmZXJUb1MzLCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogCiBjbGFzcyBEb3dubG9hZEJ1 aWx0UHJvZHVjdChzaGVsbC5TaGVsbENvbW1hbmQpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1 cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjQ1 MzM3KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MCw4ICs0MCw4IEBAIGZyb20gc3RlcHMgaW1wb3J0IChB bmFseXplQVBJVGVzdHNSZXN1bHQKICAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJv ZHVjdCwgRXh0cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBLaWxsT2xkUHJv Y2Vzc2VzLAogICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwgUmVSdW5BUElU ZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5BUElUZXN0cywgUnVuQVBJVGVzdHNX aXRob3V0UGF0Y2gsCiAgICAgICAgICAgICAgICAgICAgUnVuQmluZGluZ3NUZXN0cywgUnVuSmF2 YVNjcmlwdENvcmVUZXN0cywgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCwgUnVuV2ViS2l0MVRl c3RzLCBSdW5XZWJLaXRQZXJsVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlU ZXN0cywgUnVuV2ViS2l0VGVzdHMsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBVbkFw cGx5UGF0Y2hJZlJlcXVpcmVkLCBVcGxvYWRCdWlsdFByb2R1Y3QsCi0gICAgICAgICAgICAgICAg ICAgVXBsb2FkVGVzdFJlc3VsdHMsIFZhbGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAg UnVuV2ViS2l0UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBU cmlnZ2VyLCBUcmFuc2ZlclRvUzMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCisgICAgICAgICAg ICAgICAgICAgVXBsb2FkQnVpbHRQcm9kdWN0LCBVcGxvYWRUZXN0UmVzdWx0cywgVmFsaWRhdGVQ YXRjaCkKIAogIyBXb3JrYXJvdW5kIGZvciBodHRwczovL2dpdGh1Yi5jb20vYnVpbGRib3QvYnVp bGRib3QvaXNzdWVzLzQ2NjkKIGZyb20gYnVpbGRib3QudGVzdC5mYWtlLmZha2VidWlsZCBpbXBv cnQgRmFrZUJ1aWxkCkBAIC0xMDc1LDYgKzEwNzUsNTMgQEAgY2xhc3MgVGVzdEV4dHJhY3RCdWls dFByb2R1Y3QoQnVpbGRTdGVwTQogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogCitj bGFzcyBUZXN0VHJhbnNmZXJUb1MzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5U ZXN0Q2FzZSk6CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdl ID0gVHJ1ZQorICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisKKyAgICBkZWYg dGVhckRvd24oc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkK KworICAgIGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFRy YW5zZmVyVG9TMygpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAn bWFjLWhpZ2hzaWVycmEnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9u JywgJ3JlbGVhc2UnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhcmNoaXRlY3R1cmUnLCAn eDg2XzY0JykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnMTIzNCcpCisg ICAgICAgIHNlbGYuZXhwZWN0TG9jYWxDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdE1hc3Rl clNoZWxsQ29tbWFuZChjb21tYW5kPVsncHl0aG9uJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnLi4vU2hhcmVkL3RyYW5zZmVyLWFyY2hpdmUtdG8tczMn LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLXBhdGNo X2lkJywgJzEyMzQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICctLWlkZW50aWZpZXInLCAnbWFjLWhpZ2hzaWVycmEteDg2XzY0LXJlbGVhc2UnLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWFyY2hpdmUnLCAn cHVibGljX2h0bWwvYXJjaGl2ZXMvbWFjLWhpZ2hzaWVycmEteDg2XzY0LXJlbGVhc2UvMTIzNC56 aXAnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWV3 cycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdKQorICAg ICAgICAgICAgKyAwLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1 bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdUcmFuc2ZlcnJlZCBhcmNoaXZlIHRvIFMzJykKKyAg ICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKyAgICBkZWYgdGVzdF9mYWlsdXJlKHNlbGYp OgorICAgICAgICBzZWxmLnNldHVwU3RlcChUcmFuc2ZlclRvUzMoKSkKKyAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2lvcy1zaW11bGF0b3ItMTInKQorICAgICAgICBz ZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ2RlYnVnJykKKyAgICAgICAgc2VsZi5z ZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCisgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4cGVjdExvY2FsQ29tbWFu ZHMoCisgICAgICAgICAgICBFeHBlY3RNYXN0ZXJTaGVsbENvbW1hbmQoY29tbWFuZD1bJ3B5dGhv bicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy4uL1No YXJlZC90cmFuc2Zlci1hcmNoaXZlLXRvLXMzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnLS1wYXRjaF9pZCcsICcxMjM0JywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pZGVudGlmaWVyJywgJ2lvcy1zaW11 bGF0b3ItMTIteDg2XzY0LWRlYnVnJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnLS1hcmNoaXZlJywgJ3B1YmxpY19odG1sL2FyY2hpdmVzL2lvcy1zaW11 bGF0b3ItMTIteDg2XzY0LWRlYnVnLzEyMzQuemlwJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnLS1ld3MnLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgXSkKKyAgICAgICAgICAgICsgMiwKKyAgICAgICAgKQorICAg ICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nRmFp bGVkIHRvIHRyYW5zZmVyIGFyY2hpdmUgdG8gUzMnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5T dGVwKCkKKworCiBjbGFzcyBUZXN0UnVuQVBJVGVzdHMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMs IHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CiAgICAgICAgIHNlbGYu bG9uZ01lc3NhZ2UgPSBUcnVlCg== 369998 2019-05-15 15:36:01 -0700 2019-05-15 15:43:57 -0700 Patch bug-197922-20190515183559.patch text/plain 6578 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NTM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA1LTE1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBUcmFuc2ZlciBhcmNo aXZlIHRvIFMzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTc5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAgICAgKFRyYW5z ZmVyVG9TMyk6CisgICAgICAgIChUcmFuc2ZlclRvUzMuZmluaXNoZWQpOiBJbnZva2UgdHJpZ2dl cnMgYWZ0ZXIgdHJhbnNmZXIgaXMgc3VjY2Vzc2Z1bC4KKyAgICAgICAgKFRyYW5zZmVyVG9TMy5n ZXRSZXN1bHRTdW1tYXJ5KTogQ3JlYXRlIG1vcmUgcmVhZGFibGUgZmFpbHVyZSBzdHJpbmcuCisg ICAgICAgIChVcGxvYWRCdWlsdFByb2R1Y3QuZmluaXNoZWQpOiBEZWxldGVkLiBNb3ZlZCB0aGUg dHJpZ2dlciBpbnZvY2F0aW9uIGFmdGVyIFRyYW5zZmVyVG9TMy4KKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVzdHMu CisKIDIwMTktMDUtMTUgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtld3MtYnVpbGRdIEVuYWJsaW5nIHVwbG9hZGluZyBFV1MgYXJjaGl2ZXMgdG8gUzMK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlz aW9uIDI0NTM2MCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQkod29ya2luZyBjb3B5KQpAQCAtNzY5LDE4ICs3NjksMzkgQEAgY2xhc3MgVXBsb2FkQnVpbHRQ cm9kdWN0KHRyYW5zZmVyLkZpbGVVcAogICAgICAgICBrd2FyZ3NbJ2Jsb2Nrc2l6ZSddID0gMTAy NCAqIDI1NgogICAgICAgICB0cmFuc2Zlci5GaWxlVXBsb2FkLl9faW5pdF9fKHNlbGYsICoqa3dh cmdzKQogCisgICAgZGVmIGdldFJlc3VsdFN1bW1hcnkoc2VsZik6CisgICAgICAgIGlmIHNlbGYu cmVzdWx0cyAhPSBTVUNDRVNTOgorICAgICAgICAgICAgcmV0dXJuIHt1J3N0ZXAnOiB1J0ZhaWxl ZCB0byB1cGxvYWQgYnVpbHQgcHJvZHVjdCd9CisgICAgICAgIHJldHVybiBzdXBlcihVcGxvYWRC dWlsdFByb2R1Y3QsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQorCisKK2NsYXNzIFRyYW5zZmVy VG9TMyhtYXN0ZXIuTWFzdGVyU2hlbGxDb21tYW5kKToKKyAgICBuYW1lID0gJ3RyYW5zZmVyLXRv LXMzJworICAgIGRlc2NyaXB0aW9uID0gWyd0cmFuc2ZlcnJpbmcgdG8gczMnXQorICAgIGRlc2Ny aXB0aW9uRG9uZSA9IFsnVHJhbnNmZXJyZWQgYXJjaGl2ZSB0byBTMyddCisgICAgYXJjaGl2ZSA9 IFdpdGhQcm9wZXJ0aWVzKCdwdWJsaWNfaHRtbC9hcmNoaXZlcy8lKGZ1bGxQbGF0Zm9ybSlzLSUo YXJjaGl0ZWN0dXJlKXMtJShjb25maWd1cmF0aW9uKXMvJShwYXRjaF9pZClzLnppcCcpCisgICAg aWRlbnRpZmllciA9IFdpdGhQcm9wZXJ0aWVzKCclKGZ1bGxQbGF0Zm9ybSlzLSUoYXJjaGl0ZWN0 dXJlKXMtJShjb25maWd1cmF0aW9uKXMnKQorICAgIHBhdGNoX2lkID0gV2l0aFByb3BlcnRpZXMo JyUocGF0Y2hfaWQpcycpCisgICAgY29tbWFuZCA9IFsncHl0aG9uJywgJy4uL1NoYXJlZC90cmFu c2Zlci1hcmNoaXZlLXRvLXMzJywgJy0tcGF0Y2hfaWQnLCBwYXRjaF9pZCwgJy0taWRlbnRpZmll cicsIGlkZW50aWZpZXIsICctLWFyY2hpdmUnLCBhcmNoaXZlXQorICAgIGhhbHRPbkZhaWx1cmUg PSBUcnVlCisgICAgZmx1bmtPbkZhaWx1cmUgPSBUcnVlCisKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgKiprd2FyZ3MpOgorICAgICAgICBrd2FyZ3NbJ2NvbW1hbmQnXSA9IHNlbGYuY29tbWFuZAor ICAgICAgICBtYXN0ZXIuTWFzdGVyU2hlbGxDb21tYW5kLl9faW5pdF9fKHNlbGYsIGxvZ0Vudmly b249RmFsc2UsICoqa3dhcmdzKQorCiAgICAgZGVmIGZpbmlzaGVkKHNlbGYsIHJlc3VsdHMpOgog ICAgICAgICBpZiByZXN1bHRzID09IFNVQ0NFU1M6CiAgICAgICAgICAgICB0cmlnZ2VycyA9IHNl bGYuZ2V0UHJvcGVydHkoJ3RyaWdnZXJzJywgTm9uZSkKICAgICAgICAgICAgIGlmIHRyaWdnZXJz OgogICAgICAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtU cmlnZ2VyKHNjaGVkdWxlck5hbWVzPXRyaWdnZXJzKV0pCiAKLSAgICAgICAgcmV0dXJuIHN1cGVy KFVwbG9hZEJ1aWx0UHJvZHVjdCwgc2VsZikuZmluaXNoZWQocmVzdWx0cykKKyAgICAgICAgcmV0 dXJuIHN1cGVyKFRyYW5zZmVyVG9TMywgc2VsZikuZmluaXNoZWQocmVzdWx0cykKIAogICAgIGRl ZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgogICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VD Q0VTUzoKLSAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgdG8gdXBsb2FkIGJ1 aWx0IHByb2R1Y3QnfQotICAgICAgICByZXR1cm4gc3VwZXIoVXBsb2FkQnVpbHRQcm9kdWN0LCBz ZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKyAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdG YWlsZWQgdG8gdHJhbnNmZXIgYXJjaGl2ZSB0byBTMyd9CisgICAgICAgIHJldHVybiBzdXBlcihU cmFuc2ZlclRvUzMsIHNlbGYpLmdldFJlc3VsdFN1bW1hcnkoKQogCiAKIGNsYXNzIERvd25sb2Fk QnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CkluZGV4OiBUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAy NDUzNjApCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRl c3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQwLDggKzQwLDggQEAgZnJvbSBzdGVwcyBpbXBvcnQg KEFuYWx5emVBUElUZXN0c1Jlc3VsdAogICAgICAgICAgICAgICAgICAgIERvd25sb2FkQnVpbHRQ cm9kdWN0LCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRyYWN0VGVzdFJlc3VsdHMsIEtpbGxPbGRQ cm9jZXNzZXMsCiAgICAgICAgICAgICAgICAgICAgUHJpbnRDb25maWd1cmF0aW9uLCBSZVJ1bkFQ SVRlc3RzLCBSZVJ1bkphdmFTY3JpcHRDb3JlVGVzdHMsIFJ1bkFQSVRlc3RzLCBSdW5BUElUZXN0 c1dpdGhvdXRQYXRjaCwKICAgICAgICAgICAgICAgICAgICBSdW5CaW5kaW5nc1Rlc3RzLCBSdW5K YXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5KYXZhU2NyaXB0Q29yZVRlc3RzVG9ULCBSdW5XZWJLaXQx VGVzdHMsIFJ1bldlYktpdFBlcmxUZXN0cywKLSAgICAgICAgICAgICAgICAgICBSdW5XZWJLaXRQ eVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgVGVzdFdpdGhGYWlsdXJlQ291bnQsIFRyaWdnZXIsIFVu QXBwbHlQYXRjaElmUmVxdWlyZWQsIFVwbG9hZEJ1aWx0UHJvZHVjdCwKLSAgICAgICAgICAgICAg ICAgICBVcGxvYWRUZXN0UmVzdWx0cywgVmFsaWRhdGVQYXRjaCkKKyAgICAgICAgICAgICAgICAg ICBSdW5XZWJLaXRQeVRlc3RzLCBSdW5XZWJLaXRUZXN0cywgVGVzdFdpdGhGYWlsdXJlQ291bnQs IFRyaWdnZXIsIFRyYW5zZmVyVG9TMywgVW5BcHBseVBhdGNoSWZSZXF1aXJlZCwKKyAgICAgICAg ICAgICAgICAgICBVcGxvYWRCdWlsdFByb2R1Y3QsIFVwbG9hZFRlc3RSZXN1bHRzLCBWYWxpZGF0 ZVBhdGNoKQogCiAjIFdvcmthcm91bmQgZm9yIGh0dHBzOi8vZ2l0aHViLmNvbS9idWlsZGJvdC9i dWlsZGJvdC9pc3N1ZXMvNDY2OQogZnJvbSBidWlsZGJvdC50ZXN0LmZha2UuZmFrZWJ1aWxkIGlt cG9ydCBGYWtlQnVpbGQKQEAgLTEwNzUsNiArMTA3NSw1MSBAQCBjbGFzcyBUZXN0RXh0cmFjdEJ1 aWx0UHJvZHVjdChCdWlsZFN0ZXBNCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQogCiAK K2NsYXNzIFRlc3RUcmFuc2ZlclRvUzMoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0 LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYubG9uZ01lc3Nh Z2UgPSBUcnVlCisgICAgICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkKKworICAgIGRl ZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25CdWlsZFN0ZXAo KQorCisgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2VsZi5zZXR1cFN0ZXAo VHJhbnNmZXJUb1MzKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScs ICdtYWMtaGlnaHNpZXJyYScpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2NvbmZpZ3VyYXRp b24nLCAncmVsZWFzZScpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2FyY2hpdGVjdHVyZScs ICd4ODZfNjQnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaF9pZCcsICcxMjM0JykK KyAgICAgICAgc2VsZi5leHBlY3RMb2NhbENvbW1hbmRzKAorICAgICAgICAgICAgRXhwZWN0TWFz dGVyU2hlbGxDb21tYW5kKGNvbW1hbmQ9WydweXRob24nLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICcuLi9TaGFyZWQvdHJhbnNmZXItYXJjaGl2ZS10by1z MycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0tcGF0 Y2hfaWQnLCAnMTIzNCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJy0taWRlbnRpZmllcicsICdtYWMtaGlnaHNpZXJyYS14ODZfNjQtcmVsZWFzZScsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy0tYXJjaGl2ZScs ICdwdWJsaWNfaHRtbC9hcmNoaXZlcy9tYWMtaGlnaHNpZXJyYS14ODZfNjQtcmVsZWFzZS8xMjM0 LnppcCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdKQor ICAgICAgICAgICAgKyAwLAorICAgICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShy ZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdUcmFuc2ZlcnJlZCBhcmNoaXZlIHRvIFMzJykK KyAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisKKyAgICBkZWYgdGVzdF9mYWlsdXJlKHNl bGYpOgorICAgICAgICBzZWxmLnNldHVwU3RlcChUcmFuc2ZlclRvUzMoKSkKKyAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJywgJ2lvcy1zaW11bGF0b3ItMTInKQorICAgICAg ICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ2RlYnVnJykKKyAgICAgICAgc2Vs Zi5zZXRQcm9wZXJ0eSgnYXJjaGl0ZWN0dXJlJywgJ3g4Nl82NCcpCisgICAgICAgIHNlbGYuc2V0 UHJvcGVydHkoJ3BhdGNoX2lkJywgJzEyMzQnKQorICAgICAgICBzZWxmLmV4cGVjdExvY2FsQ29t bWFuZHMoCisgICAgICAgICAgICBFeHBlY3RNYXN0ZXJTaGVsbENvbW1hbmQoY29tbWFuZD1bJ3B5 dGhvbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJy4u L1NoYXJlZC90cmFuc2Zlci1hcmNoaXZlLXRvLXMzJywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnLS1wYXRjaF9pZCcsICcxMjM0JywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1pZGVudGlmaWVyJywgJ2lvcy1z aW11bGF0b3ItMTIteDg2XzY0LWRlYnVnJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnLS1hcmNoaXZlJywgJ3B1YmxpY19odG1sL2FyY2hpdmVzL2lvcy1z aW11bGF0b3ItMTIteDg2XzY0LWRlYnVnLzEyMzQuemlwJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF0pCisgICAgICAgICAgICArIDIsCisgICAgICAgICkK KyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlMVVJFLCBzdGF0ZV9zdHJpbmc9 J0ZhaWxlZCB0byB0cmFuc2ZlciBhcmNoaXZlIHRvIFMzJykKKyAgICAgICAgcmV0dXJuIHNlbGYu cnVuU3RlcCgpCisKKwogY2xhc3MgVGVzdFJ1bkFQSVRlc3RzKEJ1aWxkU3RlcE1peGluQWRkaXRp b25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHNldFVwKHNlbGYpOgogICAgICAgICBz ZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQo= 370000 2019-05-15 15:44:00 -0700 2019-05-17 07:32:20 -0700 Patch bug-197922-20190515184358.patch text/plain 7080 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0NTM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA1LTE1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBUcmFuc2ZlciBhcmNo aXZlIHRvIFMzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTc5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weToKKyAgICAgICAgKFRyYW5z ZmVyVG9TMyk6CisgICAgICAgIChUcmFuc2ZlclRvUzMuZmluaXNoZWQpOiBJbnZva2UgdHJpZ2dl cnMgYWZ0ZXIgdHJhbnNmZXIgaXMgc3VjY2Vzc2Z1bC4KKyAgICAgICAgKFRyYW5zZmVyVG9TMy5n ZXRSZXN1bHRTdW1tYXJ5KTogQ3JlYXRlIG1vcmUgcmVhZGFibGUgZmFpbHVyZSBzdHJpbmcuCisg ICAgICAgIChVcGxvYWRCdWlsdFByb2R1Y3QuZmluaXNoZWQpOiBEZWxldGVkLiBNb3ZlZCB0aGUg dHJpZ2dlciBpbnZvY2F0aW9uIGFmdGVyIFRyYW5zZmVyVG9TMy4KKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6IEFkZGVkIHVuaXQtdGVzdHMu CisKIDIwMTktMDUtMTUgIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtld3MtYnVpbGRdIEVuYWJsaW5nIHVwbG9hZGluZyBFV1MgYXJjaGl2ZXMgdG8gUzMK SW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkJKHJldmlz aW9uIDI0NTM2MCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQkod29ya2luZyBjb3B5KQpAQCAtNjE1LDcgKzYxNSw3IEBAIGNsYXNzIENvbXBpbGVXZWJLaXQo c2hlbGwuQ29tcGlsZSk6CiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdwYXRjaEZhaWxl ZFRvQnVpbGQnLCBUcnVlKQogICAgICAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVwc0FmdGVyQ3Vy cmVudFN0ZXAoW1VuQXBwbHlQYXRjaElmUmVxdWlyZWQoKSwgQ29tcGlsZVdlYktpdFRvVCgpXSkK ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJl bnRTdGVwKFtBcmNoaXZlQnVpbHRQcm9kdWN0KCksIFVwbG9hZEJ1aWx0UHJvZHVjdCgpXSkKKyAg ICAgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRTdGVwKFtBcmNoaXZlQnVp bHRQcm9kdWN0KCksIFVwbG9hZEJ1aWx0UHJvZHVjdCgpLCBUcmFuc2ZlclRvUzMoKV0pCiAKICAg ICAgICAgcmV0dXJuIHN1cGVyKENvbXBpbGVXZWJLaXQsIHNlbGYpLmV2YWx1YXRlQ29tbWFuZChj bWQpCiAKQEAgLTc2OSwxOCArNzY5LDM5IEBAIGNsYXNzIFVwbG9hZEJ1aWx0UHJvZHVjdCh0cmFu c2Zlci5GaWxlVXAKICAgICAgICAga3dhcmdzWydibG9ja3NpemUnXSA9IDEwMjQgKiAyNTYKICAg ICAgICAgdHJhbnNmZXIuRmlsZVVwbG9hZC5fX2luaXRfXyhzZWxmLCAqKmt3YXJncykKIAorICAg IGRlZiBnZXRSZXN1bHRTdW1tYXJ5KHNlbGYpOgorICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0g U1VDQ0VTUzoKKyAgICAgICAgICAgIHJldHVybiB7dSdzdGVwJzogdSdGYWlsZWQgdG8gdXBsb2Fk IGJ1aWx0IHByb2R1Y3QnfQorICAgICAgICByZXR1cm4gc3VwZXIoVXBsb2FkQnVpbHRQcm9kdWN0 LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKKworCitjbGFzcyBUcmFuc2ZlclRvUzMobWFzdGVy Lk1hc3RlclNoZWxsQ29tbWFuZCk6CisgICAgbmFtZSA9ICd0cmFuc2Zlci10by1zMycKKyAgICBk ZXNjcmlwdGlvbiA9IFsndHJhbnNmZXJyaW5nIHRvIHMzJ10KKyAgICBkZXNjcmlwdGlvbkRvbmUg PSBbJ1RyYW5zZmVycmVkIGFyY2hpdmUgdG8gUzMnXQorICAgIGFyY2hpdmUgPSBXaXRoUHJvcGVy dGllcygncHVibGljX2h0bWwvYXJjaGl2ZXMvJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVy ZSlzLSUoY29uZmlndXJhdGlvbilzLyUocGF0Y2hfaWQpcy56aXAnKQorICAgIGlkZW50aWZpZXIg PSBXaXRoUHJvcGVydGllcygnJShmdWxsUGxhdGZvcm0pcy0lKGFyY2hpdGVjdHVyZSlzLSUoY29u ZmlndXJhdGlvbilzJykKKyAgICBwYXRjaF9pZCA9IFdpdGhQcm9wZXJ0aWVzKCclKHBhdGNoX2lk KXMnKQorICAgIGNvbW1hbmQgPSBbJ3B5dGhvbicsICcuLi9TaGFyZWQvdHJhbnNmZXItYXJjaGl2 ZS10by1zMycsICctLXBhdGNoX2lkJywgcGF0Y2hfaWQsICctLWlkZW50aWZpZXInLCBpZGVudGlm aWVyLCAnLS1hcmNoaXZlJywgYXJjaGl2ZV0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorICAg IGZsdW5rT25GYWlsdXJlID0gVHJ1ZQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdz KToKKyAgICAgICAga3dhcmdzWydjb21tYW5kJ10gPSBzZWxmLmNvbW1hbmQKKyAgICAgICAgbWFz dGVyLk1hc3RlclNoZWxsQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBsb2dFbnZpcm9uPUZhbHNlLCAq Kmt3YXJncykKKwogICAgIGRlZiBmaW5pc2hlZChzZWxmLCByZXN1bHRzKToKICAgICAgICAgaWYg cmVzdWx0cyA9PSBTVUNDRVNTOgogICAgICAgICAgICAgdHJpZ2dlcnMgPSBzZWxmLmdldFByb3Bl cnR5KCd0cmlnZ2VycycsIE5vbmUpCiAgICAgICAgICAgICBpZiB0cmlnZ2VyczoKICAgICAgICAg ICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJyZW50U3RlcChbVHJpZ2dlcihzY2hl ZHVsZXJOYW1lcz10cmlnZ2VycyldKQogCi0gICAgICAgIHJldHVybiBzdXBlcihVcGxvYWRCdWls dFByb2R1Y3QsIHNlbGYpLmZpbmlzaGVkKHJlc3VsdHMpCisgICAgICAgIHJldHVybiBzdXBlcihU cmFuc2ZlclRvUzMsIHNlbGYpLmZpbmlzaGVkKHJlc3VsdHMpCiAKICAgICBkZWYgZ2V0UmVzdWx0 U3VtbWFyeShzZWxmKToKICAgICAgICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6Ci0gICAg ICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnRmFpbGVkIHRvIHVwbG9hZCBidWlsdCBwcm9kdWN0 J30KLSAgICAgICAgcmV0dXJuIHN1cGVyKFVwbG9hZEJ1aWx0UHJvZHVjdCwgc2VsZikuZ2V0UmVz dWx0U3VtbWFyeSgpCisgICAgICAgICAgICByZXR1cm4ge3Unc3RlcCc6IHUnRmFpbGVkIHRvIHRy YW5zZmVyIGFyY2hpdmUgdG8gUzMnfQorICAgICAgICByZXR1cm4gc3VwZXIoVHJhbnNmZXJUb1Mz LCBzZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogCiBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVj dChzaGVsbC5TaGVsbENvbW1hbmQpOgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjQ1MzYwKQorKysg VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC00MCw4ICs0MCw4IEBAIGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJ VGVzdHNSZXN1bHQKICAgICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRXh0 cmFjdEJ1aWx0UHJvZHVjdCwgRXh0cmFjdFRlc3RSZXN1bHRzLCBLaWxsT2xkUHJvY2Vzc2VzLAog ICAgICAgICAgICAgICAgICAgIFByaW50Q29uZmlndXJhdGlvbiwgUmVSdW5BUElUZXN0cywgUmVS dW5KYXZhU2NyaXB0Q29yZVRlc3RzLCBSdW5BUElUZXN0cywgUnVuQVBJVGVzdHNXaXRob3V0UGF0 Y2gsCiAgICAgICAgICAgICAgICAgICAgUnVuQmluZGluZ3NUZXN0cywgUnVuSmF2YVNjcmlwdENv cmVUZXN0cywgUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCwgUnVuV2ViS2l0MVRlc3RzLCBSdW5X ZWJLaXRQZXJsVGVzdHMsCi0gICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0UHlUZXN0cywgUnVu V2ViS2l0VGVzdHMsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBVbkFwcGx5UGF0Y2hJ ZlJlcXVpcmVkLCBVcGxvYWRCdWlsdFByb2R1Y3QsCi0gICAgICAgICAgICAgICAgICAgVXBsb2Fk VGVzdFJlc3VsdHMsIFZhbGlkYXRlUGF0Y2gpCisgICAgICAgICAgICAgICAgICAgUnVuV2ViS2l0 UHlUZXN0cywgUnVuV2ViS2l0VGVzdHMsIFRlc3RXaXRoRmFpbHVyZUNvdW50LCBUcmlnZ2VyLCBU cmFuc2ZlclRvUzMsIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQsCisgICAgICAgICAgICAgICAgICAg VXBsb2FkQnVpbHRQcm9kdWN0LCBVcGxvYWRUZXN0UmVzdWx0cywgVmFsaWRhdGVQYXRjaCkKIAog IyBXb3JrYXJvdW5kIGZvciBodHRwczovL2dpdGh1Yi5jb20vYnVpbGRib3QvYnVpbGRib3QvaXNz dWVzLzQ2NjkKIGZyb20gYnVpbGRib3QudGVzdC5mYWtlLmZha2VidWlsZCBpbXBvcnQgRmFrZUJ1 aWxkCkBAIC0xMDc1LDYgKzEwNzUsNTEgQEAgY2xhc3MgVGVzdEV4dHJhY3RCdWlsdFByb2R1Y3Qo QnVpbGRTdGVwTQogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKIAogCitjbGFzcyBUZXN0 VHJhbnNmZXJUb1MzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6 CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQor ICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisKKyAgICBkZWYgdGVhckRvd24o c2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVpbGRTdGVwKCkKKworICAgIGRl ZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKFRyYW5zZmVyVG9T MygpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nLCAnbWFjLWhpZ2hz aWVycmEnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVh c2UnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdhcmNoaXRlY3R1cmUnLCAneDg2XzY0JykK KyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0Y2hfaWQnLCAnMTIzNCcpCisgICAgICAgIHNl bGYuZXhwZWN0TG9jYWxDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdE1hc3RlclNoZWxsQ29t bWFuZChjb21tYW5kPVsncHl0aG9uJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnLi4vU2hhcmVkL3RyYW5zZmVyLWFyY2hpdmUtdG8tczMnLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLXBhdGNoX2lkJywgJzEy MzQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWlk ZW50aWZpZXInLCAnbWFjLWhpZ2hzaWVycmEteDg2XzY0LXJlbGVhc2UnLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICctLWFyY2hpdmUnLCAncHVibGljX2h0 bWwvYXJjaGl2ZXMvbWFjLWhpZ2hzaWVycmEteDg2XzY0LXJlbGVhc2UvMTIzNC56aXAnLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXSkKKyAgICAgICAgICAg ICsgMCwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NF U1MsIHN0YXRlX3N0cmluZz0nVHJhbnNmZXJyZWQgYXJjaGl2ZSB0byBTMycpCisgICAgICAgIHJl dHVybiBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKKyAgICAg ICAgc2VsZi5zZXR1cFN0ZXAoVHJhbnNmZXJUb1MzKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ2Z1bGxQbGF0Zm9ybScsICdpb3Mtc2ltdWxhdG9yLTEyJykKKyAgICAgICAgc2VsZi5zZXRQ cm9wZXJ0eSgnY29uZmlndXJhdGlvbicsICdkZWJ1ZycpCisgICAgICAgIHNlbGYuc2V0UHJvcGVy dHkoJ2FyY2hpdGVjdHVyZScsICd4ODZfNjQnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdw YXRjaF9pZCcsICcxMjM0JykKKyAgICAgICAgc2VsZi5leHBlY3RMb2NhbENvbW1hbmRzKAorICAg ICAgICAgICAgRXhwZWN0TWFzdGVyU2hlbGxDb21tYW5kKGNvbW1hbmQ9WydweXRob24nLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcuLi9TaGFyZWQvdHJh bnNmZXItYXJjaGl2ZS10by1zMycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJy0tcGF0Y2hfaWQnLCAnMTIzNCcsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJy0taWRlbnRpZmllcicsICdpb3Mtc2ltdWxhdG9yLTEy LXg4Nl82NC1kZWJ1ZycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJy0tYXJjaGl2ZScsICdwdWJsaWNfaHRtbC9hcmNoaXZlcy9pb3Mtc2ltdWxhdG9yLTEy LXg4Nl82NC1kZWJ1Zy8xMjM0LnppcCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBdKQorICAgICAgICAgICAgKyAyLAorICAgICAgICApCisgICAgICAgIHNl bGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVfc3RyaW5nPSdGYWlsZWQgdG8g dHJhbnNmZXIgYXJjaGl2ZSB0byBTMycpCisgICAgICAgIHJldHVybiBzZWxmLnJ1blN0ZXAoKQor CisKIGNsYXNzIFRlc3RSdW5BUElUZXN0cyhCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRl c3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAgICAgc2VsZi5sb25nTWVz c2FnZSA9IFRydWUK