57298 2011-03-28 22:22:44 -0700 Add tests to PrettyPatch 2011-05-03 14:10:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other All RESOLVED FIXED P4 Normal --- 1 cmarcelo cmarcelo aroben cmarcelo dbates eric oldest_to_newest 375000 0 cmarcelo 2011-03-28 22:22:44 -0700 Add tests to PrettyPatch 375002 1 87260 cmarcelo 2011-03-28 22:28:22 -0700 Created attachment 87260 Patch 375009 2 cmarcelo 2011-03-28 22:36:40 -0700 Hello, as suggested in bug 21222, here is a first shot on making tests for PrettyPatch. I'm adding you (Eric and Adam) since the suggestion came from you. I would really appreciate some Ruby guidance, since I'm not familiar with the idioms. I also focused on the parsing, and not the HTML generation. I think is ok for now. Having tests is convenient, since I plan at some point to improve the parsing code and make it use the information of the ranges earilir instead of trying to do the parsing in separate phases: first dividing the patch in file sections, then finding the chunks inside. This kind of improvement will be helpful for bug 54928, for example. 388486 3 87260 aroben 2011-04-19 07:10:20 -0700 Comment on attachment 87260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87260&action=review > Websites/bugs.webkit.org/PrettyPatch/PrettyPatch_test.rb:24 > + 20528 => [nil, 1, 4, 3, 7], > + 21120 => [nil, 2, 4, 2, 6], > + 21151 => [nil, 4, 9, 1, 16], > + 21152 => [nil, 2, 17, 7, 23], > + 21388 => [nil, 3, 4, 2, 6], Why no titles for these patches? > Websites/bugs.webkit.org/PrettyPatch/PrettyPatch_test.rb:45 > + def get_patch_uri(id) > + "https://bugs.webkit.org/attachment.cgi?id=" + id.to_s > + end > + > + def get_patch(id) > + result = nil > + patch_uri = get_patch_uri(id) > + begin > + result = open(patch_uri) { |f| result = f.read } > + rescue => exception > + assert(false, "Fail to get patch " + patch_uri) > + end > + result > + end It seems a little unfortunate for these tests to have to hit the network. 388527 4 cmarcelo 2011-04-19 08:45:45 -0700 Adam, thanks for the review. (In reply to comment #3) > (From update of attachment 87260 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87260&action=review > > > Websites/bugs.webkit.org/PrettyPatch/PrettyPatch_test.rb:24 > > + 20528 => [nil, 1, 4, 3, 7], > > + 21120 => [nil, 2, 4, 2, 6], > > + 21151 => [nil, 4, 9, 1, 16], > > + 21152 => [nil, 2, 17, 7, 23], > > + 21388 => [nil, 3, 4, 2, 6], > > Why no titles for these patches? I couldn't find a simple way to describe them. But I'll try harder. Some of them came from to previous bug reports of PrettyPatch, maybe in the worst case I can point to the bug report. > It seems a little unfortunate for these tests to have to hit the network. Hmm. For some reason it felt awkward to add the patches themselves to WebKit repo and was unsure about what Subversion would do the files with different line endings. On the other hand I wanted to test the "real cases". So, I think we can live with the test depending on network for now, but I can add them to the repository if you prefer. :-) 395003 5 91612 cmarcelo 2011-04-28 18:25:08 -0700 Created attachment 91612 patch v2, add descriptions for all cases tested Removed patches that had repeated "reason" to be tested. As discussed in IRC, we can live with test that depends on network for now. 397376 6 cmarcelo 2011-05-03 14:09:40 -0700 Committed in http://trac.webkit.org/changeset/85657 397377 7 91612 cmarcelo 2011-05-03 14:10:01 -0700 Comment on attachment 91612 patch v2, add descriptions for all cases tested Clearing flags. 87260 2011-03-28 22:28:22 -0700 2011-04-28 18:25:08 -0700 Patch bug-57298-20110329022903.patch text/plain 4689 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogODIxNDkKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Vi a2l0Lm9yZy9DaGFuZ2VMb2cgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9nCmlu ZGV4IDk4NThhMWNhZTc1ZGU4MzczMzIzNTk5MTY3OTQyNDI0ODBmMjlhMzQuLjU4MmExODkwMzZl MjEzZTI3YTZjNjI1ZTEzZWJmNWZhYTgwYTFkODMgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2J1Z3Mu d2Via2l0Lm9yZy9DaGFuZ2VMb2cKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDExLTAzLTI4ICBDYWlvIE1hcmNlbG8gZGUgT2xpdmVp cmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3RzIHRvIFByZXR0eVBhdGNo CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzI5OAor CisgICAgICAgIFZlcmlmeSB0aGF0ICdwcmV0dGlmeScgcGFyc2UgdGhlIHJpZ2h0IG51bWJlciBv ZiBmaWxlcyBhbmQgcGFydHMKKyAgICAgICAgKGFkZC9yZW1vdmUvc2hhcmVkKSBieSBjaGVja2lu ZyBhIHNldCBvZiBwYXRjaGVzIGF2YWlsYWJsZSBpbgorICAgICAgICBidWdzLndlYmtpdC5vcmcu CisKKyAgICAgICAgKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYjogZXhwb3J0ZWQgYSBjb3Vw bGUgYSBnbG9iYWxzIHdpdGggc3RhdGlzdGljcworICAgICAgICAgIGluZm9ybWF0aW9uIGZvciBv dXIgdGVzdCBzY3JpcHQuCisgICAgICAgICogUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2hfdGVzdC5y YjogQWRkZWQuCisKIDIwMTEtMDMtMTUgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJzaXRl cy9idWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIgYi9XZWJzaXRlcy9i dWdzLndlYmtpdC5vcmcvUHJldHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKaW5kZXggOGY5NjBhOTFm Y2NmOGU2MmQwNjUxZTlkNmMxYjdiNmRiMTNjNmRhZC4uZGQ0OTYyMjVlOWE0OGFmNzY4ZWNjMmIy YjAwMTU2M2EzZDY3ODlmNiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1By ZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9Q cmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgpAQCAtMTIsNiArMTIsOCBAQCBwdWJsaWMKICAgICBH SVRfUEFUSCA9ICJnaXQiCiAKICAgICBkZWYgc2VsZi5wcmV0dGlmeShzdHJpbmcpCisgICAgICAg ICRsYXN0X3ByZXR0aWZ5X2ZpbGVfY291bnQgPSAtMQorICAgICAgICAkbGFzdF9wcmV0dGlmeV9w YXJ0X2NvdW50ID0geyAicmVtb3ZlIiA9PiAwLCAiYWRkIiA9PiAwLCAic2hhcmVkIiA9PiAwIH0K ICAgICAgICAgc3RyaW5nID0gbm9ybWFsaXplX2xpbmVfZW5kaW5nKHN0cmluZykKICAgICAgICAg ZmlsZURpZmZzID0gRmlsZURpZmYucGFyc2Uoc3RyaW5nKQogCkBAIC0yNyw2ICsyOSw3IEBAIHB1 YmxpYwogICAgICAgICAgICAgYnJlYWsKICAgICAgICAgZW5kCiAKKyAgICAgICAgJGxhc3RfcHJl dHRpZnlfZmlsZV9jb3VudCA9IGZpbGVEaWZmcy5jb3VudAogICAgICAgICBzdHIgKz0gZmlsZURp ZmZzLmNvbGxlY3R7IHxkaWZmfCBkaWZmLnRvX2h0bWwgfS5qb2luCiAgICAgZW5kCiAKQEAgLTY1 Niw2ICs2NTksNyBAQCBFTkQKICAgICAgICAgYXR0ciA6bGluZXMKIAogICAgICAgICBkZWYgaW5p dGlhbGl6ZShjbGFzc05hbWUsIGNvbnRhaW5lcikKKyAgICAgICAgICAgICRsYXN0X3ByZXR0aWZ5 X3BhcnRfY291bnRbY2xhc3NOYW1lXSArPSAxCiAgICAgICAgICAgICBAY2xhc3NOYW1lID0gY2xh c3NOYW1lCiAgICAgICAgICAgICBAbGluZXMgPSBbXQogICAgICAgICAgICAgY29udGFpbmVyLnBh cnRzIDw8IHNlbGYKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQ YXRjaC9QcmV0dHlQYXRjaF90ZXN0LnJiIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0 eVBhdGNoL1ByZXR0eVBhdGNoX3Rlc3QucmIKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzliYTdmYWZmZWZlMTdmNTQx MjYwMjhiMDE4MjYyM2ZkMzg5NDk0NQotLS0gL2Rldi9udWxsCisrKyBiL1dlYnNpdGVzL2J1Z3Mu d2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaF90ZXN0LnJiCkBAIC0wLDAgKzEsNjYg QEAKKyMhL3Vzci9iaW4vcnVieQorCityZXF1aXJlICd0ZXN0L3VuaXQnCityZXF1aXJlICdvcGVu LXVyaScKK3JlcXVpcmUgJ1ByZXR0eVBhdGNoJworCisjIE5vdGU6IGludGVybmV0IGNvbm5lY3Rp b24gaXMgbmVlZGVkIHRvIHJ1biB0aGlzIHRlc3Qgc3VpdGUuCisKK2NsYXNzIFByZXR0eVBhdGNo X3Rlc3QgPCBUZXN0OjpVbml0OjpUZXN0Q2FzZQorICAgIGNsYXNzIEluZm8KKyAgICAgICAgVElU TEUgPSAwCisgICAgICAgIEZJTEUgPSAxCisgICAgICAgIEFERCA9IDIKKyAgICAgICAgUkVNT1ZF ID0gMworICAgICAgICBTSEFSRUQgPSA0CisgICAgZW5kCisKKyAgICBQQVRDSEVTID0geworICAg ICAgICAyMDUxMCA9PiBbIlNpbmdsZSBjaGFuZ2UiLCAxLCAxLCAwLCAyXSwKKyAgICAgICAgMjA1 MjggPT4gW25pbCwgMSwgNCwgMywgN10sCisgICAgICAgIDIxMTIwID0+IFtuaWwsIDIsIDQsIDIs IDZdLAorICAgICAgICAyMTE1MSA9PiBbbmlsLCA0LCA5LCAxLCAxNl0sCisgICAgICAgIDIxMTUy ID0+IFtuaWwsIDIsIDE3LCA3LCAyM10sCisgICAgICAgIDIxMzg4ID0+IFtuaWwsIDMsIDQsIDIs IDZdLAorICAgICAgICAyMzkyMCA9PiBbIk1hYyBsaW5lIGVuZGluZyIsIDMsIDMsIDAsIDVdLAor ICAgICAgICAzOTYxNSA9PiBbIkdpdCBzaWduYXR1cmUiLCAyLCAyLCAwLCAzXSwKKyAgICAgICAg ODA4NTIgPT4gWyJDaGFuZ2VzIG9uZSBsaW5lIHBsdXMgQ2hhbmdlTG9nIiwgMiwgMiwgMSwgNF0s CisgICAgICAgIDgzMTI3ID0+IFsiT25seSBhZGQgc3R1ZmYiLCAyLCAyLCAwLCAzXSwKKyAgICAg ICAgODUwNzEgPT4gWyJBZGRzIGFuZCByZW1vdmVzIGZyb20gYSBmaWxlIHBsdXMgZ2l0IHNpZ25h dHVyZSIsIDIsIDUsIDMsIDldLAorICAgIH0KKworICAgIGRlZiBnZXRfcGF0Y2hfdXJpKGlkKQor ICAgICAgICAiaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvYXR0YWNobWVudC5jZ2k/aWQ9IiArIGlk LnRvX3MKKyAgICBlbmQKKworICAgIGRlZiBnZXRfcGF0Y2goaWQpCisgICAgICAgIHJlc3VsdCA9 IG5pbAorICAgICAgICBwYXRjaF91cmkgPSBnZXRfcGF0Y2hfdXJpKGlkKQorICAgICAgICBiZWdp bgorICAgICAgICAgICAgcmVzdWx0ID0gb3BlbihwYXRjaF91cmkpIHsgfGZ8IHJlc3VsdCA9IGYu cmVhZCB9CisgICAgICAgIHJlc2N1ZSA9PiBleGNlcHRpb24KKyAgICAgICAgICAgIGFzc2VydChm YWxzZSwgIkZhaWwgdG8gZ2V0IHBhdGNoICIgKyBwYXRjaF91cmkpCisgICAgICAgIGVuZAorICAg ICAgICByZXN1bHQKKyAgICBlbmQKKworICAgIGRlZiBjaGVja19vbmVfcGF0Y2goaWQsIGluZm8p CisgICAgICAgIHBhdGNoID0gZ2V0X3BhdGNoKGlkKQorICAgICAgICBkZXNjcmlwdGlvbiA9IGdl dF9wYXRjaF91cmkoaWQpCisgICAgICAgIGRlc2NyaXB0aW9uICs9ICAiICgiICsgaW5mb1tJbmZv OjpUSVRMRV0gKyAiKSIgdW5sZXNzIGluZm9bSW5mbzo6VElUTEVdLm5pbD8KKyAgICAgICAgcHV0 cyAiVGVzdGluZyAiICsgZGVzY3JpcHRpb24KKyAgICAgICAgcHJldHR5ID0gbmlsCisgICAgICAg IGFzc2VydF9ub3RoaW5nX3JhaXNlZCgiQ3Jhc2ggd2hpbGUgcHJldHRpZnlpbmcgIiArIGRlc2Ny aXB0aW9uKSB7CisgICAgICAgICAgICBwcmV0dHkgPSBQcmV0dHlQYXRjaC5wcmV0dGlmeShwYXRj aCkKKyAgICAgICAgfQorICAgICAgICBhc3NlcnQocHJldHR5LCAiRW1wdHkgcmVzdWx0IHdoaWxl IHByZXR0aWZ5aW5nICIgKyBkZXNjcmlwdGlvbikKKyAgICAgICAgYXNzZXJ0X2VxdWFsKGluZm9b SW5mbzo6RklMRV0sICRsYXN0X3ByZXR0aWZ5X2ZpbGVfY291bnQsICJXcm9uZyBudW1iZXIgb2Yg ZmlsZXMgY2hhbmdlZCBpbiAiICsgZGVzY3JpcHRpb24pCisgICAgICAgIGFzc2VydF9lcXVhbChp bmZvW0luZm86OkFERF0sICRsYXN0X3ByZXR0aWZ5X3BhcnRfY291bnRbImFkZCJdLCAiV3Jvbmcg bnVtYmVyIG9mICdhZGQnIHBhcnRzIGluICIgKyBkZXNjcmlwdGlvbikKKyAgICAgICAgYXNzZXJ0 X2VxdWFsKGluZm9bSW5mbzo6UkVNT1ZFXSwgJGxhc3RfcHJldHRpZnlfcGFydF9jb3VudFsicmVt b3ZlIl0sICJXcm9uZyBudW1iZXIgb2YgJ3JlbW92ZScgcGFydHMgaW4gIiArIGRlc2NyaXB0aW9u KQorICAgICAgICBhc3NlcnRfZXF1YWwoaW5mb1tJbmZvOjpTSEFSRURdLCAkbGFzdF9wcmV0dGlm eV9wYXJ0X2NvdW50WyJzaGFyZWQiXSwgIldyb25nIG51bWJlciBvZiAnc2hhcmVkJyBwYXJ0cyBp biAiICsgZGVzY3JpcHRpb24pCisgICAgZW5kCisKKyAgICBkZWYgdGVzdF9wYXRjaGVzCisgICAg ICAgIFBBVENIRVMuZWFjaCB7IHxpZCwgaW5mb3wgY2hlY2tfb25lX3BhdGNoKGlkLCBpbmZvKSB9 CisgICAgZW5kCitlbmQK 91612 2011-04-28 18:25:08 -0700 2011-05-03 14:10:01 -0700 patch v2, add descriptions for all cases tested 0001-Add-tests-to-PrettyPatch.patch text/plain 5527 cmarcelo RnJvbSA3ZjA2ZGMxNTYxZTVlYjA4ZjJhNzRjNGE4MDY0MDhlMzFkN2FhNTkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDYWlvIE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gPGNhaW8u b2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4KRGF0ZTogVGh1LCAyOCBBcHIgMjAxMSAyMjowNjo1OCAt MDMwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCB0ZXN0cyB0byBQcmV0dHlQYXRjaAogaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3Mjk4CgpSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KClZlcmlmeSB0aGF0ICdwcmV0dGlmeScgcGFyc2UgdGhlIHJpZ2h0IG51bWJlciBv ZiBmaWxlcyBhbmQgcGFydHMKKGFkZC9yZW1vdmUvc2hhcmVkKSBieSBjaGVja2luZyBhIHNldCBv ZiBwYXRjaGVzIGF2YWlsYWJsZSBpbgpidWdzLndlYmtpdC5vcmcuCgoqIFByZXR0eVBhdGNoL1By ZXR0eVBhdGNoLnJiOiBleHBvcnRlZCBhIGNvdXBsZSBhIGdsb2JhbHMgd2l0aApzdGF0aXN0aWNz IGluZm9ybWF0aW9uIGZvciBvdXIgdGVzdCBzY3JpcHQuCiogUHJldHR5UGF0Y2gvUHJldHR5UGF0 Y2hfdGVzdC5yYjogQWRkZWQuCi0tLQogV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrCiAuLi4vYnVncy53ZWJraXQub3JnL1ByZXR0 eVBhdGNoL1ByZXR0eVBhdGNoLnJiICAgICB8ICAgIDQgKwogLi4uL1ByZXR0eVBhdGNoL1ByZXR0 eVBhdGNoX3Rlc3QucmIgICAgICAgICAgICAgICAgfCAgIDY1ICsrKysrKysrKysrKysrKysrKysr CiAzIGZpbGVzIGNoYW5nZWQsIDg0IGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCiBjcmVh dGUgbW9kZSAxMDA3NTUgV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBhdGNoL1ByZXR0 eVBhdGNoX3Rlc3QucmIKCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hh bmdlTG9nIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL0NoYW5nZUxvZwppbmRleCAzOGRlYzA0 Li5lZGJmYTQwIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvQ2hhbmdlTG9n CisrKyBiL1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBA QAorMjAxMS0wNC0yOCAgQ2FpbyBNYXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2 ZWlyYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCB0ZXN0cyB0byBQcmV0dHlQYXRjaAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyOTgKKworICAgICAgICBWZXJpZnkgdGhh dCAncHJldHRpZnknIHBhcnNlIHRoZSByaWdodCBudW1iZXIgb2YgZmlsZXMgYW5kIHBhcnRzCisg ICAgICAgIChhZGQvcmVtb3ZlL3NoYXJlZCkgYnkgY2hlY2tpbmcgYSBzZXQgb2YgcGF0Y2hlcyBh dmFpbGFibGUgaW4KKyAgICAgICAgYnVncy53ZWJraXQub3JnLgorCisgICAgICAgICogUHJldHR5 UGF0Y2gvUHJldHR5UGF0Y2gucmI6IGV4cG9ydGVkIGEgY291cGxlIGEgZ2xvYmFscyB3aXRoCisg ICAgICAgIHN0YXRpc3RpY3MgaW5mb3JtYXRpb24gZm9yIG91ciB0ZXN0IHNjcmlwdC4KKyAgICAg ICAgKiBQcmV0dHlQYXRjaC9QcmV0dHlQYXRjaF90ZXN0LnJiOiBBZGRlZC4KKwogMjAxMS0wNC0y MiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBDb2RlIGNo YW5nZXMgYnkgQWRhbSBCYXJ0aC4gUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBh L1dlYnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYiBiL1dl YnNpdGVzL2J1Z3Mud2Via2l0Lm9yZy9QcmV0dHlQYXRjaC9QcmV0dHlQYXRjaC5yYgppbmRleCBl NTU2YjFkLi5iOGUyZmI0IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJl dHR5UGF0Y2gvUHJldHR5UGF0Y2gucmIKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1By ZXR0eVBhdGNoL1ByZXR0eVBhdGNoLnJiCkBAIC0xMiw2ICsxMiw4IEBAIHB1YmxpYwogICAgIEdJ VF9QQVRIID0gImdpdCIKIAogICAgIGRlZiBzZWxmLnByZXR0aWZ5KHN0cmluZykKKyAgICAgICAg JGxhc3RfcHJldHRpZnlfZmlsZV9jb3VudCA9IC0xCisgICAgICAgICRsYXN0X3ByZXR0aWZ5X3Bh cnRfY291bnQgPSB7ICJyZW1vdmUiID0+IDAsICJhZGQiID0+IDAsICJzaGFyZWQiID0+IDAgfQog ICAgICAgICBzdHJpbmcgPSBub3JtYWxpemVfbGluZV9lbmRpbmcoc3RyaW5nKQogICAgICAgICBm aWxlRGlmZnMgPSBGaWxlRGlmZi5wYXJzZShzdHJpbmcpCiAKQEAgLTI3LDYgKzI5LDcgQEAgcHVi bGljCiAgICAgICAgICAgICBicmVhawogICAgICAgICBlbmQKIAorICAgICAgICAkbGFzdF9wcmV0 dGlmeV9maWxlX2NvdW50ID0gZmlsZURpZmZzLmNvdW50CiAgICAgICAgIHN0ciArPSBmaWxlRGlm ZnMuY29sbGVjdHsgfGRpZmZ8IGRpZmYudG9faHRtbCB9LmpvaW4KICAgICBlbmQKIApAQCAtNjgy LDYgKzY4NSw3IEBAIEVORAogICAgICAgICBhdHRyIDpsaW5lcwogCiAgICAgICAgIGRlZiBpbml0 aWFsaXplKGNsYXNzTmFtZSwgY29udGFpbmVyKQorICAgICAgICAgICAgJGxhc3RfcHJldHRpZnlf cGFydF9jb3VudFtjbGFzc05hbWVdICs9IDEKICAgICAgICAgICAgIEBjbGFzc05hbWUgPSBjbGFz c05hbWUKICAgICAgICAgICAgIEBsaW5lcyA9IFtdCiAgICAgICAgICAgICBjb250YWluZXIucGFy dHMgPDwgc2VsZgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnVncy53ZWJraXQub3JnL1ByZXR0eVBh dGNoL1ByZXR0eVBhdGNoX3Rlc3QucmIgYi9XZWJzaXRlcy9idWdzLndlYmtpdC5vcmcvUHJldHR5 UGF0Y2gvUHJldHR5UGF0Y2hfdGVzdC5yYgpuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAw MDAwLi44YjcxNGNiCi0tLSAvZGV2L251bGwKKysrIGIvV2Vic2l0ZXMvYnVncy53ZWJraXQub3Jn L1ByZXR0eVBhdGNoL1ByZXR0eVBhdGNoX3Rlc3QucmIKQEAgLTAsMCArMSw2NSBAQAorIyEvdXNy L2Jpbi9ydWJ5CisKK3JlcXVpcmUgJ3Rlc3QvdW5pdCcKK3JlcXVpcmUgJ29wZW4tdXJpJworcmVx dWlyZSAnUHJldHR5UGF0Y2gnCisKKyMgTm90ZTogaW50ZXJuZXQgY29ubmVjdGlvbiBpcyBuZWVk ZWQgdG8gcnVuIHRoaXMgdGVzdCBzdWl0ZS4KKworY2xhc3MgUHJldHR5UGF0Y2hfdGVzdCA8IFRl c3Q6OlVuaXQ6OlRlc3RDYXNlCisgICAgY2xhc3MgSW5mbworICAgICAgICBUSVRMRSA9IDAKKyAg ICAgICAgRklMRSA9IDEKKyAgICAgICAgQUREID0gMgorICAgICAgICBSRU1PVkUgPSAzCisgICAg ICAgIFNIQVJFRCA9IDQKKyAgICBlbmQKKworICAgIFBBVENIRVMgPSB7CisgICAgICAgIDIwNTEw ID0+IFsiU2luZ2xlIGNoYW5nZSIsIDEsIDEsIDAsIDJdLAorICAgICAgICAyMDUyOCA9PiBbIk5v ICdJbmRleCcgb3IgJ2RpZmYnIGluIHBhdGNoIGhlYWRlciIsIDEsIDQsIDMsIDddLAorICAgICAg ICAyMTE1MSA9PiBbIkxlYWRpbmcgJy8nIGluIHRoZSBwYXRoIG9mIGZpbGVzIiwgNCwgOSwgMSwg MTZdLAorICAgICAgICAjIEJpbmFyeSBmaWxlcyB1c2Ugc2hhcmVkIGJsb2NrcywgdGhlcmUgYXJl IHRocmVlIGluIDMwNDg4LgorICAgICAgICAzMDQ4OCA9PiBbIlF1b3RlZCBmaWxlbmFtZXMgaW4g Z2l0IGRpZmYiLCAyMywgMjgsIDI1LCA2NCArIDNdLAorICAgICAgICAyMzkyMCA9PiBbIk1hYyBs aW5lIGVuZGluZyIsIDMsIDMsIDAsIDVdLAorICAgICAgICAzOTYxNSA9PiBbIkdpdCBzaWduYXR1 cmUiLCAyLCAyLCAwLCAzXSwKKyAgICAgICAgODA4NTIgPT4gWyJDaGFuZ2VzIG9uZSBsaW5lIHBs dXMgQ2hhbmdlTG9nIiwgMiwgMiwgMSwgNF0sCisgICAgICAgIDgzMTI3ID0+IFsiT25seSBhZGQg c3R1ZmYiLCAyLCAyLCAwLCAzXSwKKyAgICAgICAgODUwNzEgPT4gWyJBZGRzIGFuZCByZW1vdmVz IGZyb20gYSBmaWxlIHBsdXMgZ2l0IHNpZ25hdHVyZSIsIDIsIDUsIDMsIDldLAorICAgIH0KKwor ICAgIGRlZiBnZXRfcGF0Y2hfdXJpKGlkKQorICAgICAgICAiaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvYXR0YWNobWVudC5jZ2k/aWQ9IiArIGlkLnRvX3MKKyAgICBlbmQKKworICAgIGRlZiBnZXRf cGF0Y2goaWQpCisgICAgICAgIHJlc3VsdCA9IG5pbAorICAgICAgICBwYXRjaF91cmkgPSBnZXRf cGF0Y2hfdXJpKGlkKQorICAgICAgICBiZWdpbgorICAgICAgICAgICAgcmVzdWx0ID0gb3Blbihw YXRjaF91cmkpIHsgfGZ8IHJlc3VsdCA9IGYucmVhZCB9CisgICAgICAgIHJlc2N1ZSA9PiBleGNl cHRpb24KKyAgICAgICAgICAgIGFzc2VydChmYWxzZSwgIkZhaWwgdG8gZ2V0IHBhdGNoICIgKyBw YXRjaF91cmkpCisgICAgICAgIGVuZAorICAgICAgICByZXN1bHQKKyAgICBlbmQKKworICAgIGRl ZiBjaGVja19vbmVfcGF0Y2goaWQsIGluZm8pCisgICAgICAgIHBhdGNoID0gZ2V0X3BhdGNoKGlk KQorICAgICAgICBkZXNjcmlwdGlvbiA9IGdldF9wYXRjaF91cmkoaWQpCisgICAgICAgIGRlc2Ny aXB0aW9uICs9ICAiICgiICsgaW5mb1tJbmZvOjpUSVRMRV0gKyAiKSIgdW5sZXNzIGluZm9bSW5m bzo6VElUTEVdLm5pbD8KKyAgICAgICAgcHV0cyAiVGVzdGluZyAiICsgZGVzY3JpcHRpb24KKyAg ICAgICAgcHJldHR5ID0gbmlsCisgICAgICAgIGFzc2VydF9ub3RoaW5nX3JhaXNlZCgiQ3Jhc2gg d2hpbGUgcHJldHRpZnlpbmcgIiArIGRlc2NyaXB0aW9uKSB7CisgICAgICAgICAgICBwcmV0dHkg PSBQcmV0dHlQYXRjaC5wcmV0dGlmeShwYXRjaCkKKyAgICAgICAgfQorICAgICAgICBhc3NlcnQo cHJldHR5LCAiRW1wdHkgcmVzdWx0IHdoaWxlIHByZXR0aWZ5aW5nICIgKyBkZXNjcmlwdGlvbikK KyAgICAgICAgYXNzZXJ0X2VxdWFsKGluZm9bSW5mbzo6RklMRV0sICRsYXN0X3ByZXR0aWZ5X2Zp bGVfY291bnQsICJXcm9uZyBudW1iZXIgb2YgZmlsZXMgY2hhbmdlZCBpbiAiICsgZGVzY3JpcHRp b24pCisgICAgICAgIGFzc2VydF9lcXVhbChpbmZvW0luZm86OkFERF0sICRsYXN0X3ByZXR0aWZ5 X3BhcnRfY291bnRbImFkZCJdLCAiV3JvbmcgbnVtYmVyIG9mICdhZGQnIHBhcnRzIGluICIgKyBk ZXNjcmlwdGlvbikKKyAgICAgICAgYXNzZXJ0X2VxdWFsKGluZm9bSW5mbzo6UkVNT1ZFXSwgJGxh c3RfcHJldHRpZnlfcGFydF9jb3VudFsicmVtb3ZlIl0sICJXcm9uZyBudW1iZXIgb2YgJ3JlbW92 ZScgcGFydHMgaW4gIiArIGRlc2NyaXB0aW9uKQorICAgICAgICBhc3NlcnRfZXF1YWwoaW5mb1tJ bmZvOjpTSEFSRURdLCAkbGFzdF9wcmV0dGlmeV9wYXJ0X2NvdW50WyJzaGFyZWQiXSwgIldyb25n IG51bWJlciBvZiAnc2hhcmVkJyBwYXJ0cyBpbiAiICsgZGVzY3JpcHRpb24pCisgICAgZW5kCisK KyAgICBkZWYgdGVzdF9wYXRjaGVzCisgICAgICAgIFBBVENIRVMuZWFjaCB7IHxpZCwgaW5mb3wg Y2hlY2tfb25lX3BhdGNoKGlkLCBpbmZvKSB9CisgICAgZW5kCitlbmQKLS0gCjEuNy40LjQKCg==