47709 2010-10-14 19:40:20 -0700 mocktool.MockOptions shouldn't default values to objects 2010-10-15 18:31:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 47510 1 dpranke dpranke abarth cjerdonek eric oldest_to_newest 294540 0 dpranke 2010-10-14 19:40:20 -0700 mocktool.MockOptions shouldn't default values to objects 294549 1 70824 dpranke 2010-10-14 19:51:30 -0700 Created attachment 70824 Patch 294554 2 dpranke 2010-10-14 20:07:41 -0700 see ChangeLog for motivation ... 294915 3 70824 eric 2010-10-15 14:09:12 -0700 Comment on attachment 70824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=70824&action=review Fantastic! Thanks! > WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py:46 > + options.blocks = True > + options.cc = 'MOCK cc' > + options.component = 'MOCK component' > + options.confirm = True > + options.email = 'MOCK email' > + options.git_commit = 'MOCK git commit' > + options.obsolete_patches = True > + options.open_bug = True > + options.port = 'MOCK port' > + options.quiet = True > + options.reviewer = 'MOCK reviewer' So this was the minimum list required to get the tests to pass I assume? > WebKitTools/Scripts/webkitpy/tool/mocktool.py:587 > +class MockOptions(object): > + def __init__(self, **kwargs): > + for key, value in kwargs.items(): > + self.__dict__[key] = value Very slick! You might want to add a comment here to explain why we don't have any default options here. Maybe we should? Or maybe we should have a WebKitPatchMockOptions which has a bunch of global defaults? (like port = None) 294934 4 dpranke 2010-10-15 14:51:39 -0700 (In reply to comment #3) > (From update of attachment 70824 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=70824&action=review > > Fantastic! Thanks! > > > WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py:46 > > + options.blocks = True > > + options.cc = 'MOCK cc' > > + options.component = 'MOCK component' > > + options.confirm = True > > + options.email = 'MOCK email' > > + options.git_commit = 'MOCK git commit' > > + options.obsolete_patches = True > > + options.open_bug = True > > + options.port = 'MOCK port' > > + options.quiet = True > > + options.reviewer = 'MOCK reviewer' > > So this was the minimum list required to get the tests to pass I assume? > Yes. > > WebKitTools/Scripts/webkitpy/tool/mocktool.py:587 > > +class MockOptions(object): > > + def __init__(self, **kwargs): > > + for key, value in kwargs.items(): > > + self.__dict__[key] = value > > Very slick! > > You might want to add a comment here to explain why we don't have any default options here. Maybe we should? Or maybe we should have a WebKitPatchMockOptions which has a bunch of global defaults? (like port = None) I can add a comment. If we're going to reuse MockOptions for different kinds of unit tests (for example, tool and port) then there isn't a single set of defaults that make sense. Various unit tests do have some sets of defaults and wrappers. 295084 5 70940 dpranke 2010-10-15 18:27:03 -0700 Created attachment 70940 Patch 295086 6 dpranke 2010-10-15 18:31:28 -0700 Committed r69905: <http://trac.webkit.org/changeset/69905> 70824 2010-10-14 19:51:30 -0700 2010-10-15 18:27:00 -0700 Patch bug-47709-20101014195129.patch text/plain 9056 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwM2I4ZTZhMWUxNjFmMWU3NjI2M2RkOTAzYzIxMDJiNmZjMjA2MmRmLi5lMDAzYTM3 MTZlYjYwM2RlOTdiZDhlNzY3NTgwNmM0ZmJiM2IwM2E3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzUgQEAK IDIwMTAtMTAtMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbW9ja3Rvb2wuTW9ja09w dGlvbnMgaXMgaW5oZXJpdGluZyBmcm9tIE1vY2ssIHdoaWNoIGhhcyB0aGUgc2lkZQorICAgICAg ICBlZmZlY3Qgb2YgZGVmYXVsdGluZyBhbnkgYXR0cmlidXRlIHRvIGFub3RoZXIgTW9ja09iamVj dC4gU28sCisgICAgICAgIE1vY2tPcHRpb25zKCkuZm9vIHdvdWxkIGFsd2F5cyBldmFsdWF0ZSB0 byB0cnVlLiBUaGlzIHdhcworICAgICAgICBjb3ZlcmluZyBvdmVyIGJ1Z3MgaW4gdGhlIHVuaXQg dGVzdHMsIGFuZCBpcyBwcm9iYWJseSB0aGUgd3JvbmcKKyAgICAgICAgZGVmYXVsdCBiZWhhdmlv ciBmb3IgYW55dGhpbmcgYXR0ZW1wdGluZyB0byBtb2NrIG91dCB0aGUgb3B0aW9ucworICAgICAg ICBhcmd1bWVudCByZXR1cm5lZCBmcm9tIG9wdHBhcnNlLnBhcnNlX2FyZ3MoKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIGRlZmF1bHQgYmVoYXZpb3IuIFRoZSBuZXcgTW9ja09w dGlvbnMoKQorICAgICAgICBjbGFzcyB0YWtlcyBhbiBvcHRpb25hbCBsaXN0IG9mIGtleXdvcmQg cGFyYW1ldGVycyB0byBzZXQ7IHRoaXMKKyAgICAgICAgcGF0Y2ggZG9lc24ndCB1c2UgdGhhdCBm ZWF0dXJlIGJ1dCB0aGUgZml4IGZvciBidWcgNDc1MTAgd2lsbC4KKworICAgICAgICBBbHNvLCB0 aGlzIHBhdGNoIGp1c3QgZmlsbHMgaW4gdGhlIGRlZmF1bHQgdmFsdWVzIG5lY2Vzc2FyeSB0bwor ICAgICAgICBnZXQgYWxsIG9mIHRoZSB0ZXN0cyB0byBwYXNzOyBJIGRpZG4ndCBzdGFyZSBhdCBl YWNoIHRlc3QgYnkKKyAgICAgICAgaGFuZCB0byBkZXRlcm1pbmUgdGhlICJyaWdodCIgdmFsdWVz LiBXZSBjYW4gZWl0aGVyIGZpeCB0aGF0IGluCisgICAgICAgIHN1YnNlcXVlbnQgcGF0Y2hlcyBv ciBsZXQgbWUga25vdyBpZiB3ZSB3YW50IHRvIGRvIHRoYXQgbm93IChhbmQKKyAgICAgICAgZ2l2 ZSBtZSBzb21lIGd1aWRhbmNlIG9uIHdoYXQgdGhvc2UgdmFsdWVzIG1pZ2h0IHdhbnQgdG8gYmUp LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzcw OQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2NvbW1hbmR0ZXN0 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91 bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBs b2FkX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9v bC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRl c3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZWNoYW5n ZWxvZ3N3aXRocmV2aWV3X3VuaXR0ZXN0LnB5OgorCisyMDEwLTEwLTE0ICBEaXJrIFByYW5rZSAg PGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgogCiAgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIHdpbGwgbm93IGhhbmRsZSBtaXNzaW5n IFJ1YnkgaW5zdGFsbHMgKG9yCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvY29tbWFuZHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvY29tbWFuZHRlc3QucHkKaW5kZXggZGU5MmNkM2JkYjA4MjFi NWI3MjcyMGYzMDJhNDlkYmZjM2U3MzkzZS4uYWRjNmQ4MTdmODJmYzVkN2ZhNTU1MjMyYTBjYzM0 MGQ3Yzg2MGU1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2NvbW1hbmR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9jb21tYW5kdGVzdC5weQpAQCAtMzMsNSArMzMsMTYgQEAgZnJvbSB3 ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2NrT3B0aW9ucywgTW9ja1Rvb2wKIAogY2xh c3MgQ29tbWFuZHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgYXNzZXJ0X2V4ZWN1 dGVfb3V0cHV0cyhzZWxmLCBjb21tYW5kLCBhcmdzLCBleHBlY3RlZF9zdGRvdXQ9IiIsIGV4cGVj dGVkX3N0ZGVycj0iIiwgb3B0aW9ucz1Nb2NrT3B0aW9ucygpLCB0b29sPU1vY2tUb29sKCkpOgor ICAgICAgICBvcHRpb25zLmJsb2NrcyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5jYyA9ICdNT0NL IGNjJworICAgICAgICBvcHRpb25zLmNvbXBvbmVudCA9ICdNT0NLIGNvbXBvbmVudCcKKyAgICAg ICAgb3B0aW9ucy5jb25maXJtID0gVHJ1ZQorICAgICAgICBvcHRpb25zLmVtYWlsID0gJ01PQ0sg ZW1haWwnCisgICAgICAgIG9wdGlvbnMuZ2l0X2NvbW1pdCA9ICdNT0NLIGdpdCBjb21taXQnCisg ICAgICAgIG9wdGlvbnMub2Jzb2xldGVfcGF0Y2hlcyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5v cGVuX2J1ZyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5wb3J0ID0gJ01PQ0sgcG9ydCcKKyAgICAg ICAgb3B0aW9ucy5xdWlldCA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5yZXZpZXdlciA9ICdNT0NL IHJldmlld2VyJwogICAgICAgICBjb21tYW5kLmJpbmRfdG9fdG9vbCh0b29sKQogICAgICAgICBP dXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgY29tbWFuZC5leGVjdXRlLCBbb3B0 aW9ucywgYXJncywgdG9vbF0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQsIGV4cGVj dGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxvYWRfdW5pdHRlc3QucHkK aW5kZXggZmFkZGQ1MDU2MzVmMzc5Yjg3MTJjNDdmMDAzYTliMDJhZDAxY2NmMi4uNmFmMWY2NGIy ZjhmMzcwZjJkYzIzMzhjN2Q2NDJlYmJiY2UzNTRmYiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rvd25sb2FkX3VuaXR0ZXN0LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91bml0 dGVzdC5weQpAQCAtNTcsMTUgKzU3LDE5IEBAIGNsYXNzIEFic3RyYWN0Um9sbG91dFByZXBDb21t YW5kVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiBjbGFzcyBEb3dubG9hZENvbW1hbmRzVGVzdChD b21tYW5kc1Rlc3QpOgogICAgIGRlZiBfZGVmYXVsdF9vcHRpb25zKHNlbGYpOgogICAgICAgICBv cHRpb25zID0gTW9ja09wdGlvbnMoKQotICAgICAgICBvcHRpb25zLmZvcmNlX2NsZWFuID0gRmFs c2UKLSAgICAgICAgb3B0aW9ucy5jbGVhbiA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5idWlsZCA9 IFRydWUKKyAgICAgICAgb3B0aW9ucy5idWlsZF9zdHlsZSA9IFRydWUKICAgICAgICAgb3B0aW9u cy5jaGVja19idWlsZGVycyA9IFRydWUKLSAgICAgICAgb3B0aW9ucy5xdWlldCA9IEZhbHNlCisg ICAgICAgIG9wdGlvbnMuY2hlY2tfc3R5bGUgPSBUcnVlCisgICAgICAgIG9wdGlvbnMuY2xlYW4g PSBUcnVlCisgICAgICAgIG9wdGlvbnMuY2xvc2VfYnVnID0gVHJ1ZQorICAgICAgICBvcHRpb25z LmZvcmNlX2NsZWFuID0gRmFsc2UKKyAgICAgICAgb3B0aW9ucy5mb3JjZV9wYXRjaCA9IFRydWUK ICAgICAgICAgb3B0aW9ucy5ub25faW50ZXJhY3RpdmUgPSBGYWxzZQotICAgICAgICBvcHRpb25z LnVwZGF0ZSA9IFRydWUKLSAgICAgICAgb3B0aW9ucy5idWlsZCA9IFRydWUKKyAgICAgICAgb3B0 aW9ucy5wYXJlbnRfY29tbWFuZCA9ICdNT0NLIHBhcmVudCBjb21tYW5kJworICAgICAgICBvcHRp b25zLnF1aWV0ID0gRmFsc2UKICAgICAgICAgb3B0aW9ucy50ZXN0ID0gVHJ1ZQotICAgICAgICBv cHRpb25zLmNsb3NlX2J1ZyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy51cGRhdGUgPSBUcnVlCiAg ICAgICAgIHJldHVybiBvcHRpb25zCiAKICAgICBkZWYgdGVzdF9idWlsZChzZWxmKToKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWRf dW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMv dXBsb2FkX3VuaXR0ZXN0LnB5CmluZGV4IDg4N2QzYjYxNzlmZDdmYmVjZWRlMDMwYmUwY2JmNDA4 NDlmMmRhZWEuLjBkMDk2YjY0MWY1ZTNhNjE0MTFiZWE3NjgyMTJkMzBlN2M0ODFkNjUgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy91cGxvYWRf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1h bmRzL3VwbG9hZF91bml0dGVzdC5weQpAQCAtNTIsMTEgKzUyLDEyIEBAIGNsYXNzIFVwbG9hZENv bW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogCiAgICAgZGVmIHRlc3RfcG9zdChzZWxmKToKICAg ICAgICAgb3B0aW9ucyA9IE1vY2tPcHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5jYyA9IE5vbmUK KyAgICAgICAgb3B0aW9ucy5jaGVja19zdHlsZSA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5jb21t ZW50ID0gTm9uZQogICAgICAgICBvcHRpb25zLmRlc2NyaXB0aW9uID0gIk1PQ0sgZGVzY3JpcHRp b24iCiAgICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21taXQgPSBGYWxzZQogICAgICAgICBvcHRp b25zLnJldmlldyA9IFRydWUKLSAgICAgICAgb3B0aW9ucy5jb21tZW50ID0gTm9uZQotICAgICAg ICBvcHRpb25zLmNjID0gTm9uZQogICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiIiJSdW5uaW5n IGNoZWNrLXdlYmtpdC1zdHlsZQogTU9DSzogdXNlci5vcGVuX3VybDogZmlsZTovLy4uLgogT2Jz b2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1ZyA0MgpAQCAtODEsMTEgKzgyLDEyIEBAIE1PQ0s6 IHVzZXIub3Blbl91cmw6IGh0dHA6Ly9leGFtcGxlLmNvbS80MgogCiAgICAgZGVmIHRlc3RfdXBs b2FkKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQorICAgICAgICBvcHRp b25zLmNjID0gTm9uZQorICAgICAgICBvcHRpb25zLmNoZWNrX3N0eWxlID0gVHJ1ZQorICAgICAg ICBvcHRpb25zLmNvbW1lbnQgPSBOb25lCiAgICAgICAgIG9wdGlvbnMuZGVzY3JpcHRpb24gPSAi TU9DSyBkZXNjcmlwdGlvbiIKICAgICAgICAgb3B0aW9ucy5yZXF1ZXN0X2NvbW1pdCA9IEZhbHNl CiAgICAgICAgIG9wdGlvbnMucmV2aWV3ID0gVHJ1ZQotICAgICAgICBvcHRpb25zLmNvbW1lbnQg PSBOb25lCi0gICAgICAgIG9wdGlvbnMuY2MgPSBOb25lCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVy ciA9ICIiIlJ1bm5pbmcgY2hlY2std2Via2l0LXN0eWxlCiBNT0NLOiB1c2VyLm9wZW5fdXJsOiBm aWxlOi8vLi4uCiBPYnNvbGV0aW5nIDIgb2xkIHBhdGNoZXMgb24gYnVnIDQyCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rvb2wucHkKaW5kZXggZjg0ZWMyYjMyZGMy OTU1NjU2NTczNmI5MDk1YTY0ZDA3NTE1YzE5Ni4uYjNlZTVjZDA1ZDY2YWNhMmNkN2MzZjNjMWRi NWFkNzUwYzdlNmRhNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9t b2NrdG9vbC5weQpAQCAtNTgxLDkgKzU4MSwxMCBAQCBjbGFzcyBNb2NrRXhlY3V0ZShNb2NrKToK ICAgICAgICAgcmV0dXJuICJNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzIgogCiAKLWNsYXNz IE1vY2tPcHRpb25zKE1vY2spOgotICAgIG5vX3NxdWFzaCA9IEZhbHNlCi0gICAgc3F1YXNoID0g RmFsc2UKK2NsYXNzIE1vY2tPcHRpb25zKG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYs ICoqa3dhcmdzKToKKyAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4ga3dhcmdzLml0ZW1zKCk6Cisg ICAgICAgICAgICBzZWxmLl9fZGljdF9fW2tleV0gPSB2YWx1ZQogCiAKIGNsYXNzIE1vY2tSaWV0 dmVsZCgpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0 ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L3N0ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5CmluZGV4IDE1ZjI3NWFkOGQzMjU2NmZkNDQ1ZTU1NjM5 OGE1MTY2ZDAxODM2ZDEuLjM3ZDRjNmY2NThlNTM4NDAwMTQxNWYxYzE1MTllYTQ1NDgwNWRiYzkg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9zdGVw c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvc3RlcHNfdW5pdHRlc3QucHkKQEAgLTQyLDE1ICs0MiwxOSBAQCBjbGFzcyBTdGVwc1Rlc3Qo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkKICAgICAg ICAgaWYgbm90IG9wdGlvbnM6CiAgICAgICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQor ICAgICAgICAgICAgb3B0aW9ucy5wb3J0ID0gJ01PQ0sgcG9ydCcKKyAgICAgICAgICAgIG9wdGlv bnMudGVzdCA9IFRydWUKICAgICAgICAgaWYgbm90IHN0YXRlOgogICAgICAgICAgICAgc3RhdGUg PSB7fQogICAgICAgICBzdGVwKHRvb2wsIG9wdGlvbnMpLnJ1bihzdGF0ZSkKIAogICAgIGRlZiB0 ZXN0X3VwZGF0ZV9zdGVwKHNlbGYpOgorICAgICAgICB0b29sID0gTW9ja1Rvb2woKQogICAgICAg ICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQogICAgICAgICBvcHRpb25zLnVwZGF0ZSA9IFRydWUK KyAgICAgICAgb3B0aW9ucy5wb3J0ID0gJ01PQ0sgcG9ydCcKICAgICAgICAgZXhwZWN0ZWRfc3Rk ZXJyID0gIlVwZGF0aW5nIHdvcmtpbmcgZGlyZWN0b3J5XG4iCi0gICAgICAgIE91dHB1dENhcHR1 cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl9ydW5fc3RlcCwgW1VwZGF0ZSwgb3B0aW9u c10sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCisgICAgICAgIE91dHB1dENhcHR1 cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzZWxmLl9ydW5fc3RlcCwgW1VwZGF0ZSwgdG9vbCwg b3B0aW9uc10sIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCiAKICAgICBkZWYgdGVz dF9wcm9tcHRfZm9yX2J1Z19vcl90aXRsZV9zdGVwKHNlbGYpOgogICAgICAgICB0b29sID0gTW9j a1Rvb2woKQpAQCAtNjMsNyArNjcsMTAgQEAgY2xhc3MgU3RlcHNUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKIAogICAgIGRlZiB0ZXN0X3J1bnRlc3RzX2xlb3BhcmRfY29tbWl0X3F1ZXVlX2hhY2so c2VsZik6CiAgICAgICAgIG1vY2tfb3B0aW9ucyA9IE1vY2tPcHRpb25zKCkKKyAgICAgICAgbW9j a19vcHRpb25zLnBvcnQgPSBOb25lCiAgICAgICAgIG1vY2tfb3B0aW9ucy5ub25faW50ZXJhY3Rp dmUgPSBUcnVlCisgICAgICAgIG1vY2tfb3B0aW9ucy50ZXN0ID0gVHJ1ZQorICAgICAgICBtb2Nr X29wdGlvbnMucXVpZXQgPSBUcnVlCiAgICAgICAgIHN0ZXAgPSBSdW5UZXN0cyhNb2NrVG9vbChs b2dfZXhlY3V0aXZlPVRydWUpLCBtb2NrX29wdGlvbnMpCiAgICAgICAgICMgRklYTUU6IFdlIHNo b3VsZG4ndCB1c2UgYSByZWFsIHBvcnQtb2JqZWN0IGhlcmUsIGJ1dCB0aGVyZSBpcyB0b28gbXVj aCB0byBtb2NrIGF0IHRoZSBtb21lbnQuCiAgICAgICAgIG1vY2tfcG9ydCA9IFdlYktpdFBvcnQo KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3Vw ZGF0ZWNoYW5nZWxvZ3N3aXRocmV2aWV3X3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZWNoYW5nZWxvZ3N3aXRocmV2aWV3X3VuaXR0ZXN0 LnB5CmluZGV4IGEwMzc0MjI2Y2FjOGEwMjFhZGQ4MDAxMDM1YjJmNjNjMjZmMDFmZmIuLmI0NzUz Nzg4OGYxNzUxYzFlOTBlZDc5MzZkNzJmMTE5YzZmZjAwMDQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGVjaGFuZ2Vsb2dzd2l0aHJldmll d191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3Rl cHMvdXBkYXRlY2hhbmdlbG9nc3dpdGhyZXZpZXdfdW5pdHRlc3QucHkKQEAgLTQxLDUgKzQxLDgg QEAgY2xhc3MgVXBkYXRlQ2hhbmdlTG9nc1dpdGhSZXZpZXdlclRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogCiAgICAgZGVmIHRlc3RfZW1wdHlfc3RhdGUoc2VsZik6CiAgICAgICAgIGNhcHR1cmUg PSBPdXRwdXRDYXB0dXJlKCkKLSAgICAgICAgc3RlcCA9IFVwZGF0ZUNoYW5nZUxvZ3NXaXRoUmV2 aWV3ZXIoTW9ja1Rvb2woKSwgTW9ja09wdGlvbnMoKSkKKyAgICAgICAgb3B0aW9ucyA9IE1vY2tP cHRpb25zKCkKKyAgICAgICAgb3B0aW9ucy5yZXZpZXdlciA9ICdNT0NLIHJldmlld2VyJworICAg ICAgICBvcHRpb25zLmdpdF9jb21taXQgPSAnTU9DSyBnaXQgY29tbWl0JworICAgICAgICBzdGVw ID0gVXBkYXRlQ2hhbmdlTG9nc1dpdGhSZXZpZXdlcihNb2NrVG9vbCgpLCBvcHRpb25zKQogICAg ICAgICBjYXB0dXJlLmFzc2VydF9vdXRwdXRzKHNlbGYsIHN0ZXAucnVuLCBbe31dKQo= 70940 2010-10-15 18:27:03 -0700 2010-10-15 18:27:03 -0700 Patch bug-47709-20101015182702.patch text/plain 9486 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA2YTRjM2EzZjNlOGFmZWVmMTMwZmU5NmQ2MDk0Mjk3MjE4ZTFkYWQ1Li41YzhjOGY5 MDgzNzViZmFhN2YxMjQ1ZWRmMTcxOWNiNTIyMDk2MWIyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAK KzIwMTAtMTAtMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbW9ja3Rvb2wuTW9ja09w dGlvbnMgaXMgaW5oZXJpdGluZyBmcm9tIE1vY2ssIHdoaWNoIGhhcyB0aGUgc2lkZQorICAgICAg ICBlZmZlY3Qgb2YgZGVmYXVsdGluZyBhbnkgYXR0cmlidXRlIHRvIGFub3RoZXIgTW9ja09iamVj dC4gU28sCisgICAgICAgIE1vY2tPcHRpb25zKCkuZm9vIHdvdWxkIGFsd2F5cyBldmFsdWF0ZSB0 byB0cnVlLiBUaGlzIHdhcworICAgICAgICBjb3ZlcmluZyBvdmVyIGJ1Z3MgaW4gdGhlIHVuaXQg dGVzdHMsIGFuZCBpcyBwcm9iYWJseSB0aGUgd3JvbmcKKyAgICAgICAgZGVmYXVsdCBiZWhhdmlv ciBmb3IgYW55dGhpbmcgYXR0ZW1wdGluZyB0byBtb2NrIG91dCB0aGUgb3B0aW9ucworICAgICAg ICBhcmd1bWVudCByZXR1cm5lZCBmcm9tIG9wdHBhcnNlLnBhcnNlX2FyZ3MoKS4KKworICAgICAg ICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIGRlZmF1bHQgYmVoYXZpb3IuIFRoZSBuZXcgTW9ja09w dGlvbnMoKQorICAgICAgICBjbGFzcyB0YWtlcyBhbiBvcHRpb25hbCBsaXN0IG9mIGtleXdvcmQg cGFyYW1ldGVycyB0byBzZXQ7IHRoaXMKKyAgICAgICAgcGF0Y2ggZG9lc24ndCB1c2UgdGhhdCBm ZWF0dXJlIGJ1dCB0aGUgZml4IGZvciBidWcgNDc1MTAgd2lsbC4KKworICAgICAgICBBbHNvLCB0 aGlzIHBhdGNoIGp1c3QgZmlsbHMgaW4gdGhlIGRlZmF1bHQgdmFsdWVzIG5lY2Vzc2FyeSB0bwor ICAgICAgICBnZXQgYWxsIG9mIHRoZSB0ZXN0cyB0byBwYXNzOyBJIGRpZG4ndCBzdGFyZSBhdCBl YWNoIHRlc3QgYnkKKyAgICAgICAgaGFuZCB0byBkZXRlcm1pbmUgdGhlICJyaWdodCIgdmFsdWVz LiBXZSBjYW4gZWl0aGVyIGZpeCB0aGF0IGluCisgICAgICAgIHN1YnNlcXVlbnQgcGF0Y2hlcyBv ciBsZXQgbWUga25vdyBpZiB3ZSB3YW50IHRvIGRvIHRoYXQgbm93IChhbmQKKyAgICAgICAgZ2l2 ZSBtZSBzb21lIGd1aWRhbmNlIG9uIHdoYXQgdGhvc2UgdmFsdWVzIG1pZ2h0IHdhbnQgdG8gYmUp LgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Nzcw OQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2NvbW1hbmR0ZXN0 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9kb3dubG9hZF91 bml0dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBs b2FkX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9v bC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRl c3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZWNoYW5n ZWxvZ3N3aXRocmV2aWV3X3VuaXR0ZXN0LnB5OgorCiAyMDEwLTEwLTE1ICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0aGUgYnVpbGQ7IG5lZWQg dG8gYWRkIG5ldyBzbG90IHRvIFBhZ2VVSUNsaWVudCBjYWxsYmFja3MuCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvY29tbWFuZHRlc3QucHkg Yi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvY29tbWFuZHRlc3Qu cHkKaW5kZXggZGU5MmNkM2JkYjA4MjFiNWI3MjcyMGYzMDJhNDlkYmZjM2U3MzkzZS4uYWRjNmQ4 MTdmODJmYzVkN2ZhNTU1MjMyYTBjYzM0MGQ3Yzg2MGU1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2NvbW1hbmR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9jb21tYW5kdGVzdC5weQpA QCAtMzMsNSArMzMsMTYgQEAgZnJvbSB3ZWJraXRweS50b29sLm1vY2t0b29sIGltcG9ydCBNb2Nr T3B0aW9ucywgTW9ja1Rvb2wKIAogY2xhc3MgQ29tbWFuZHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICBkZWYgYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhzZWxmLCBjb21tYW5kLCBhcmdzLCBl eHBlY3RlZF9zdGRvdXQ9IiIsIGV4cGVjdGVkX3N0ZGVycj0iIiwgb3B0aW9ucz1Nb2NrT3B0aW9u cygpLCB0b29sPU1vY2tUb29sKCkpOgorICAgICAgICBvcHRpb25zLmJsb2NrcyA9IFRydWUKKyAg ICAgICAgb3B0aW9ucy5jYyA9ICdNT0NLIGNjJworICAgICAgICBvcHRpb25zLmNvbXBvbmVudCA9 ICdNT0NLIGNvbXBvbmVudCcKKyAgICAgICAgb3B0aW9ucy5jb25maXJtID0gVHJ1ZQorICAgICAg ICBvcHRpb25zLmVtYWlsID0gJ01PQ0sgZW1haWwnCisgICAgICAgIG9wdGlvbnMuZ2l0X2NvbW1p dCA9ICdNT0NLIGdpdCBjb21taXQnCisgICAgICAgIG9wdGlvbnMub2Jzb2xldGVfcGF0Y2hlcyA9 IFRydWUKKyAgICAgICAgb3B0aW9ucy5vcGVuX2J1ZyA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5w b3J0ID0gJ01PQ0sgcG9ydCcKKyAgICAgICAgb3B0aW9ucy5xdWlldCA9IFRydWUKKyAgICAgICAg b3B0aW9ucy5yZXZpZXdlciA9ICdNT0NLIHJldmlld2VyJwogICAgICAgICBjb21tYW5kLmJpbmRf dG9fdG9vbCh0b29sKQogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2Vs ZiwgY29tbWFuZC5leGVjdXRlLCBbb3B0aW9ucywgYXJncywgdG9vbF0sIGV4cGVjdGVkX3N0ZG91 dD1leHBlY3RlZF9zdGRvdXQsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIpCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvZG93bmxv YWRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvZG93bmxvYWRfdW5pdHRlc3QucHkKaW5kZXggZmFkZGQ1MDU2MzVmMzc5Yjg3MTJjNDdmMDAz YTliMDJhZDAxY2NmMi4uNmFmMWY2NGIyZjhmMzcwZjJkYzIzMzhjN2Q2NDJlYmJiY2UzNTRmYiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Rv d25sb2FkX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9kb3dubG9hZF91bml0dGVzdC5weQpAQCAtNTcsMTUgKzU3LDE5IEBAIGNsYXNz IEFic3RyYWN0Um9sbG91dFByZXBDb21tYW5kVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiBjbGFz cyBEb3dubG9hZENvbW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogICAgIGRlZiBfZGVmYXVsdF9v cHRpb25zKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQotICAgICAgICBv cHRpb25zLmZvcmNlX2NsZWFuID0gRmFsc2UKLSAgICAgICAgb3B0aW9ucy5jbGVhbiA9IFRydWUK KyAgICAgICAgb3B0aW9ucy5idWlsZCA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5idWlsZF9zdHls ZSA9IFRydWUKICAgICAgICAgb3B0aW9ucy5jaGVja19idWlsZGVycyA9IFRydWUKLSAgICAgICAg b3B0aW9ucy5xdWlldCA9IEZhbHNlCisgICAgICAgIG9wdGlvbnMuY2hlY2tfc3R5bGUgPSBUcnVl CisgICAgICAgIG9wdGlvbnMuY2xlYW4gPSBUcnVlCisgICAgICAgIG9wdGlvbnMuY2xvc2VfYnVn ID0gVHJ1ZQorICAgICAgICBvcHRpb25zLmZvcmNlX2NsZWFuID0gRmFsc2UKKyAgICAgICAgb3B0 aW9ucy5mb3JjZV9wYXRjaCA9IFRydWUKICAgICAgICAgb3B0aW9ucy5ub25faW50ZXJhY3RpdmUg PSBGYWxzZQotICAgICAgICBvcHRpb25zLnVwZGF0ZSA9IFRydWUKLSAgICAgICAgb3B0aW9ucy5i dWlsZCA9IFRydWUKKyAgICAgICAgb3B0aW9ucy5wYXJlbnRfY29tbWFuZCA9ICdNT0NLIHBhcmVu dCBjb21tYW5kJworICAgICAgICBvcHRpb25zLnF1aWV0ID0gRmFsc2UKICAgICAgICAgb3B0aW9u cy50ZXN0ID0gVHJ1ZQotICAgICAgICBvcHRpb25zLmNsb3NlX2J1ZyA9IFRydWUKKyAgICAgICAg b3B0aW9ucy51cGRhdGUgPSBUcnVlCiAgICAgICAgIHJldHVybiBvcHRpb25zCiAKICAgICBkZWYg dGVzdF9idWlsZChzZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvdXBsb2FkX3VuaXR0ZXN0LnB5CmluZGV4IDg4N2QzYjYx NzlmZDdmYmVjZWRlMDMwYmUwY2JmNDA4NDlmMmRhZWEuLjBkMDk2YjY0MWY1ZTNhNjE0MTFiZWE3 NjgyMTJkMzBlN2M0ODFkNjUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy91cGxvYWRfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3VwbG9hZF91bml0dGVzdC5weQpAQCAtNTIsMTEg KzUyLDEyIEBAIGNsYXNzIFVwbG9hZENvbW1hbmRzVGVzdChDb21tYW5kc1Rlc3QpOgogCiAgICAg ZGVmIHRlc3RfcG9zdChzZWxmKToKICAgICAgICAgb3B0aW9ucyA9IE1vY2tPcHRpb25zKCkKKyAg ICAgICAgb3B0aW9ucy5jYyA9IE5vbmUKKyAgICAgICAgb3B0aW9ucy5jaGVja19zdHlsZSA9IFRy dWUKKyAgICAgICAgb3B0aW9ucy5jb21tZW50ID0gTm9uZQogICAgICAgICBvcHRpb25zLmRlc2Ny aXB0aW9uID0gIk1PQ0sgZGVzY3JpcHRpb24iCiAgICAgICAgIG9wdGlvbnMucmVxdWVzdF9jb21t aXQgPSBGYWxzZQogICAgICAgICBvcHRpb25zLnJldmlldyA9IFRydWUKLSAgICAgICAgb3B0aW9u cy5jb21tZW50ID0gTm9uZQotICAgICAgICBvcHRpb25zLmNjID0gTm9uZQogICAgICAgICBleHBl Y3RlZF9zdGRlcnIgPSAiIiJSdW5uaW5nIGNoZWNrLXdlYmtpdC1zdHlsZQogTU9DSzogdXNlci5v cGVuX3VybDogZmlsZTovLy4uLgogT2Jzb2xldGluZyAyIG9sZCBwYXRjaGVzIG9uIGJ1ZyA0MgpA QCAtODEsMTEgKzgyLDEyIEBAIE1PQ0s6IHVzZXIub3Blbl91cmw6IGh0dHA6Ly9leGFtcGxlLmNv bS80MgogCiAgICAgZGVmIHRlc3RfdXBsb2FkKHNlbGYpOgogICAgICAgICBvcHRpb25zID0gTW9j a09wdGlvbnMoKQorICAgICAgICBvcHRpb25zLmNjID0gTm9uZQorICAgICAgICBvcHRpb25zLmNo ZWNrX3N0eWxlID0gVHJ1ZQorICAgICAgICBvcHRpb25zLmNvbW1lbnQgPSBOb25lCiAgICAgICAg IG9wdGlvbnMuZGVzY3JpcHRpb24gPSAiTU9DSyBkZXNjcmlwdGlvbiIKICAgICAgICAgb3B0aW9u cy5yZXF1ZXN0X2NvbW1pdCA9IEZhbHNlCiAgICAgICAgIG9wdGlvbnMucmV2aWV3ID0gVHJ1ZQot ICAgICAgICBvcHRpb25zLmNvbW1lbnQgPSBOb25lCi0gICAgICAgIG9wdGlvbnMuY2MgPSBOb25l CiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICIiIlJ1bm5pbmcgY2hlY2std2Via2l0LXN0eWxl CiBNT0NLOiB1c2VyLm9wZW5fdXJsOiBmaWxlOi8vLi4uCiBPYnNvbGV0aW5nIDIgb2xkIHBhdGNo ZXMgb24gYnVnIDQyCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvbW9ja3Rvb2wucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbW9ja3Rv b2wucHkKaW5kZXggNTI4NTgzNzAwZDlmY2JhODNiM2U4ODY0OGY0YzYzMzZkYjM4ZjY5ZS4uY2M3 NjVmMzA5ZThkM2M4N2ZhMTdhM2FkMTk2MmUxOGUxNzlmZjQwOCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL21vY2t0b29sLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tb2NrdG9vbC5weQpAQCAtNTgxLDkgKzU4MSwxMCBAQCBj bGFzcyBNb2NrRXhlY3V0ZShNb2NrKToKICAgICAgICAgcmV0dXJuICJNT0NLIG91dHB1dCBvZiBj aGlsZCBwcm9jZXNzIgogCiAKLWNsYXNzIE1vY2tPcHRpb25zKE1vY2spOgotICAgIG5vX3NxdWFz aCA9IEZhbHNlCi0gICAgc3F1YXNoID0gRmFsc2UKK2NsYXNzIE1vY2tPcHRpb25zKG9iamVjdCk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgZm9yIGtleSwgdmFs dWUgaW4ga3dhcmdzLml0ZW1zKCk6CisgICAgICAgICAgICBzZWxmLl9fZGljdF9fW2tleV0gPSB2 YWx1ZQogCiAKIGNsYXNzIE1vY2tSaWV0dmVsZCgpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3N0ZXBzX3VuaXR0ZXN0LnB5CmluZGV4IDY5 NTc1ZGI2MmUxMjNiNDhkYmRiMzI4ZDFhYjY0ZmRkOWQxNDIxZDkuLjdlYjhlM2E4NjI5MTEyYWFm OWQ0YTMxYWI0OWEzY2EzOTA0NWI0M2MgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy9zdGVwc191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvc3RlcHNfdW5pdHRlc3QucHkKQEAgLTM3LDIwICsz NywyOSBAQCBmcm9tIHdlYmtpdHB5LnRvb2wuc3RlcHMucHJvbXB0Zm9yYnVnb3J0aXRsZSBpbXBv cnQgUHJvbXB0Rm9yQnVnT3JUaXRsZQogCiAKIGNsYXNzIFN0ZXBzVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CisgICAgZGVmIF9zdGVwX29wdGlvbnMoc2VsZik6CisgICAgICAgIG9wdGlvbnMgPSBN b2NrT3B0aW9ucygpCisgICAgICAgIG9wdGlvbnMubm9uX2ludGVyYWN0aXZlID0gVHJ1ZQorICAg ICAgICBvcHRpb25zLnBvcnQgPSAnTU9DSyBwb3J0JworICAgICAgICBvcHRpb25zLnF1aWV0ID0g VHJ1ZQorICAgICAgICBvcHRpb25zLnRlc3QgPSBUcnVlCisgICAgICAgIHJldHVybiBvcHRpb25z CisKICAgICBkZWYgX3J1bl9zdGVwKHNlbGYsIHN0ZXAsIHRvb2w9Tm9uZSwgb3B0aW9ucz1Ob25l LCBzdGF0ZT1Ob25lKToKICAgICAgICAgaWYgbm90IHRvb2w6CiAgICAgICAgICAgICB0b29sID0g TW9ja1Rvb2woKQogICAgICAgICBpZiBub3Qgb3B0aW9uczoKLSAgICAgICAgICAgIG9wdGlvbnMg PSBNb2NrT3B0aW9ucygpCisgICAgICAgICAgICBvcHRpb25zID0gc2VsZi5fc3RlcF9vcHRpb25z KCkKICAgICAgICAgaWYgbm90IHN0YXRlOgogICAgICAgICAgICAgc3RhdGUgPSB7fQogICAgICAg ICBzdGVwKHRvb2wsIG9wdGlvbnMpLnJ1bihzdGF0ZSkKIAogICAgIGRlZiB0ZXN0X3VwZGF0ZV9z dGVwKHNlbGYpOgotICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMoKQorICAgICAgICB0b29s ID0gTW9ja1Rvb2woKQorICAgICAgICBvcHRpb25zID0gc2VsZi5fc3RlcF9vcHRpb25zKCkKICAg ICAgICAgb3B0aW9ucy51cGRhdGUgPSBUcnVlCiAgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJV cGRhdGluZyB3b3JraW5nIGRpcmVjdG9yeVxuIgotICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNz ZXJ0X291dHB1dHMoc2VsZiwgc2VsZi5fcnVuX3N0ZXAsIFtVcGRhdGUsIG9wdGlvbnNdLCBleHBl Y3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNz ZXJ0X291dHB1dHMoc2VsZiwgc2VsZi5fcnVuX3N0ZXAsIFtVcGRhdGUsIHRvb2wsIG9wdGlvbnNd LCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVmIHRlc3RfcHJvbXB0 X2Zvcl9idWdfb3JfdGl0bGVfc3RlcChzZWxmKToKICAgICAgICAgdG9vbCA9IE1vY2tUb29sKCkK QEAgLTYyLDggKzcxLDggQEAgY2xhc3MgU3RlcHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHNlbGYuX3J1bl9zdGVw LCBbUnVuVGVzdHNdLCBleHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQogCiAgICAgZGVm IHRlc3RfcnVudGVzdHNfbGVvcGFyZF9jb21taXRfcXVldWVfaGFja19jb21tYW5kKHNlbGYpOgot ICAgICAgICBtb2NrX29wdGlvbnMgPSBNb2NrT3B0aW9ucygpCi0gICAgICAgIG1vY2tfb3B0aW9u cy5ub25faW50ZXJhY3RpdmUgPSBUcnVlCisgICAgICAgIG1vY2tfb3B0aW9ucyA9IHNlbGYuX3N0 ZXBfb3B0aW9ucygpCisgICAgICAgIHN0ZXAgPSBSdW5UZXN0cyhNb2NrVG9vbChsb2dfZXhlY3V0 aXZlPVRydWUpLCBtb2NrX29wdGlvbnMpCiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCB1 c2UgYSByZWFsIHBvcnQtb2JqZWN0IGhlcmUsIGJ1dCB0aGVyZSBpcyB0b28gbXVjaCB0byBtb2Nr IGF0IHRoZSBtb21lbnQuCiAgICAgICAgIG1vY2tfcG9ydCA9IFdlYktpdFBvcnQoKQogICAgICAg ICBtb2NrX3BvcnQubmFtZSA9IGxhbWJkYTogIk1hYyIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRhdGVjaGFuZ2Vsb2dzd2l0aHJldmlld191 bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy91cGRh dGVjaGFuZ2Vsb2dzd2l0aHJldmlld191bml0dGVzdC5weQppbmRleCBhMDM3NDIyNmNhYzhhMDIx YWRkODAwMTAzNWIyZjYzYzI2ZjAxZmZiLi5iNDc1Mzc4ODhmMTc1MWMxZTkwZWQ3OTM2ZDcyZjEx OWM2ZmYwMDA0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c3RlcHMvdXBkYXRlY2hhbmdlbG9nc3dpdGhyZXZpZXdfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3VwZGF0ZWNoYW5nZWxvZ3N3aXRocmV2 aWV3X3VuaXR0ZXN0LnB5CkBAIC00MSw1ICs0MSw4IEBAIGNsYXNzIFVwZGF0ZUNoYW5nZUxvZ3NX aXRoUmV2aWV3ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2VtcHR5 X3N0YXRlKHNlbGYpOgogICAgICAgICBjYXB0dXJlID0gT3V0cHV0Q2FwdHVyZSgpCi0gICAgICAg IHN0ZXAgPSBVcGRhdGVDaGFuZ2VMb2dzV2l0aFJldmlld2VyKE1vY2tUb29sKCksIE1vY2tPcHRp b25zKCkpCisgICAgICAgIG9wdGlvbnMgPSBNb2NrT3B0aW9ucygpCisgICAgICAgIG9wdGlvbnMu cmV2aWV3ZXIgPSAnTU9DSyByZXZpZXdlcicKKyAgICAgICAgb3B0aW9ucy5naXRfY29tbWl0ID0g J01PQ0sgZ2l0IGNvbW1pdCcKKyAgICAgICAgc3RlcCA9IFVwZGF0ZUNoYW5nZUxvZ3NXaXRoUmV2 aWV3ZXIoTW9ja1Rvb2woKSwgb3B0aW9ucykKICAgICAgICAgY2FwdHVyZS5hc3NlcnRfb3V0cHV0 cyhzZWxmLCBzdGVwLnJ1biwgW3t9XSkK