224444 2021-04-12 12:07:03 -0700 Make Commit Queue robust by adding few git commands to clean up repository 2021-04-12 17:49:12 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1749314 0 aakash_jain 2021-04-12 12:07:03 -0700 Make Commit Queue robust against various issues by adding few git commands to clean up repository. 1749317 1 425772 aakash_jain 2021-04-12 12:15:26 -0700 Created attachment 425772 Patch 1749318 2 aakash_jain 2021-04-12 12:15:58 -0700 Sample run (for this step): https://ews-build.webkit-uat.org/#/builders/26/builds/1731 1749343 3 425772 jbedard 2021-04-12 13:05:40 -0700 Comment on attachment 425772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=425772&action=review > Tools/CISupport/ews-build/steps.py:3141 > + ['git', 'checkout', 'origin/main', '-b', 'main']] What lead to this sequence of commands? The -D (delete local branch), in particular, seems suspect 1749387 4 ap 2021-04-12 14:30:19 -0700 See Tools/EWSTools/start-queue-mac.sh: # This somewhat quirky sequence of steps seems to clear up all the broken # git situations we've gotten ourself into in the past. git clean -f # Remove any left-over layout test results, added files, etc. git rebase --abort # If we got killed during a git rebase, we need to clean up. git fetch origin # Avoid updating the working copy to a stale revision. git checkout origin/master -f git branch -D master git checkout origin/master -b master We should have a similar comment, or maybe even have comments in both places saying that we want to keep these in sync. 1749440 5 425808 aakash_jain 2021-04-12 16:28:05 -0700 Created attachment 425808 [fast-cq] Patch 1749445 6 aakash_jain 2021-04-12 16:34:02 -0700 (In reply to Alexey Proskuryakov from comment #4) > We should have a similar comment, or maybe even have comments in both places saying that we want to keep these in sync. Added similar comment in updated patch. Deleting the old EWS scripts in Bug 224460. Also removed 'git rebase --abort' command since buildbot doesn't perform rebase anywhere, and we also do not perform rebase in our buildbot configuration. 1749446 7 aakash_jain 2021-04-12 16:37:30 -0700 Sample run: https://ews-build.webkit-uat.org/#/builders/26/builds/1735 1749485 8 ews-feeder 2021-04-12 17:48:24 -0700 Committed r275853 (236418@main): <https://commits.webkit.org/236418@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425808. 1749486 9 webkit-bug-importer 2021-04-12 17:49:12 -0700 <rdar://problem/76567390> 425772 2021-04-12 12:15:26 -0700 2021-04-12 16:28:03 -0700 Patch bug-224444-20210412151525.patch text/plain 9375 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTgzMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA0LTEyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlIENvbW1pdCBRdWV1ZSByb2J1c3QgYnkgYWRkaW5nIGZldyBnaXQg Y29tbWFuZHMgdG8gY2xlYW4gdXAgcmVwb3NpdG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoQ2xlYW5HaXRSZXBvKTogQnVpbGQgc3RlcCB0byBydW4gZmV3IGNvbW1hbmRzIHRv IGNsZWFudXAgZ2l0IHJlcG9zaXRvcnkuCisgICAgICAgIChDbGVhbkdpdFJlcG8ucnVuKToKKyAg ICAgICAgKENsZWFuR2l0UmVwby5nZXRSZXN1bHRTdW1tYXJ5KTogQ3VzdG9tIGZhaWx1cmUgbWVz c2FnZS4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBB ZGRlZCB1bml0LXRlc3RzLgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVz LnB5OgorICAgICAgICAoQ29tbWl0UXVldWVGYWN0b3J5Ll9faW5pdF9fKToKKyAgICAgICAgKiBD SVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RD b21taXRRdWV1ZUZhY3RvcnkudGVzdF9jb21taXRfcXVldWVfZmFjdG9yeSk6IFVwZGF0ZWQgdW5p dC10ZXN0LgorCiAyMDIxLTA0LTExICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0 Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTgwMS4KSW5kZXg6IFRv b2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0NJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNzU4MzIpCisrKyBU b29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAt MjUsNyArMjUsNyBAQCBmcm9tIGJ1aWxkYm90LnByb2Nlc3MgaW1wb3J0IGZhY3RvcnkKIGZyb20g YnVpbGRib3Quc3RlcHMgaW1wb3J0IHRyaWdnZXIKIAogZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5 UGF0Y2gsIEFwcGx5V2F0Y2hMaXN0LCBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1Jl dmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLAotICAgICAgICAgICAgICAgICAgIENoZWNrUGF0 Y2hTdGF0dXNPbkVXU1F1ZXVlcywgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktp dCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2FsR0lUQ29tbWl0LAorICAgICAgICAgICAgICAg ICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcywgQ2hlY2tTdHlsZSwgQ2xlYW5HaXRSZXBv LCBDb21waWxlSlNDLCBDb21waWxlV2ViS2l0LCBDb25maWd1cmVCdWlsZCwgQ3JlYXRlTG9jYWxH SVRDb21taXQsCiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIEV4dHJh Y3RCdWlsdFByb2R1Y3QsIEZldGNoQnJhbmNoZXMsIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEZp bmRNb2RpZmllZExheW91dFRlc3RzLAogICAgICAgICAgICAgICAgICAgIEluc3RhbGxHdGtEZXBl bmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50 Q29uZmlndXJhdGlvbiwgUHVzaENvbW1pdFRvV2ViS2l0UmVwbywKICAgICAgICAgICAgICAgICAg ICBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NUZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVz dHMsIFJ1bkJ1aWxkYm90Q2hlY2tDb25maWdGb3JCdWlsZFdlYktpdCwgUnVuQnVpbGRib3RDaGVj a0NvbmZpZ0ZvckVXUywKQEAgLTI4Miw2ICsyODIsNyBAQCBjbGFzcyBDb21taXRRdWV1ZUZhY3Rv cnkoZmFjdG9yeS5CdWlsZEZhCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZUNvbW1pdGVy QW5kUmV2aWV3ZXIoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFByaW50Q29uZmlndXJhdGlvbigp KQogICAgICAgICBzZWxmLmFkZFN0ZXAoQ2hlY2tPdXRTb3VyY2UoKSkKKyAgICAgICAgc2VsZi5h ZGRTdGVwKENsZWFuR2l0UmVwbygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRmV0Y2hCcmFuY2hl cygpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoU2hvd0lkZW50aWZpZXIoKSkKICAgICAgICAgc2Vs Zi5hZGRTdGVwKFVwZGF0ZVdvcmtpbmdEaXJlY3RvcnkoKSkKSW5kZXg6IFRvb2xzL0NJU3VwcG9y dC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NJ U3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzU4MzIp CisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weQkod29y a2luZyBjb3B5KQpAQCAtNDEyLDYgKzQxMiw3IEBAIGNsYXNzIFRlc3RDb21taXRRdWV1ZUZhY3Rv cnkoVGVzdENhc2UpOgogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuVmFsaWRh dGVDb21taXRlckFuZFJldmlld2VyKSwKICAgICAgICAgICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0 ZXBzLlByaW50Q29uZmlndXJhdGlvbiksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShz dGVwcy5DaGVja091dFNvdXJjZSksCisgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5DbGVhbkdpdFJlcG8pLAogICAgICAgICAgICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuRmV0 Y2hCcmFuY2hlcyksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5TaG93SWRl bnRpZmllciksCiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVwcy5VcGRhdGVXb3Jr aW5nRGlyZWN0b3J5KSwKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNp b24gMjc1ODMyKQorKysgVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkod29ya2lu ZyBjb3B5KQpAQCAtMzEyOCw2ICszMTI4LDMwIEBAIGNsYXNzIFByaW50Q29uZmlndXJhdGlvbihz dGVwcy5TaGVsbFNlcXUKICAgICAgICAgcmV0dXJuIHsnc3RlcCc6IGNvbmZpZ3VyYXRpb259CiAK IAorY2xhc3MgQ2xlYW5HaXRSZXBvKHN0ZXBzLlNoZWxsU2VxdWVuY2UpOgorICAgIG5hbWUgPSAn Y2xlYW4tdXAtZ2l0LXJlcG8nCisgICAgaGFsdE9uRmFpbHVyZSA9IEZhbHNlCisgICAgZmx1bmtP bkZhaWx1cmUgPSBGYWxzZQorICAgIGxvZ0Vudmlyb24gPSBGYWxzZQorICAgIGNvbW1hbmRfbGlz dCA9IFtbJ2dpdCcsICdjbGVhbicsICctZiddLAorICAgICAgICAgICAgICAgICAgICBbJ2dpdCcs ICdyZWJhc2UnLCAnLS1hYm9ydCddLAorICAgICAgICAgICAgICAgICAgICBbJ2dpdCcsICdmZXRj aCcsICdvcmlnaW4nXSwKKyAgICAgICAgICAgICAgICAgICAgWydnaXQnLCAnY2hlY2tvdXQnLCAn b3JpZ2luL21haW4nLCAnLWYnXSwKKyAgICAgICAgICAgICAgICAgICAgWydnaXQnLCAnYnJhbmNo JywgJy1EJywgJ21haW4nXSwKKyAgICAgICAgICAgICAgICAgICAgWydnaXQnLCAnY2hlY2tvdXQn LCAnb3JpZ2luL21haW4nLCAnLWInLCAnbWFpbiddXQorCisgICAgZGVmIHJ1bihzZWxmKToKKyAg ICAgICAgc2VsZi5jb21tYW5kcyA9IFtdCisgICAgICAgIGZvciBjb21tYW5kIGluIHNlbGYuY29t bWFuZF9saXN0OgorICAgICAgICAgICAgc2VsZi5jb21tYW5kcy5hcHBlbmQodXRpbC5TaGVsbEFy Zyhjb21tYW5kPWNvbW1hbmQsIGxvZ25hbWU9J3N0ZGlvJykpCisgICAgICAgIHJldHVybiBzdXBl cihDbGVhbkdpdFJlcG8sIHNlbGYpLnJ1bigpCisKKyAgICBkZWYgZ2V0UmVzdWx0U3VtbWFyeShz ZWxmKToKKyAgICAgICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6CisgICAgICAgICAgICBy ZXR1cm4geydzdGVwJzogJ0VuY291bnRlcmVkIHNvbWUgaXNzdWVzIGR1cmluZyBjbGVhbnVwJ30K KyAgICAgICAgcmV0dXJuIHsnc3RlcCc6ICdDbGVhbmVkIHVwIGdpdCByZXBvc2l0b3J5J30KKwor CiBjbGFzcyBBcHBseVdhdGNoTGlzdChzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIG5hbWUgPSAn YXBwbHktd2F0Y2gtbGlzdCcKICAgICBkZXNjcmlwdGlvbiA9IFsnYXBwbHlpbmcgd2F0Y2hpbGlz dCddCkluZGV4OiBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI3NTgzMikKKysrIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQzLDggKzQzLDggQEAgZnJvbSB0d2lzdGVkLnRy aWFsIGltcG9ydCB1bml0dGVzdAogZnJvbSBzdGVwcyBpbXBvcnQgKEFuYWx5emVBUElUZXN0c1Jl c3VsdHMsIEFuYWx5emVDb21waWxlV2ViS2l0UmVzdWx0cywgQW5hbHl6ZUpTQ1Rlc3RzUmVzdWx0 cywKICAgICAgICAgICAgICAgICAgICBBbmFseXplTGF5b3V0VGVzdHNSZXN1bHRzLCBBcHBseVBh dGNoLCBBcHBseVdhdGNoTGlzdCwgQXJjaGl2ZUJ1aWx0UHJvZHVjdCwgQXJjaGl2ZVRlc3RSZXN1 bHRzLAogICAgICAgICAgICAgICAgICAgIENoZWNrT3V0U291cmNlLCBDaGVja091dFNwZWNpZmlj UmV2aXNpb24sIENoZWNrUGF0Y2hSZWxldmFuY2UsIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVl cywgQ2hlY2tTdHlsZSwKLSAgICAgICAgICAgICAgICAgICBDbGVhbkJ1aWxkLCBDbGVhblVwR2l0 SW5kZXhMb2NrLCBDbGVhbldvcmtpbmdEaXJlY3RvcnksIENvbXBpbGVKU0MsIENvbXBpbGVKU0NX aXRob3V0UGF0Y2gsIENvbXBpbGVXZWJLaXQsCi0gICAgICAgICAgICAgICAgICAgQ29tcGlsZVdl YktpdFdpdGhvdXRQYXRjaCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2FsR0lUQ29tbWl0LAor ICAgICAgICAgICAgICAgICAgIENsZWFuQnVpbGQsIENsZWFuVXBHaXRJbmRleExvY2ssIENsZWFu R2l0UmVwbywgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LCBDb21waWxlSlNDLCBDb21waWxlSlNDV2l0 aG91dFBhdGNoLAorICAgICAgICAgICAgICAgICAgIENvbXBpbGVXZWJLaXQsIENvbXBpbGVXZWJL aXRXaXRob3V0UGF0Y2gsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVMb2NhbEdJVENvbW1pdCwKICAg ICAgICAgICAgICAgICAgICBEb3dubG9hZEJ1aWx0UHJvZHVjdCwgRG93bmxvYWRCdWlsdFByb2R1 Y3RGcm9tTWFzdGVyLCBFV1NfQlVJTERfSE9TVE5BTUUsIEV4dHJhY3RCdWlsdFByb2R1Y3QsIEV4 dHJhY3RUZXN0UmVzdWx0cywKICAgICAgICAgICAgICAgICAgICBGZXRjaEJyYW5jaGVzLCBGaW5k TW9kaWZpZWRDaGFuZ2VMb2dzLCBGaW5kTW9kaWZpZWRMYXlvdXRUZXN0cywgR2l0UmVzZXRIYXJk LCBJbnN0YWxsR3RrRGVwZW5kZW5jaWVzLCBJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLAogICAgICAg ICAgICAgICAgICAgIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50Q29uZmlndXJhdGlvbiwgUHVzaENv bW1pdFRvV2ViS2l0UmVwbywgUmVSdW5BUElUZXN0cywgUmVSdW5KYXZhU2NyaXB0Q29yZVRlc3Rz LCBSZVJ1bldlYktpdFBlcmxUZXN0cywKQEAgLTM4ODksNiArMzg4OSw1NyBAQCBPU0Vycm9yOiBb RXJybm8gMl0gTm8gc3VjaCBmaWxlIG9yIGRpcmVjCiAgICAgICAgIHJldHVybiBzZWxmLnJ1blN0 ZXAoKQogCiAKK2NsYXNzIFRlc3RDbGVhbkdpdFJlcG8oQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMs IHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYu bG9uZ01lc3NhZ2UgPSBUcnVlCisgICAgICAgIHJldHVybiBzZWxmLnNldFVwQnVpbGRTdGVwKCkK KworICAgIGRlZiB0ZWFyRG93bihzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYudGVhckRvd25C dWlsZFN0ZXAoKQorCisgICAgZGVmIHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2VsZi5z ZXR1cFN0ZXAoQ2xlYW5HaXRSZXBvKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHkoJ2J1aWxk ZXJuYW1lJywgJ0NvbW1pdC1RdWV1ZScpCisKKyAgICAgICAgc2VsZi5leHBlY3RSZW1vdGVDb21t YW5kcygKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnY2xlYW4nLCAn LWYnXSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFsc2UpICsg MAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScnKSwKKyAg ICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAncmViYXNlJywgJy0tYWJvcnQn XSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFsc2UpICsgMAor ICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScnKSwKKyAgICAg ICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnZmV0Y2gnLCAnb3JpZ2luJ10sIHdv cmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDAKKyAgICAg ICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJyksCisgICAgICAgICAg ICBFeHBlY3RTaGVsbChjb21tYW5kPVsnZ2l0JywgJ2NoZWNrb3V0JywgJ29yaWdpbi9tYWluJywg Jy1mJ10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSAr IDAKKyAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJyksCisg ICAgICAgICAgICBFeHBlY3RTaGVsbChjb21tYW5kPVsnZ2l0JywgJ2JyYW5jaCcsICctRCcsICdt YWluJ10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSAr IDAKKyAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nRGVsZXRl ZCBicmFuY2ggbWFpbiAod2FzIDU3MDE1OTY3ZmVmOSkuJyksCisgICAgICAgICAgICBFeHBlY3RT aGVsbChjb21tYW5kPVsnZ2l0JywgJ2NoZWNrb3V0JywgJ29yaWdpbi9tYWluJywgJy1iJywgJ21h aW4nXSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFsc2UpICsg MAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSJTd2l0Y2hl ZCB0byBhIG5ldyBicmFuY2ggJ21haW4nIiksCisgICAgICAgICkKKyAgICAgICAgc2VsZi5leHBl Y3RPdXRjb21lKHJlc3VsdD1TVUNDRVNTLCBzdGF0ZV9zdHJpbmc9J0NsZWFuZWQgdXAgZ2l0IHJl cG9zaXRvcnknKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKworICAgIGRlZiB0ZXN0 X2ZhaWx1cmUoc2VsZik6CisgICAgICAgIHNlbGYuc2V0dXBTdGVwKENsZWFuR2l0UmVwbygpKQor ICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWlsZGVybmFtZScsICdDb21taXQtUXVldWUnKQor CisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCisgICAgICAgICAgICBFeHBlY3RT aGVsbChjb21tYW5kPVsnZ2l0JywgJ2NsZWFuJywgJy1mJ10sIHdvcmtkaXI9J3drZGlyJywgdGlt ZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDAKKyAgICAgICAgICAgICsgRXhwZWN0U2hl bGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJyksCisgICAgICAgICAgICBFeHBlY3RTaGVsbChjb21t YW5kPVsnZ2l0JywgJ3JlYmFzZScsICctLWFib3J0J10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91 dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDEyOAorICAgICAgICAgICAgKyBFeHBlY3RTaGVs bC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdmYXRhbDogTm8gcmViYXNlIGluIHByb2dyZXNzPycpLAor ICAgICAgICAgICAgRXhwZWN0U2hlbGwoY29tbWFuZD1bJ2dpdCcsICdmZXRjaCcsICdvcmlnaW4n XSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFsc2UpICsgMAor ICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScnKSwKKyAgICAg ICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnY2hlY2tvdXQnLCAnb3JpZ2luL21h aW4nLCAnLWYnXSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFs c2UpICsgMAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScn KSwKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnYnJhbmNoJywgJy1E JywgJ21haW4nXSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFs c2UpICsgMAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdE ZWxldGVkIGJyYW5jaCBtYWluICh3YXMgNTcwMTU5NjdmZWY5KS4nKSwKKyAgICAgICAgICAgIEV4 cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnY2hlY2tvdXQnLCAnb3JpZ2luL21haW4nLCAnLWIn LCAnbWFpbiddLCB3b3JrZGlyPSd3a2RpcicsIHRpbWVvdXQ9MTIwMCwgbG9nRW52aXJvbj1GYWxz ZSkgKyAwCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9IlN3 aXRjaGVkIHRvIGEgbmV3IGJyYW5jaCAnbWFpbiciKSwKKyAgICAgICAgKQorICAgICAgICBzZWxm LmV4cGVjdE91dGNvbWUocmVzdWx0PUZBSUxVUkUsIHN0YXRlX3N0cmluZz0nRW5jb3VudGVyZWQg c29tZSBpc3N1ZXMgZHVyaW5nIGNsZWFudXAnKQorICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVw KCkKKworCiBjbGFzcyBUZXN0RmluZE1vZGlmaWVkQ2hhbmdlTG9ncyhCdWlsZFN0ZXBNaXhpbkFk ZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBzZXRVcChzZWxmKToKICAgICAg ICAgc2VsZi5sb25nTWVzc2FnZSA9IFRydWUK 425808 2021-04-12 16:28:05 -0700 2021-04-12 17:48:25 -0700 [fast-cq] Patch bug-224444-20210412192804.patch text/plain 9395 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTgzMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIxLTA0LTEyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBNYWtlIENvbW1pdCBRdWV1ZSByb2J1c3QgYnkgYWRkaW5nIGZldyBnaXQg Y29tbWFuZHMgdG8gY2xlYW4gdXAgcmVwb3NpdG9yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NDQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Ogor ICAgICAgICAoQ2xlYW5HaXRSZXBvKTogQnVpbGQgc3RlcCB0byBydW4gZmV3IGNvbW1hbmRzIHRv IGNsZWFudXAgZ2l0IHJlcG9zaXRvcnkuCisgICAgICAgIChDbGVhbkdpdFJlcG8ucnVuKToKKyAg ICAgICAgKENsZWFuR2l0UmVwby5nZXRSZXN1bHRTdW1tYXJ5KTogQ3VzdG9tIGZhaWx1cmUgbWVz c2FnZS4KKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5OiBB ZGRlZCB1bml0LXRlc3RzLgorICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVz LnB5OgorICAgICAgICAoQ29tbWl0UXVldWVGYWN0b3J5Ll9faW5pdF9fKToKKyAgICAgICAgKiBD SVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RD b21taXRRdWV1ZUZhY3RvcnkudGVzdF9jb21taXRfcXVldWVfZmFjdG9yeSk6IFVwZGF0ZWQgdW5p dC10ZXN0LgorCiAyMDIxLTA0LTExICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0 Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI3NTgwMS4KSW5kZXg6IFRv b2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L0NJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyNzU4MzIpCisrKyBU b29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAt MjUsNyArMjUsNyBAQCBmcm9tIGJ1aWxkYm90LnByb2Nlc3MgaW1wb3J0IGZhY3RvcnkKIGZyb20g YnVpbGRib3Quc3RlcHMgaW1wb3J0IHRyaWdnZXIKIAogZnJvbSBzdGVwcyBpbXBvcnQgKEFwcGx5 UGF0Y2gsIEFwcGx5V2F0Y2hMaXN0LCBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1Jl dmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLAotICAgICAgICAgICAgICAgICAgIENoZWNrUGF0 Y2hTdGF0dXNPbkVXU1F1ZXVlcywgQ2hlY2tTdHlsZSwgQ29tcGlsZUpTQywgQ29tcGlsZVdlYktp dCwgQ29uZmlndXJlQnVpbGQsIENyZWF0ZUxvY2FsR0lUQ29tbWl0LAorICAgICAgICAgICAgICAg ICAgIENoZWNrUGF0Y2hTdGF0dXNPbkVXU1F1ZXVlcywgQ2hlY2tTdHlsZSwgQ2xlYW5HaXRSZXBv LCBDb21waWxlSlNDLCBDb21waWxlV2ViS2l0LCBDb25maWd1cmVCdWlsZCwgQ3JlYXRlTG9jYWxH SVRDb21taXQsCiAgICAgICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIEV4dHJh Y3RCdWlsdFByb2R1Y3QsIEZldGNoQnJhbmNoZXMsIEZpbmRNb2RpZmllZENoYW5nZUxvZ3MsIEZp bmRNb2RpZmllZExheW91dFRlc3RzLAogICAgICAgICAgICAgICAgICAgIEluc3RhbGxHdGtEZXBl bmRlbmNpZXMsIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMsIEtpbGxPbGRQcm9jZXNzZXMsIFByaW50 Q29uZmlndXJhdGlvbiwgUHVzaENvbW1pdFRvV2ViS2l0UmVwbywKICAgICAgICAgICAgICAgICAg ICBSdW5BUElUZXN0cywgUnVuQmluZGluZ3NUZXN0cywgUnVuQnVpbGRXZWJLaXRPcmdVbml0VGVz dHMsIFJ1bkJ1aWxkYm90Q2hlY2tDb25maWdGb3JCdWlsZFdlYktpdCwgUnVuQnVpbGRib3RDaGVj a0NvbmZpZ0ZvckVXUywKQEAgLTI4MSw2ICsyODEsNyBAQCBjbGFzcyBDb21taXRRdWV1ZUZhY3Rv cnkoZmFjdG9yeS5CdWlsZEZhCiAgICAgICAgIHNlbGYuYWRkU3RlcChWYWxpZGF0ZVBhdGNoKHZl cmlmeWNxcGx1cz1UcnVlKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFZhbGlkYXRlQ29tbWl0ZXJB bmRSZXZpZXdlcigpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoUHJpbnRDb25maWd1cmF0aW9uKCkp CisgICAgICAgIHNlbGYuYWRkU3RlcChDbGVhbkdpdFJlcG8oKSkKICAgICAgICAgc2VsZi5hZGRT dGVwKENoZWNrT3V0U291cmNlKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChGZXRjaEJyYW5jaGVz KCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChTaG93SWRlbnRpZmllcigpKQpJbmRleDogVG9vbHMv Q0lTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXNfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI3NTgzMikKKysrIFRvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzX3VuaXR0ZXN0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MTEsNiArNDExLDcgQEAgY2xhc3MgVGVzdENvbW1pdFF1 ZXVlRmFjdG9yeShUZXN0Q2FzZSk6CiAgICAgICAgICAgICBfQnVpbGRTdGVwRmFjdG9yeShzdGVw cy5WYWxpZGF0ZVBhdGNoLCB2ZXJpZnljcXBsdXM9VHJ1ZSksCiAgICAgICAgICAgICBfQnVpbGRT dGVwRmFjdG9yeShzdGVwcy5WYWxpZGF0ZUNvbW1pdGVyQW5kUmV2aWV3ZXIpLAogICAgICAgICAg ICAgX0J1aWxkU3RlcEZhY3Rvcnkoc3RlcHMuUHJpbnRDb25maWd1cmF0aW9uKSwKKyAgICAgICAg ICAgIF9CdWlsZFN0ZXBGYWN0b3J5KHN0ZXBzLkNsZWFuR2l0UmVwbyksCiAgICAgICAgICAgICBf QnVpbGRTdGVwRmFjdG9yeShzdGVwcy5DaGVja091dFNvdXJjZSksCiAgICAgICAgICAgICBfQnVp bGRTdGVwRmFjdG9yeShzdGVwcy5GZXRjaEJyYW5jaGVzKSwKICAgICAgICAgICAgIF9CdWlsZFN0 ZXBGYWN0b3J5KHN0ZXBzLlNob3dJZGVudGlmaWVyKSwKSW5kZXg6IFRvb2xzL0NJU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQkocmV2aXNpb24gMjc1ODMyKQorKysgVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWls ZC9zdGVwcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzEyOCw2ICszMTI4LDMxIEBAIGNsYXNzIFBy aW50Q29uZmlndXJhdGlvbihzdGVwcy5TaGVsbFNlcXUKICAgICAgICAgcmV0dXJuIHsnc3RlcCc6 IGNvbmZpZ3VyYXRpb259CiAKIAorY2xhc3MgQ2xlYW5HaXRSZXBvKHN0ZXBzLlNoZWxsU2VxdWVu Y2UpOgorICAgIG5hbWUgPSAnY2xlYW4tdXAtZ2l0LXJlcG8nCisgICAgaGFsdE9uRmFpbHVyZSA9 IEZhbHNlCisgICAgZmx1bmtPbkZhaWx1cmUgPSBGYWxzZQorICAgIGxvZ0Vudmlyb24gPSBGYWxz ZQorICAgICMgVGhpcyBzb21ld2hhdCBxdWlya3kgc2VxdWVuY2Ugb2Ygc3RlcHMgc2VlbXMgdG8g Y2xlYXIgdXAgYWxsIHRoZSBicm9rZW4KKyAgICAjIGdpdCBzaXR1YXRpb25zIHdlJ3ZlIGdvdHRl biBvdXJzZWxmIGludG8gaW4gdGhlIHBhc3QuCisgICAgY29tbWFuZF9saXN0ID0gW1snZ2l0Jywg J2NsZWFuJywgJy1mJ10sICAjIFJlbW92ZSBhbnkgbGVmdC1vdmVyIGxheW91dCB0ZXN0IHJlc3Vs dHMsIGFkZGVkIGZpbGVzLCBldGMuCisgICAgICAgICAgICAgICAgICAgIFsnZ2l0JywgJ2ZldGNo JywgJ29yaWdpbiddLCAgIyBBdm9pZCB1cGRhdGluZyB0aGUgd29ya2luZyBjb3B5IHRvIGEgc3Rh bGUgcmV2aXNpb24uCisgICAgICAgICAgICAgICAgICAgIFsnZ2l0JywgJ2NoZWNrb3V0JywgJ29y aWdpbi9tYWluJywgJy1mJ10sCisgICAgICAgICAgICAgICAgICAgIFsnZ2l0JywgJ2JyYW5jaCcs ICctRCcsICdtYWluJ10sCisgICAgICAgICAgICAgICAgICAgIFsnZ2l0JywgJ2NoZWNrb3V0Jywg J29yaWdpbi9tYWluJywgJy1iJywgJ21haW4nXV0KKworICAgIGRlZiBydW4oc2VsZik6CisgICAg ICAgIHNlbGYuY29tbWFuZHMgPSBbXQorICAgICAgICBmb3IgY29tbWFuZCBpbiBzZWxmLmNvbW1h bmRfbGlzdDoKKyAgICAgICAgICAgIHNlbGYuY29tbWFuZHMuYXBwZW5kKHV0aWwuU2hlbGxBcmco Y29tbWFuZD1jb21tYW5kLCBsb2duYW1lPSdzdGRpbycpKQorICAgICAgICByZXR1cm4gc3VwZXIo Q2xlYW5HaXRSZXBvLCBzZWxmKS5ydW4oKQorCisgICAgZGVmIGdldFJlc3VsdFN1bW1hcnkoc2Vs Zik6CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyAhPSBTVUNDRVNTOgorICAgICAgICAgICAgcmV0 dXJuIHsnc3RlcCc6ICdFbmNvdW50ZXJlZCBzb21lIGlzc3VlcyBkdXJpbmcgY2xlYW51cCd9Cisg ICAgICAgIHJldHVybiB7J3N0ZXAnOiAnQ2xlYW5lZCB1cCBnaXQgcmVwb3NpdG9yeSd9CisKKwog Y2xhc3MgQXBwbHlXYXRjaExpc3Qoc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBuYW1lID0gJ2Fw cGx5LXdhdGNoLWxpc3QnCiAgICAgZGVzY3JpcHRpb24gPSBbJ2FwcGx5aW5nIHdhdGNoaWxpc3Qn XQpJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNzU4MzIpCisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Myw4ICs0Myw4IEBAIGZyb20gdHdpc3RlZC50cmlh bCBpbXBvcnQgdW5pdHRlc3QKIGZyb20gc3RlcHMgaW1wb3J0IChBbmFseXplQVBJVGVzdHNSZXN1 bHRzLCBBbmFseXplQ29tcGlsZVdlYktpdFJlc3VsdHMsIEFuYWx5emVKU0NUZXN0c1Jlc3VsdHMs CiAgICAgICAgICAgICAgICAgICAgQW5hbHl6ZUxheW91dFRlc3RzUmVzdWx0cywgQXBwbHlQYXRj aCwgQXBwbHlXYXRjaExpc3QsIEFyY2hpdmVCdWlsdFByb2R1Y3QsIEFyY2hpdmVUZXN0UmVzdWx0 cywKICAgICAgICAgICAgICAgICAgICBDaGVja091dFNvdXJjZSwgQ2hlY2tPdXRTcGVjaWZpY1Jl dmlzaW9uLCBDaGVja1BhdGNoUmVsZXZhbmNlLCBDaGVja1BhdGNoU3RhdHVzT25FV1NRdWV1ZXMs IENoZWNrU3R5bGUsCi0gICAgICAgICAgICAgICAgICAgQ2xlYW5CdWlsZCwgQ2xlYW5VcEdpdElu ZGV4TG9jaywgQ2xlYW5Xb3JraW5nRGlyZWN0b3J5LCBDb21waWxlSlNDLCBDb21waWxlSlNDV2l0 aG91dFBhdGNoLCBDb21waWxlV2ViS2l0LAotICAgICAgICAgICAgICAgICAgIENvbXBpbGVXZWJL aXRXaXRob3V0UGF0Y2gsIENvbmZpZ3VyZUJ1aWxkLCBDcmVhdGVMb2NhbEdJVENvbW1pdCwKKyAg ICAgICAgICAgICAgICAgICBDbGVhbkJ1aWxkLCBDbGVhblVwR2l0SW5kZXhMb2NrLCBDbGVhbkdp dFJlcG8sIENsZWFuV29ya2luZ0RpcmVjdG9yeSwgQ29tcGlsZUpTQywgQ29tcGlsZUpTQ1dpdGhv dXRQYXRjaCwKKyAgICAgICAgICAgICAgICAgICBDb21waWxlV2ViS2l0LCBDb21waWxlV2ViS2l0 V2l0aG91dFBhdGNoLCBDb25maWd1cmVCdWlsZCwgQ3JlYXRlTG9jYWxHSVRDb21taXQsCiAgICAg ICAgICAgICAgICAgICAgRG93bmxvYWRCdWlsdFByb2R1Y3QsIERvd25sb2FkQnVpbHRQcm9kdWN0 RnJvbU1hc3RlciwgRVdTX0JVSUxEX0hPU1ROQU1FLCBFeHRyYWN0QnVpbHRQcm9kdWN0LCBFeHRy YWN0VGVzdFJlc3VsdHMsCiAgICAgICAgICAgICAgICAgICAgRmV0Y2hCcmFuY2hlcywgRmluZE1v ZGlmaWVkQ2hhbmdlTG9ncywgRmluZE1vZGlmaWVkTGF5b3V0VGVzdHMsIEdpdFJlc2V0SGFyZCwg SW5zdGFsbEd0a0RlcGVuZGVuY2llcywgSW5zdGFsbFdwZURlcGVuZGVuY2llcywKICAgICAgICAg ICAgICAgICAgICBLaWxsT2xkUHJvY2Vzc2VzLCBQcmludENvbmZpZ3VyYXRpb24sIFB1c2hDb21t aXRUb1dlYktpdFJlcG8sIFJlUnVuQVBJVGVzdHMsIFJlUnVuSmF2YVNjcmlwdENvcmVUZXN0cywg UmVSdW5XZWJLaXRQZXJsVGVzdHMsCkBAIC0zODg5LDYgKzM4ODksNTMgQEAgT1NFcnJvcjogW0Vy cm5vIDJdIE5vIHN1Y2ggZmlsZSBvciBkaXJlYwogICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVw KCkKIAogCitjbGFzcyBUZXN0Q2xlYW5HaXRSZXBvKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1 bml0dGVzdC5UZXN0Q2FzZSk6CisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAgICBzZWxmLmxv bmdNZXNzYWdlID0gVHJ1ZQorICAgICAgICByZXR1cm4gc2VsZi5zZXRVcEJ1aWxkU3RlcCgpCisK KyAgICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnRlYXJEb3duQnVp bGRTdGVwKCkKKworICAgIGRlZiB0ZXN0X3N1Y2Nlc3Moc2VsZik6CisgICAgICAgIHNlbGYuc2V0 dXBTdGVwKENsZWFuR2l0UmVwbygpKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdidWlsZGVy bmFtZScsICdDb21taXQtUXVldWUnKQorCisgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFu ZHMoCisgICAgICAgICAgICBFeHBlY3RTaGVsbChjb21tYW5kPVsnZ2l0JywgJ2NsZWFuJywgJy1m J10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDAK KyAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nJyksCisgICAg ICAgICAgICBFeHBlY3RTaGVsbChjb21tYW5kPVsnZ2l0JywgJ2ZldGNoJywgJ29yaWdpbiddLCB3 b3JrZGlyPSd3a2RpcicsIHRpbWVvdXQ9MTIwMCwgbG9nRW52aXJvbj1GYWxzZSkgKyAwCisgICAg ICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9JycpLAorICAgICAgICAg ICAgRXhwZWN0U2hlbGwoY29tbWFuZD1bJ2dpdCcsICdjaGVja291dCcsICdvcmlnaW4vbWFpbics ICctZiddLCB3b3JrZGlyPSd3a2RpcicsIHRpbWVvdXQ9MTIwMCwgbG9nRW52aXJvbj1GYWxzZSkg KyAwCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1lvdSBh cmUgaW4gZGV0YWNoZWQgSEVBRCBzdGF0ZS4nKSwKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNv bW1hbmQ9WydnaXQnLCAnYnJhbmNoJywgJy1EJywgJ21haW4nXSwgd29ya2Rpcj0nd2tkaXInLCB0 aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFsc2UpICsgMAorICAgICAgICAgICAgKyBFeHBlY3RT aGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdEZWxldGVkIGJyYW5jaCBtYWluICh3YXMgNTcwMTU5 NjdmZWY5KS4nKSwKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnY2hl Y2tvdXQnLCAnb3JpZ2luL21haW4nLCAnLWInLCAnbWFpbiddLCB3b3JrZGlyPSd3a2RpcicsIHRp bWVvdXQ9MTIwMCwgbG9nRW52aXJvbj1GYWxzZSkgKyAwCisgICAgICAgICAgICArIEV4cGVjdFNo ZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9IlN3aXRjaGVkIHRvIGEgbmV3IGJyYW5jaCAnbWFpbici KSwKKyAgICAgICAgKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1Ms IHN0YXRlX3N0cmluZz0nQ2xlYW5lZCB1cCBnaXQgcmVwb3NpdG9yeScpCisgICAgICAgIHJldHVy biBzZWxmLnJ1blN0ZXAoKQorCisgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKKyAgICAgICAg c2VsZi5zZXR1cFN0ZXAoQ2xlYW5HaXRSZXBvKCkpCisgICAgICAgIHNlbGYuc2V0UHJvcGVydHko J2J1aWxkZXJuYW1lJywgJ0NvbW1pdC1RdWV1ZScpCisKKyAgICAgICAgc2VsZi5leHBlY3RSZW1v dGVDb21tYW5kcygKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnY2xl YW4nLCAnLWYnXSwgd29ya2Rpcj0nd2tkaXInLCB0aW1lb3V0PTEyMDAsIGxvZ0Vudmlyb249RmFs c2UpICsgMAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PScn KSwKKyAgICAgICAgICAgIEV4cGVjdFNoZWxsKGNvbW1hbmQ9WydnaXQnLCAnZmV0Y2gnLCAnb3Jp Z2luJ10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSAr IDEyOAorICAgICAgICAgICAgKyBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdmYXRh bDogdW5hYmxlIHRvIGFjY2VzcyBodHRwczovL2dpdGh1Yi5jb20vV2ViS2l0L1dlYktpdC5naXQv OiBDb3VsZCBub3QgcmVzb2x2ZSBob3N0OiBnaXRodWIuY29tJyksCisgICAgICAgICAgICBFeHBl Y3RTaGVsbChjb21tYW5kPVsnZ2l0JywgJ2NoZWNrb3V0JywgJ29yaWdpbi9tYWluJywgJy1mJ10s IHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0xMjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDAKKyAg ICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nWW91IGFyZSBpbiBk ZXRhY2hlZCBIRUFEIHN0YXRlLicpLAorICAgICAgICAgICAgRXhwZWN0U2hlbGwoY29tbWFuZD1b J2dpdCcsICdicmFuY2gnLCAnLUQnLCAnbWFpbiddLCB3b3JrZGlyPSd3a2RpcicsIHRpbWVvdXQ9 MTIwMCwgbG9nRW52aXJvbj1GYWxzZSkgKyAwCisgICAgICAgICAgICArIEV4cGVjdFNoZWxsLmxv Zygnc3RkaW8nLCBzdGRvdXQ9J0RlbGV0ZWQgYnJhbmNoIG1haW4gKHdhcyA1NzAxNTk2N2ZlZjkp LicpLAorICAgICAgICAgICAgRXhwZWN0U2hlbGwoY29tbWFuZD1bJ2dpdCcsICdjaGVja291dCcs ICdvcmlnaW4vbWFpbicsICctYicsICdtYWluJ10sIHdvcmtkaXI9J3drZGlyJywgdGltZW91dD0x MjAwLCBsb2dFbnZpcm9uPUZhbHNlKSArIDAKKyAgICAgICAgICAgICsgRXhwZWN0U2hlbGwubG9n KCdzdGRpbycsIHN0ZG91dD0iU3dpdGNoZWQgdG8gYSBuZXcgYnJhbmNoICdtYWluJyIpLAorICAg ICAgICApCisgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJTFVSRSwgc3RhdGVf c3RyaW5nPSdFbmNvdW50ZXJlZCBzb21lIGlzc3VlcyBkdXJpbmcgY2xlYW51cCcpCisgICAgICAg IHJldHVybiBzZWxmLnJ1blN0ZXAoKQorCisKIGNsYXNzIFRlc3RGaW5kTW9kaWZpZWRDaGFuZ2VM b2dzKEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVm IHNldFVwKHNlbGYpOgogICAgICAgICBzZWxmLmxvbmdNZXNzYWdlID0gVHJ1ZQo=