36957 2010-04-01 06:52:57 -0700 check-webkit-style: fails silently on non-existent files 2010-04-03 00:48:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek cjerdonek hamaji oldest_to_newest 207124 0 cjerdonek 2010-04-01 06:52:57 -0700 check-webkit-style doesn't always give a warning on non-existent files. For example-- > check-webkit-style non-existent_file Total errors found: 0 in 1 files > We should probably check for this at the beginning of check_file(). If the file doesn't exist, we should either error out or log a warning, and not increment the file_count. 207126 1 cjerdonek 2010-04-01 06:57:17 -0700 We might also want to log a warning in the case below so it's more obvious that something has gone wrong: # We fail when style errors are found or there are no checked files. sys.exit(error_count > 0 or file_count == 0) 207922 2 52422 cjerdonek 2010-04-02 10:26:58 -0700 Created attachment 52422 Proposed patch 208244 3 52422 hamaji 2010-04-03 00:06:48 -0700 Comment on attachment 52422 Proposed patch > + if not os_path_exists(file_path): > + _log.error("File does not exist: %s" % file_path) > + return Does this mean we won't terminate the program? If so, I slightly prefer to raise an exception here. If a user invokes the style checker by % check-webkit-style not_exist WebCore the error message might be missed due to a lot of style errors in WebCore, I guess. Otherwise, looks good. Thanks for this change! 208245 4 cjerdonek 2010-04-03 00:16:20 -0700 (In reply to comment #3) > (From update of attachment 52422 [details]) > > + if not os_path_exists(file_path): > > + _log.error("File does not exist: %s" % file_path) > > + return > > Does this mean we won't terminate the program? If so, I slightly prefer to > raise an exception here. I wasn't sure so I chose to be more conservative. I'm fine with an exception and will change it. Thanks for the review! 208252 5 52422 cjerdonek 2010-04-03 00:48:45 -0700 Comment on attachment 52422 Proposed patch Committed: http://trac.webkit.org/changeset/57048 52422 2010-04-02 10:26:58 -0700 2010-04-03 00:48:45 -0700 Proposed patch _patch-36957-1.diff text/plain 9406 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyNTRiZjI0Li4zZTNjYjY1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTAtMDQt MDIgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNoZWNrLXdlYmtpdC1zdHls ZSBzY3JpcHQgbm93IGxvZ3MgYW4gRVJST1Igd2hlbiBjaGVja2luZworICAgICAgICBlYWNoIHBh dGggY29ycmVzcG9uZGluZyB0byBhIGZpbGUgdGhhdCBkb2VzIG5vdCBleGlzdC4gIFByZXZpb3Vz bHksCisgICAgICAgIGl0IGZhaWxlZCBzaWxlbnRseSBvbiBzdWNoIHBhdGhzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjk1NworCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2xvZ3Rlc3RpbmcucHk6CisgICAgICAg ICAgLSBBZGRlZCBhIEZJWE1FIHRvIHJlbmFtZSB0aGUgTG9nZ2luZ1Rlc3RDYXNlIGNsYXNzIHRv CisgICAgICAgICAgICBMb2dnaW5nVGVzdENhc2VCYXNlLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5OgorICAgICAgICAgIC0gSW4gdGhlIFN0eWxlQ2hlY2tl ci5jaGVja19maWxlKCkgbWV0aG9kOgorICAgICAgICAgICAgLSBBZGRlZCBhIG1vY2tfb3NfcGF0 aF9leGlzdHMgcGFyYW1ldGVyLgorICAgICAgICAgICAgLSBSZW5hbWVkIHRoZSBwcm9jZXNzX2Zp bGUgcGFyYW1ldGVyIHRvIG1vY2tfcHJvY2Vzc19maWxlLgorICAgICAgICAgICAgLSBBZGRlZCBs b2dpYyB0byBsb2cgYW4gZXJyb3IgaWYgdGhlIGdpdmVuIHBhdGggZG9lcyBub3QgZXhpc3QuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHk6Cisg ICAgICAgICAgLSBSZWZhY3RvcmVkIHRoZSBTdHlsZUNoZWNrZXJDaGVja0ZpbGVUZXN0IGNsYXNz IHNsaWdodGx5IHRvCisgICAgICAgICAgICBpbmhlcml0IGZyb20gTG9nZ2luZ1Rlc3RDYXNlLgor ICAgICAgICAgIC0gQWRkZWQgYSB0ZXN0IG1ldGhvZCB0byB1bml0LXRlc3QgdGhlIGNhc2Ugb2Yg YSBmaWxlIHRoYXQKKyAgICAgICAgICAgIGRvZXMgbm90IGV4aXN0LgorICAgICAgICAgIC0gQWRq dXN0ZWQgdGhlIG90aGVyIHRlc3QgbWV0aG9kcyBhcyBuZWNlc3NhcnkuCisKIDIwMTAtMDQtMDIg IEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAgICAgW3d4 XSBCdWlsZCBmaXggZm9yIER1bXBSZW5kZXJUcmVlIGFmdGVyIGFkZGl0aW9uIG9mIGxheWVyVHJl ZUFzVGV4dC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9sb2d0ZXN0aW5nLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2xvZ3Rlc3RpbmcucHkKaW5kZXggMmZmMjE3ZC4uZWQ0YmRhMyAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2xvZ3Rlc3Rpbmcu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2xvZ3Rl c3RpbmcucHkKQEAgLTIwNyw2ICsyMDcsMTAgQEAgY2xhc3MgTG9nVGVzdGluZyhvYmplY3QpOgog IyBzZXRVcCgpIGFuZCB0ZWFyRG93bigpIG1ldGhvZHMgd2lsbCBub3QgZ2V0IGZpcmVkIGZvciB0 ZXN0IGNhc2UgY2xhc3NlcwogIyB0aGF0IGluaGVyaXQgZnJvbSB0aGlzIGNsYXNzIC0tIGV2ZW4g aWYgdGhlIGNsYXNzIGluaGVyaXRzIGZyb20gKmJvdGgqCiAjIHVuaXR0ZXN0LlRlc3RDYXNlIGFu ZCBMb2dnaW5nVGVzdENhc2UuCisjCisjIEZJWE1FOiBSZW5hbWUgdGhpcyBjbGFzcyB0byBMb2dn aW5nVGVzdENhc2VCYXNlIHRvIGJlIHN1cmUgdGhhdAorIyAgICAgICAgdGhlIHVuaXR0ZXN0IG1v ZHVsZSBkb2VzIG5vdCBpbnRlcnByZXQgdGhpcyBjbGFzcyBhcyBhIHVuaXR0ZXN0CisjICAgICAg ICB0ZXN0IGNhc2UgaXRzZWxmLgogY2xhc3MgTG9nZ2luZ1Rlc3RDYXNlKHVuaXR0ZXN0LlRlc3RD YXNlKToKIAogICAgICIiIlN1cHBvcnRzIGVuZC10by1lbmQgdW5pdC10ZXN0aW5nIG9mIGxvZyBt ZXNzYWdlcy4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5w eQppbmRleCA3ZjFjMGJlLi4yNGJiN2FiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5CkBAIC02MzYsNyArNjM2LDkgQEAgY2xhc3MgU3R5bGVDaGVj a2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKGRp cl9wYXRoLCBmaWxlX25hbWUpCiAgICAgICAgICAgICAgICAgY2hlY2tfZmlsZShmaWxlX3BhdGgp CiAKLSAgICBkZWYgY2hlY2tfZmlsZShzZWxmLCBmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJv cj1Ob25lLCBwcm9jZXNzX2ZpbGU9Tm9uZSk6CisgICAgZGVmIGNoZWNrX2ZpbGUoc2VsZiwgZmls ZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3I9Tm9uZSwKKyAgICAgICAgICAgICAgICAgICBtb2Nr X29zX3BhdGhfZXhpc3RzPU5vbmUsCisgICAgICAgICAgICAgICAgICAgbW9ja19wcm9jZXNzX2Zp bGU9Tm9uZSk6CiAgICAgICAgICIiIkNoZWNrIHN0eWxlIGluIHRoZSBnaXZlbiBmaWxlLgogCiAg ICAgICAgIEFyZ3M6CkBAIC02NDcsMTEgKzY0OSwyNCBAQCBjbGFzcyBTdHlsZUNoZWNrZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9jY3Vycy4gVGhpcyBwYXJhbWV0 ZXIgaXMgbWVhbnQgZm9yIGludGVybmFsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1 c2Ugd2l0aGluIHRoaXMgY2xhc3MuIERlZmF1bHRzIHRvIGEKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIERlZmF1bHRTdHlsZUVycm9ySGFuZGxlciBpbnN0YW5jZS4KLSAgICAgICAgICBw cm9jZXNzX2ZpbGU6IFRoZSBmdW5jdGlvbiB0byBjYWxsIHRvIHByb2Nlc3MgdGhlIGZpbGUuIFRo aXMKLSAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtZXRlciBzaG91bGQgYmUgdXNlZCBvbmx5 IGZvciB1bml0IHRlc3RzLgotICAgICAgICAgICAgICAgICAgICAgICAgRGVmYXVsdHMgdG8gdGhl IGZpbGUgcHJvY2Vzc2luZyBtZXRob2Qgb2YgdGhpcyBjbGFzcy4KKyAgICAgICAgICBtb2NrX29z X3BhdGhfZXhpc3RzOiBBIHVuaXQtdGVzdCByZXBsYWNlbWVudCBmb3Igb3MucGF0aC5leGlzdHMu CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGhpcyBwYXJhbWV0ZXIgc2hvdWxkIG9u bHkgYmUgdXNlZCBmb3IgdW5pdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3Rz LgorICAgICAgICAgIG1vY2tfcHJvY2Vzc19maWxlOiBUaGUgZnVuY3Rpb24gdG8gY2FsbCB0byBw cm9jZXNzIHRoZSBmaWxlLiBUaGlzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFt ZXRlciBzaG91bGQgYmUgdXNlZCBvbmx5IGZvciB1bml0IHRlc3RzLgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBEZWZhdWx0cyB0byB0aGUgZmlsZSBwcm9jZXNzaW5nIG1ldGhvZCBvZiB0 aGlzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsYXNzLgogCiAgICAgICAgICIiIgor ICAgICAgICBvc19wYXRoX2V4aXN0cyA9IChvcy5wYXRoLmV4aXN0cyBpZiBtb2NrX29zX3BhdGhf ZXhpc3RzIGlzIE5vbmUgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgICBtb2NrX29zX3Bh dGhfZXhpc3RzKQorICAgICAgICBwcm9jZXNzX2ZpbGUgPSAoc2VsZi5fcHJvY2Vzc19maWxlIGlm IG1vY2tfcHJvY2Vzc19maWxlIGlzIE5vbmUgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAg bW9ja19wcm9jZXNzX2ZpbGUpCisKKyAgICAgICAgaWYgbm90IG9zX3BhdGhfZXhpc3RzKGZpbGVf cGF0aCk6CisgICAgICAgICAgICBfbG9nLmVycm9yKCJGaWxlIGRvZXMgbm90IGV4aXN0OiAlcyIg JSBmaWxlX3BhdGgpCisgICAgICAgICAgICByZXR1cm4KKwogICAgICAgICBfbG9nLmRlYnVnKCJD aGVja2luZzogIiArIGZpbGVfcGF0aCkKICAgICAgICAgaWYgaGFuZGxlX3N0eWxlX2Vycm9yIGlz IE5vbmU6CiAgICAgICAgICAgICBoYW5kbGVfc3R5bGVfZXJyb3IgPSBEZWZhdWx0U3R5bGVFcnJv ckhhbmRsZXIoCkBAIC02NTksOSArNjc0LDYgQEAgY2xhc3MgU3R5bGVDaGVja2VyKG9iamVjdCk6 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZV9wYXRoPWZpbGVfcGF0 aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmNyZW1lbnRfZXJyb3Jf Y291bnQ9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX2lu Y3JlbWVudF9lcnJvcl9jb3VudCkKLSAgICAgICAgaWYgcHJvY2Vzc19maWxlIGlzIE5vbmU6Ci0g ICAgICAgICAgICBwcm9jZXNzX2ZpbGUgPSBzZWxmLl9wcm9jZXNzX2ZpbGUKLQogICAgICAgICBz ZWxmLmZpbGVfY291bnQgKz0gMQogCiAgICAgICAgIGRpc3BhdGNoZXIgPSBQcm9jZXNzb3JEaXNw YXRjaGVyKCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcl91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcl91bml0dGVzdC5weQppbmRleCAzOTAxMjU1Li4xMDU1YjE1IDEwMDc1NQotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5 CkBAIC01OCw2ICs1OCw3IEBAIGZyb20gb3B0cGFyc2VyIGltcG9ydCBDb21tYW5kT3B0aW9uVmFs dWVzCiBmcm9tIHByb2Nlc3NvcnMuY3BwIGltcG9ydCBDcHBQcm9jZXNzb3IKIGZyb20gcHJvY2Vz c29ycy5weXRob24gaW1wb3J0IFB5dGhvblByb2Nlc3NvcgogZnJvbSBwcm9jZXNzb3JzLnRleHQg aW1wb3J0IFRleHRQcm9jZXNzb3IKK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5sb2d0ZXN0 aW5nIGltcG9ydCBMb2dnaW5nVGVzdENhc2UKIAogCiBjbGFzcyBDb25maWd1cmVMb2dnaW5nVGVz dEJhc2UodW5pdHRlc3QuVGVzdENhc2UpOgpAQCAtNTM1LDcgKzUzNiw3IEBAIGNsYXNzIFN0eWxl Q2hlY2tlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhzdHlsZV9jaGVja2VyLmZpbGVfY291bnQsIDApCiAKIAotY2xhc3MgU3R5bGVDaGVja2VyQ2hl Y2tGaWxlVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CitjbGFzcyBTdHlsZUNoZWNrZXJDaGVja0Zp bGVUZXN0KExvZ2dpbmdUZXN0Q2FzZSk6CiAKICAgICAiIiJUZXN0IHRoZSBjaGVja19maWxlKCkg bWV0aG9kIG9mIHRoZSBTdHlsZUNoZWNrZXIgY2xhc3MuCiAKQEAgLTU2MSwyMSArNTYyLDIzIEBA IGNsYXNzIFN0eWxlQ2hlY2tlckNoZWNrRmlsZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAg ICAgIiIiCiAgICAgZGVmIHNldFVwKHNlbGYpOgotICAgICAgICBzZWxmLl9sb2cgPSBMb2dUZXN0 aW5nLnNldFVwKHNlbGYpCisgICAgICAgIExvZ2dpbmdUZXN0Q2FzZS5zZXRVcChzZWxmKQogICAg ICAgICBzZWxmLmdvdF9maWxlX3BhdGggPSBOb25lCiAgICAgICAgIHNlbGYuZ290X2hhbmRsZV9z dHlsZV9lcnJvciA9IE5vbmUKICAgICAgICAgc2VsZi5nb3RfcHJvY2Vzc29yID0gTm9uZQogICAg ICAgICBzZWxmLndhcm5pbmdfbWVzc2FnZXMgPSAiIgogCi0gICAgZGVmIHRlYXJEb3duKHNlbGYp OgotICAgICAgICBzZWxmLl9sb2cudGVhckRvd24oKQotCiAgICAgZGVmIG1vY2tfc3RkZXJyX3dy aXRlKHNlbGYsIHdhcm5pbmdfbWVzc2FnZSk6CiAgICAgICAgIHNlbGYud2FybmluZ19tZXNzYWdl cyArPSB3YXJuaW5nX21lc3NhZ2UKIAogICAgIGRlZiBtb2NrX2hhbmRsZV9zdHlsZV9lcnJvcihz ZWxmKToKICAgICAgICAgcGFzcwogCisgICAgZGVmIG1vY2tfb3NfcGF0aF9leGlzdHMoc2VsZiwg cGF0aCk6CisgICAgICAgICMgV2UgZGVsaWJlcmF0ZWx5IG1ha2UgaXQgc28gdGhhdCB0aGlzIG1l dGhvZCByZXR1cm5zIEZhbHNlIHVubGVzcworICAgICAgICAjIHRoZSBjYWxsZXIgaGFzIG1hZGUg YW4gZWZmb3J0IHRvIHB1dCAiZG9lc19leGlzdCIgaW4gdGhlIHBhdGguCisgICAgICAgIHJldHVy biBwYXRoLmZpbmQoImRvZXNfZXhpc3QiKSA+IC0xCisKICAgICBkZWYgbW9ja19wcm9jZXNzX2Zp bGUoc2VsZiwgcHJvY2Vzc29yLCBmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcik6CiAgICAg ICAgICIiIkEgbW9jayBfcHJvY2Vzc19maWxlKCkuCiAKQEAgLTYxMiwxNiArNjE1LDMxIEBAIGNs YXNzIFN0eWxlQ2hlY2tlckNoZWNrRmlsZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAg ICAgIHN0eWxlX2NoZWNrZXIgPSBTdHlsZUNoZWNrZXIoY29uZmlndXJhdGlvbikKIAotICAgICAg ICBzdHlsZV9jaGVja2VyLmNoZWNrX2ZpbGUoZmlsZV9wYXRoLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2VsZi5tb2NrX2hhbmRsZV9zdHlsZV9lcnJvciwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGYubW9ja19wcm9jZXNzX2ZpbGUpCisgICAgICAgIHN0 eWxlX2NoZWNrZXIuY2hlY2tfZmlsZShmaWxlX3BhdGg9ZmlsZV9wYXRoLAorICAgICAgICAgICAg aGFuZGxlX3N0eWxlX2Vycm9yPXNlbGYubW9ja19oYW5kbGVfc3R5bGVfZXJyb3IsCisgICAgICAg ICAgICBtb2NrX29zX3BhdGhfZXhpc3RzPXNlbGYubW9ja19vc19wYXRoX2V4aXN0cywKKyAgICAg ICAgICAgIG1vY2tfcHJvY2Vzc19maWxlPXNlbGYubW9ja19wcm9jZXNzX2ZpbGUpCisKKyAgICAg ICAgZmlsZV9jb3VudCA9IDEgaWYgc2VsZi5tb2NrX29zX3BhdGhfZXhpc3RzKGZpbGVfcGF0aCkg ZWxzZSAwCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZmlsZV9jb3VudCwgc3R5bGVfY2hl Y2tlci5maWxlX2NvdW50KQorCisgICAgZGVmIHRlc3RfY2hlY2tfZmlsZV9kb2VzX25vdF9leGlz dChzZWxmKToKKyAgICAgICAgZmlsZV9wYXRoID0gImZpbGVfZG9lc19ub3RfZXhpc3QudHh0Igog Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKDEsIHN0eWxlX2NoZWNrZXIuZmlsZV9jb3VudCkK KyAgICAgICAgIyBDb25maXJtIHRoYXQgdGhlIGZpbGUgZG9lcyBub3QgZXhpc3QuCisgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5tb2NrX29zX3BhdGhfZXhpc3RzKGZpbGVfcGF0aCkpCisK KyAgICAgICAgIyBDaGVjayB0aGUgb3V0Y29tZS4KKyAgICAgICAgc2VsZi5jYWxsX2NoZWNrX2Zp bGUoZmlsZV9wYXRoKQorICAgICAgICBzZWxmLmFzc2VydF9hdHRyaWJ1dGVzKE5vbmUsIE5vbmUs IE5vbmUsICIiKQorICAgICAgICBzZWxmLmFzc2VydExvZyhbIkVSUk9SOiBGaWxlIGRvZXMgbm90 IGV4aXN0OiAiCisgICAgICAgICAgICAgICAgICAgICAgICAiZmlsZV9kb2VzX25vdF9leGlzdC50 eHRcbiJdKQogCiAgICAgZGVmIHRlc3RfY2hlY2tfZmlsZV9vbl9za2lwX3dpdGhvdXRfd2Fybmlu ZyhzZWxmKToKICAgICAgICAgIiIiVGVzdCBjaGVja19maWxlKCkgZm9yIGEgc2tpcHBlZC13aXRo b3V0LXdhcm5pbmcgZmlsZS4iIiIKIAotICAgICAgICBmaWxlX3BhdGggPSAiTGF5b3V0VGVzdHMv Zm9vLnR4dCIKKyAgICAgICAgZmlsZV9wYXRoID0gIkxheW91dFRlc3RzL2RvZXNfZXhpc3QvZm9v LnR4dCIKIAogICAgICAgICBkaXNwYXRjaGVyID0gUHJvY2Vzc29yRGlzcGF0Y2hlcigpCiAgICAg ICAgICMgQ29uZmlybSB0aGF0IHRoZSBpbnB1dCBmaWxlIGlzIHRydWx5IGEgc2tpcHBlZC13aXRo b3V0LXdhcm5pbmcgZmlsZS4KQEAgLTYzNCw3ICs2NTIsNyBAQCBjbGFzcyBTdHlsZUNoZWNrZXJD aGVja0ZpbGVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9jaGVja19maWxl X29uX3NraXBfd2l0aF93YXJuaW5nKHNlbGYpOgogICAgICAgICAiIiJUZXN0IGNoZWNrX2ZpbGUo KSBmb3IgYSBza2lwcGVkLXdpdGgtd2FybmluZyBmaWxlLiIiIgogCi0gICAgICAgIGZpbGVfcGF0 aCA9ICJndGsyZHJhd2luZy5jIgorICAgICAgICBmaWxlX3BhdGggPSAiZG9lc19leGlzdC9ndGsy ZHJhd2luZy5jIgogCiAgICAgICAgIGRpc3BhdGNoZXIgPSBQcm9jZXNzb3JEaXNwYXRjaGVyKCkK ICAgICAgICAgIyBDaGVjayB0aGF0IHRoZSBpbnB1dCBmaWxlIGlzIHRydWx5IGEgc2tpcHBlZC13 aXRoLXdhcm5pbmcgZmlsZS4KQEAgLTY0MywxNSArNjYxLDE1IEBAIGNsYXNzIFN0eWxlQ2hlY2tl ckNoZWNrRmlsZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAjIENoZWNrIHRoZSBv dXRjb21lLgogICAgICAgICBzZWxmLmNhbGxfY2hlY2tfZmlsZShmaWxlX3BhdGgpCiAgICAgICAg IHNlbGYuYXNzZXJ0X2F0dHJpYnV0ZXMoTm9uZSwgTm9uZSwgTm9uZSwgIiIpCi0gICAgICAgIHNl bGYuX2xvZy5hc3NlcnRNZXNzYWdlcyhbIldBUk5JTkc6IEZpbGUgZXhlbXB0IGZyb20gc3R5bGUg Z3VpZGUuICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnU2tpcHBpbmc6ICJn dGsyZHJhd2luZy5jIlxuJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0TG9nKFsiV0FSTklORzogRmls ZSBleGVtcHQgZnJvbSBzdHlsZSBndWlkZS4gIgorICAgICAgICAgICAgICAgICAgICAgICAgJ1Nr aXBwaW5nOiAiZG9lc19leGlzdC9ndGsyZHJhd2luZy5jIlxuJ10pCiAKICAgICBkZWYgdGVzdF9j aGVja19maWxlX29uX25vbl9za2lwcGVkKHNlbGYpOgogCiAgICAgICAgICMgV2UgdXNlIGEgQysr IGZpbGUgc2luY2UgYnkgdXNpbmcgYSBDcHBQcm9jZXNzb3IsIHdlIGNhbiBjaGVjawogICAgICAg ICAjIHRoYXQgYWxsIG9mIHRoZSBwb3NzaWJsZSBpbmZvcm1hdGlvbiBpcyBnZXR0aW5nIHBhc3Nl ZCB0bwogICAgICAgICAjIHByb2Nlc3NfZmlsZSAoaW4gcGFydGljdWxhciwgdGhlIG1pbl9jb25m aWRlbmNlIHBhcmFtZXRlcikuCi0gICAgICAgIGZpbGVfYmFzZSA9ICJmb28iCisgICAgICAgIGZp bGVfYmFzZSA9ICJmb29fZG9lc19leGlzdCIKICAgICAgICAgZmlsZV9leHRlbnNpb24gPSAiY3Bw IgogICAgICAgICBmaWxlX3BhdGggPSBmaWxlX2Jhc2UgKyAiLiIgKyBmaWxlX2V4dGVuc2lvbgog Cg==