142012 2015-02-25 01:23:32 -0800 W3C importer should use filesystem instead of shutil/host 2015-02-28 14:48:05 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 142085 1 youennf youennf bjonesbe commit-queue glenn oldest_to_newest 1072011 0 youennf 2015-02-25 01:23:32 -0800 Tools/Scripts/w3c/test_importer.py should use Host abstraction in lieu of shutil, os... 1072013 1 247322 youennf 2015-02-25 01:27:28 -0800 Created attachment 247322 Patch 1072083 2 247322 bjonesbe 2015-02-25 10:08:11 -0800 Comment on attachment 247322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=247322&action=review Does this enable the creation of any new unit tests, or do we have to wait until os.walk is replaced with something mockable? > Tools/Scripts/webkitpy/w3c/test_importer.py:94 > + if not FileSystem().exists(import_dir): Nit: put FileSystem() in a local variable and use that here. 1072102 3 youennf 2015-02-25 12:23:26 -0800 (In reply to comment #2) > Comment on attachment 247322 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=247322&action=review > > Does this enable the creation of any new unit tests, or do we have to wait > until os.walk is replaced with something mockable? Good point. We could already test quite some functionality by creating dedicated TestImporter.import_list and running TestImporter.import_tests. But these tests may need to be updated whenever we change import_list/import_tests. I would tend to wait until replacing os.walk to create black-box tests. > > Tools/Scripts/webkitpy/w3c/test_importer.py:94 > > + if not FileSystem().exists(import_dir): > > Nit: put FileSystem() in a local variable and use that here. OK 1072699 4 youennf 2015-02-27 07:48:48 -0800 (In reply to comment #3) > (In reply to comment #2) > > Comment on attachment 247322 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=247322&action=review > > > > Does this enable the creation of any new unit tests, or do we have to wait > > until os.walk is replaced with something mockable? > > Good point. > We could already test quite some functionality by creating dedicated > TestImporter.import_list and running TestImporter.import_tests. > But these tests may need to be updated whenever we change > import_list/import_tests. > I would tend to wait until replacing os.walk to create black-box tests. With patches from bug 142084 and bug 142085, test importer becomes testable with the mock system. Patch in bug 142085 adds one such unit test to ensure that. 1072934 5 247322 bjonesbe 2015-02-27 17:25:49 -0800 Comment on attachment 247322 Patch Good stuff. r=me. 1073076 6 247612 youennf 2015-02-28 13:52:35 -0800 Created attachment 247612 Patch for landing 1073094 7 247612 commit-queue 2015-02-28 14:48:01 -0800 Comment on attachment 247612 Patch for landing Clearing flags on attachment: 247612 Committed r180844: <http://trac.webkit.org/changeset/180844> 1073095 8 commit-queue 2015-02-28 14:48:05 -0800 All reviewed patches have been landed. Closing bug. 247322 2015-02-25 01:27:28 -0800 2015-02-28 13:52:27 -0800 Patch bug-142012-20150225102715.patch text/plain 9939 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNDkzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2Q4M2E5OTk2Y2M0MDA4ZDcyODM5YzBlOGQ4YzUzZjA1 YzE3ODY4My4uMTM5NjAzN2QzMDU1NTNhYjUzYTc4ZGYyM2NiNTFkNTZkNWVhNzUyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTAyLTI1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgVzNDIGltcG9ydGVyIHNob3VsZCB1c2UgZmlsZXN5c3RlbSBpbnN0ZWFk IG9mIHNodXRpbC9ob3N0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmVkIGRpcmVjdCB1c2Ugb2YgcHl0aG9uIHNodXRpbCBhbmQgb3MsIGV4Y2Vw dCBmb3Igb3Mud2FsayB3aGljaCBtYXkgcmVxdWlyZSBpdHMgb3duIGZpeC4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgIChtYWluKToK KyAgICAgICAgKFRlc3RJbXBvcnRlci5kb19pbXBvcnQpOgorICAgICAgICAoVGVzdEltcG9ydGVy LmZpbmRfaW1wb3J0YWJsZV90ZXN0cyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rl c3RzKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5yZW1vdmVfZGVsZXRlZF9maWxlcyk6CisgICAg ICAgIChUZXN0SW1wb3J0ZXIud3JpdGVfaW1wb3J0X2xvZyk6CisKIDIwMTUtMDItMjEgIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBUZXN0cyBk b24ndCB3b3JrIG9uIHNvbWUgYm90czogRmFpbGVkIHRvIHN0b3Agd3B0d2sKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IGUxZjRkMzA1YjRjMTJlOGNh ZmIzMTYyMDkyNjZhMzVjZDZlMmViNDMuLmVkNjE1YzgwZTdmNDZlNDNjMmJkNGZmMDc4ZmQ5MDRl YmJiNjg5MmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5w eQpAQCAtNjgsMTcgKzY4LDE2IEBACiAgICAgICAgVGhlIHNjcmlwdCByZW1vdmVzIHRoZXNlIGZp bGVzIGFjY29yZGluZ2x5LgogIiIiCiAKLSMgRklYTUU6IENoYW5nZSB0aGlzIGZpbGUgdG8gdXNl IHRoZSBIb3N0IGFic3RyYWN0aW9ucyByYXRoZXIgdGhhdCBvcywgc3lzLCBzaHV0aWxzLCBldGMu CiAKIGltcG9ydCBkYXRldGltZQogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBtaW1ldHlwZXMKIGlt cG9ydCBvcHRwYXJzZQogaW1wb3J0IG9zCi1pbXBvcnQgc2h1dGlsCiBpbXBvcnQgc3lzCiAKIGZy b20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5maWxlc3lzdGVtIGltcG9ydCBGaWxlU3lzdGVtCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi53ZWJraXRfZmluZGVyIGltcG9ydCBXZWJLaXRGaW5kZXIKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LnczYy50 ZXN0X3BhcnNlciBpbXBvcnQgVGVzdFBhcnNlcgpAQCAtOTIsOCArOTEsNyBAQCBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiBkZWYgbWFpbihfYXJndiwgX3N0ZG91dCwgX3N0ZGVy cik6CiAgICAgb3B0aW9ucywgYXJncyA9IHBhcnNlX2FyZ3MoKQogICAgIGltcG9ydF9kaXIgPSBh cmdzWzBdCi0KLSAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoaW1wb3J0X2Rpcik6CisgICAgaWYg bm90IEZpbGVTeXN0ZW0oKS5leGlzdHMoaW1wb3J0X2Rpcik6CiAgICAgICAgIHN5cy5leGl0KCdT b3VyY2UgZGlyZWN0b3J5ICVzIG5vdCBmb3VuZCEnICUgaW1wb3J0X2RpcikKIAogICAgIGNvbmZp Z3VyZV9sb2dnaW5nKCkKQEAgLTE2MCw3ICsxNTgsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2Jq ZWN0KToKICAgICAgICAgICAgIHNlbGYuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKHNlbGYuc291cmNl X2RpcmVjdG9yeSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGZvciB0ZXN0X3BhdGggaW4g c2VsZi5vcHRpb25zLnRlc3RfcGF0aHM6Ci0gICAgICAgICAgICAgICAgc2VsZi5maW5kX2ltcG9y dGFibGVfdGVzdHMob3MucGF0aC5qb2luKHNlbGYuc291cmNlX2RpcmVjdG9yeSwgdGVzdF9wYXRo KSkKKyAgICAgICAgICAgICAgICBzZWxmLmZpbmRfaW1wb3J0YWJsZV90ZXN0cyhzZWxmLmZpbGVz eXN0ZW0uam9pbihzZWxmLnNvdXJjZV9kaXJlY3RvcnksIHRlc3RfcGF0aCkpCiAgICAgICAgIHNl bGYuaW1wb3J0X3Rlc3RzKCkKIAogICAgIGRlZiBzaG91bGRfa2VlcF9zdWJkaXIoc2VsZiwgcm9v dCwgc3ViZGlyKToKQEAgLTE5NCw3ICsxOTIsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0 KToKICAgICAgICAgICAgICAgICBpZiBzZWxmLnNob3VsZF9za2lwX2ZpbGUoZmlsZW5hbWUpOgog ICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAgICAgICAgZnVsbHBhdGgg PSBvcy5wYXRoLmpvaW4ocm9vdCwgZmlsZW5hbWUpCisgICAgICAgICAgICAgICAgZnVsbHBhdGgg PSBzZWxmLmZpbGVzeXN0ZW0uam9pbihyb290LCBmaWxlbmFtZSkKIAogICAgICAgICAgICAgICAg IG1pbWV0eXBlID0gbWltZXR5cGVzLmd1ZXNzX3R5cGUoZnVsbHBhdGgpCiAgICAgICAgICAgICAg ICAgaWYgbm90ICdodG1sJyBpbiBzdHIobWltZXR5cGVbMF0pIGFuZCBub3QgJ2FwcGxpY2F0aW9u L3hodG1sK3htbCcgaW4gc3RyKG1pbWV0eXBlWzBdKSBhbmQgbm90ICdhcHBsaWNhdGlvbi94bWwn IGluIHN0cihtaW1ldHlwZVswXSk6CkBAIC0yMDUsMjIgKzIwMywyMiBAQCBjbGFzcyBUZXN0SW1w b3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICB0ZXN0X2luZm8gPSB0ZXN0X3BhcnNlci5h bmFseXplX3Rlc3QoKQogICAgICAgICAgICAgICAgIGlmIHRlc3RfaW5mbyBpcyBOb25lOgogICAg ICAgICAgICAgICAgICAgICAjIElmIGh0bWwgZmlsZSBpcyBpbiBhICJyZXNvdXJjZXMiIGZvbGRl ciwgaXQgc2hvdWxkIGJlIGNvcGllZCBhbnl3YXkKLSAgICAgICAgICAgICAgICAgICAgaWYgb3Mu cGF0aC5iYXNlbmFtZShvcy5wYXRoLmRpcm5hbWUoZnVsbHBhdGgpKSA9PSAicmVzb3VyY2VzIjoK KyAgICAgICAgICAgICAgICAgICAgaWYgc2VsZi5maWxlc3lzdGVtLmJhc2VuYW1lKHNlbGYuZmls ZXN5c3RlbS5kaXJuYW1lKGZ1bGxwYXRoKSkgPT0gInJlc291cmNlcyI6CiAgICAgICAgICAgICAg ICAgICAgICAgICBjb3B5X2xpc3QuYXBwZW5kKHsnc3JjJzogZnVsbHBhdGgsICdkZXN0JzogZmls ZW5hbWV9KQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCiAgICAgICAgICAgICAgICAg aWYgJ3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKToKICAgICAgICAgICAgICAgICAgICAg cmVmdGVzdHMgKz0gMQogICAgICAgICAgICAgICAgICAgICB0b3RhbF90ZXN0cyArPSAxCi0gICAg ICAgICAgICAgICAgICAgIHRlc3RfYmFzZW5hbWUgPSBvcy5wYXRoLmJhc2VuYW1lKHRlc3RfaW5m b1sndGVzdCddKQorICAgICAgICAgICAgICAgICAgICB0ZXN0X2Jhc2VuYW1lID0gc2VsZi5maWxl c3lzdGVtLmJhc2VuYW1lKHRlc3RfaW5mb1sndGVzdCddKQogCiAgICAgICAgICAgICAgICAgICAg ICMgQWRkIHRoZSByZWYgZmlsZSwgZm9sbG93aW5nIFdlYktpdCBzdHlsZS4KICAgICAgICAgICAg ICAgICAgICAgIyBGSVhNRTogSWRlYWxseSB3ZSdkIHN1cHBvcnQgcmVhZGluZyB0aGUgbWV0YWRh dGEKICAgICAgICAgICAgICAgICAgICAgIyBkaXJlY3RseSByYXRoZXIgdGhhbiByZWx5aW5nICBv biBhIG5hbWluZyBjb252ZW50aW9uLgogICAgICAgICAgICAgICAgICAgICAjIFVzaW5nIGEgbmFt aW5nIGNvbnZlbnRpb24gY3JlYXRlcyBkdXBsaWNhdGUgY29waWVzIG9mIHRoZQogICAgICAgICAg ICAgICAgICAgICAjIHJlZmVyZW5jZSBmaWxlcy4KLSAgICAgICAgICAgICAgICAgICAgcmVmX2Zp bGUgPSBvcy5wYXRoLnNwbGl0ZXh0KHRlc3RfYmFzZW5hbWUpWzBdICsgJy1leHBlY3RlZCcKLSAg ICAgICAgICAgICAgICAgICAgcmVmX2ZpbGUgKz0gb3MucGF0aC5zcGxpdGV4dCh0ZXN0X2Jhc2Vu YW1lKVsxXQorICAgICAgICAgICAgICAgICAgICByZWZfZmlsZSA9IHNlbGYuZmlsZXN5c3RlbS5z cGxpdGV4dCh0ZXN0X2Jhc2VuYW1lKVswXSArICctZXhwZWN0ZWQnCisgICAgICAgICAgICAgICAg ICAgIHJlZl9maWxlICs9IHNlbGYuZmlsZXN5c3RlbS5zcGxpdGV4dCh0ZXN0X2Jhc2VuYW1lKVsx XQogCiAgICAgICAgICAgICAgICAgICAgIGNvcHlfbGlzdC5hcHBlbmQoeydzcmMnOiB0ZXN0X2lu Zm9bJ3JlZmVyZW5jZSddLCAnZGVzdCc6IHJlZl9maWxlLCAncmVmZXJlbmNlX3N1cHBvcnRfaW5m byc6IHRlc3RfaW5mb1sncmVmZXJlbmNlX3N1cHBvcnRfaW5mbyddfSkKICAgICAgICAgICAgICAg ICAgICAgY29weV9saXN0LmFwcGVuZCh7J3NyYyc6IHRlc3RfaW5mb1sndGVzdCddLCAnZGVzdCc6 IGZpbGVuYW1lfSkKQEAgLTI2MCwzNyArMjU4LDM3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmpl Y3QpOgogCiAgICAgICAgICAgICBvcmlnX3BhdGggPSBkaXJfdG9fY29weVsnZGlybmFtZSddCiAK LSAgICAgICAgICAgIHN1YnBhdGggPSBvcy5wYXRoLnJlbHBhdGgob3JpZ19wYXRoLCBzZWxmLnNv dXJjZV9kaXJlY3RvcnkpCi0gICAgICAgICAgICBuZXdfcGF0aCA9IG9zLnBhdGguam9pbihzZWxm LmRlc3RpbmF0aW9uX2RpcmVjdG9yeSwgc3VicGF0aCkKKyAgICAgICAgICAgIHN1YnBhdGggPSBz ZWxmLmZpbGVzeXN0ZW0ucmVscGF0aChvcmlnX3BhdGgsIHNlbGYuc291cmNlX2RpcmVjdG9yeSkK KyAgICAgICAgICAgIG5ld19wYXRoID0gc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi5kZXN0aW5h dGlvbl9kaXJlY3RvcnksIHN1YnBhdGgpCiAKLSAgICAgICAgICAgIGlmIG5vdChvcy5wYXRoLmV4 aXN0cyhuZXdfcGF0aCkpOgotICAgICAgICAgICAgICAgIG9zLm1ha2VkaXJzKG5ld19wYXRoKQor ICAgICAgICAgICAgaWYgbm90KHNlbGYuZmlsZXN5c3RlbS5leGlzdHMobmV3X3BhdGgpKToKKyAg ICAgICAgICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3RvcnkobmV3X3Bh dGgpCiAKICAgICAgICAgICAgIGNvcGllZF9maWxlcyA9IFtdCiAKICAgICAgICAgICAgIGZvciBm aWxlX3RvX2NvcHkgaW4gZGlyX3RvX2NvcHlbJ2NvcHlfbGlzdCddOgogICAgICAgICAgICAgICAg ICMgRklYTUU6IFNwbGl0IHRoaXMgYmxvY2sgaW50byBhIHNlcGFyYXRlIGZ1bmN0aW9uLgotICAg ICAgICAgICAgICAgIG9yaWdfZmlsZXBhdGggPSBvcy5wYXRoLm5vcm1wYXRoKGZpbGVfdG9fY29w eVsnc3JjJ10pCisgICAgICAgICAgICAgICAgb3JpZ19maWxlcGF0aCA9IHNlbGYuZmlsZXN5c3Rl bS5ub3JtcGF0aChmaWxlX3RvX2NvcHlbJ3NyYyddKQogCi0gICAgICAgICAgICAgICAgaWYgb3Mu cGF0aC5pc2RpcihvcmlnX2ZpbGVwYXRoKToKKyAgICAgICAgICAgICAgICBpZiBzZWxmLmZpbGVz eXN0ZW0uaXNkaXIob3JpZ19maWxlcGF0aCk6CiAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6 IEZpZ3VyZSBvdXQgd2hhdCBpcyB0cmlnZ2VyaW5nIHRoaXMgYW5kIHdoYXQgdG8gZG8gYWJvdXQg aXQuCiAgICAgICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJyVzIHJlZmVycyB0byBhIGRpcmVj dG9yeScgJSBvcmlnX2ZpbGVwYXRoKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogCi0g ICAgICAgICAgICAgICAgaWYgbm90KG9zLnBhdGguZXhpc3RzKG9yaWdfZmlsZXBhdGgpKToKKyAg ICAgICAgICAgICAgICBpZiBub3Qoc2VsZi5maWxlc3lzdGVtLmV4aXN0cyhvcmlnX2ZpbGVwYXRo KSk6CiAgICAgICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnJXMgbm90IGZvdW5kLiBQb3Nz aWJsZSBlcnJvciBpbiB0aGUgdGVzdC4nLCBvcmlnX2ZpbGVwYXRoKQogICAgICAgICAgICAgICAg ICAgICBjb250aW51ZQogCi0gICAgICAgICAgICAgICAgbmV3X2ZpbGVwYXRoID0gb3MucGF0aC5q b2luKG5ld19wYXRoLCBmaWxlX3RvX2NvcHlbJ2Rlc3QnXSkKKyAgICAgICAgICAgICAgICBuZXdf ZmlsZXBhdGggPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihuZXdfcGF0aCwgZmlsZV90b19jb3B5Wydk ZXN0J10pCiAgICAgICAgICAgICAgICAgaWYgJ3JlZmVyZW5jZV9zdXBwb3J0X2luZm8nIGluIGZp bGVfdG9fY29weS5rZXlzKCkgYW5kIGZpbGVfdG9fY29weVsncmVmZXJlbmNlX3N1cHBvcnRfaW5m byddICE9IHt9OgogICAgICAgICAgICAgICAgICAgICByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvID0g ZmlsZV90b19jb3B5WydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ10KICAgICAgICAgICAgICAgICBl bHNlOgogICAgICAgICAgICAgICAgICAgICByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvID0gTm9uZQog Ci0gICAgICAgICAgICAgICAgaWYgbm90KG9zLnBhdGguZXhpc3RzKG9zLnBhdGguZGlybmFtZShu ZXdfZmlsZXBhdGgpKSk6Ci0gICAgICAgICAgICAgICAgICAgIG9zLm1ha2VkaXJzKG9zLnBhdGgu ZGlybmFtZShuZXdfZmlsZXBhdGgpKQorICAgICAgICAgICAgICAgIGlmIG5vdChzZWxmLmZpbGVz eXN0ZW0uZXhpc3RzKHNlbGYuZmlsZXN5c3RlbS5kaXJuYW1lKG5ld19maWxlcGF0aCkpKToKKyAg ICAgICAgICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KHNl bGYuZmlsZXN5c3RlbS5kaXJuYW1lKG5ld19maWxlcGF0aCkpCiAKLSAgICAgICAgICAgICAgICBp ZiBub3Qgc2VsZi5vcHRpb25zLm92ZXJ3cml0ZSBhbmQgb3MucGF0aC5leGlzdHMobmV3X2ZpbGVw YXRoKToKKyAgICAgICAgICAgICAgICBpZiBub3Qgc2VsZi5vcHRpb25zLm92ZXJ3cml0ZSBhbmQg c2VsZi5maWxlc3lzdGVtLmV4aXN0cyhuZXdfZmlsZXBhdGgpOgogICAgICAgICAgICAgICAgICAg ICBfbG9nLmluZm8oJ1NraXBwaW5nIGltcG9ydCBvZiBleGlzdGluZyBmaWxlICcgKyBuZXdfZmls ZXBhdGgpCiAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgIyBGSVhN RTogTWF5YmUgZG9pbmcgYSBmaWxlIGRpZmYgaXMgaW4gb3JkZXIgaGVyZSBmb3IgZXhpc3Rpbmcg ZmlsZXM/CkBAIC0zMTEsNyArMzA5LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAg ICAgICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRfZmlsZSA9IE5vbmUKIAogICAgICAgICAg ICAgICAgICAgICBpZiBub3QgY29udmVydGVkX2ZpbGU6Ci0gICAgICAgICAgICAgICAgICAgICAg ICBzaHV0aWwuY29weWZpbGUob3JpZ19maWxlcGF0aCwgbmV3X2ZpbGVwYXRoKSAgIyBUaGUgZmls ZSB3YXMgdW5tb2RpZmllZC4KKyAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZmlsZXN5c3Rl bS5jb3B5ZmlsZShvcmlnX2ZpbGVwYXRoLCBuZXdfZmlsZXBhdGgpICAjIFRoZSBmaWxlIHdhcyB1 bm1vZGlmaWVkLgogICAgICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAg ICAgICAgZm9yIHByZWZpeGVkX3Byb3BlcnR5IGluIGNvbnZlcnRlZF9maWxlWzBdOgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRvdGFsX3ByZWZpeGVkX3Byb3BlcnRpZXMuc2V0ZGVmYXVs dChwcmVmaXhlZF9wcm9wZXJ0eSwgMCkKQEAgLTMzMiw3ICszMzAsNyBAQCBjbGFzcyBUZXN0SW1w b3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgIyBTb21lIGJvdHMgZGlzbGlrZSBl bXB0eSBfX2luaXRfXy5weS4KICAgICAgICAgICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLndy aXRlX3RleHRfZmlsZShuZXdfZmlsZXBhdGgsICcjIFRoaXMgZmlsZSBpcyByZXF1aXJlZCBmb3Ig UHl0aG9uIHRvIHNlYXJjaCB0aGlzIGRpcmVjdG9yeSBmb3IgbW9kdWxlcy4nKQogICAgICAgICAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIHNodXRpbC5jb3B5ZmlsZShvcmlnX2Zp bGVwYXRoLCBuZXdfZmlsZXBhdGgpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuZmlsZXN5c3Rl bS5jb3B5ZmlsZShvcmlnX2ZpbGVwYXRoLCBuZXdfZmlsZXBhdGgpCiAKICAgICAgICAgICAgICAg ICBjb3BpZWRfZmlsZXMuYXBwZW5kKG5ld19maWxlcGF0aC5yZXBsYWNlKHNlbGYuX3dlYmtpdF9y b290LCAnJykpCiAKQEAgLTM2Myw4ICszNjEsOCBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0 KToKIAogICAgICAgICBwcmV2aW91c19maWxlX2xpc3QgPSBbXQogCi0gICAgICAgIGltcG9ydF9s b2dfZmlsZSA9IG9zLnBhdGguam9pbihpbXBvcnRfZGlyZWN0b3J5LCAndzNjLWltcG9ydC5sb2cn KQotICAgICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoaW1wb3J0X2xvZ19maWxlKToKKyAgICAg ICAgaW1wb3J0X2xvZ19maWxlID0gc2VsZi5maWxlc3lzdGVtLmpvaW4oaW1wb3J0X2RpcmVjdG9y eSwgJ3czYy1pbXBvcnQubG9nJykKKyAgICAgICAgaWYgbm90IHNlbGYuZmlsZXN5c3RlbS5leGlz dHMoaW1wb3J0X2xvZ19maWxlKToKICAgICAgICAgICAgIHJldHVybgogCiAgICAgICAgIGltcG9y dF9sb2cgPSBvcGVuKGltcG9ydF9sb2dfZmlsZSwgJ3InKQpAQCAtMzc3LDE1ICszNzUsMTUgQEAg Y2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgIGRlbGV0ZWRfZmlsZXMgPSBzZXQo cHJldmlvdXNfZmlsZV9saXN0KSAtIHNldChuZXdfZmlsZV9saXN0KQogICAgICAgICBmb3IgZGVs ZXRlZF9maWxlIGluIGRlbGV0ZWRfZmlsZXM6CiAgICAgICAgICAgICBfbG9nLmluZm8oJ0RlbGV0 aW5nIGZpbGUgcmVtb3ZlZCBmcm9tIHRoZSBXM0MgcmVwbzogJXMnLCBkZWxldGVkX2ZpbGUpCi0g ICAgICAgICAgICBkZWxldGVkX2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5fd2Via2l0X3Jvb3Qs IGRlbGV0ZWRfZmlsZSkKLSAgICAgICAgICAgIG9zLnJlbW92ZShkZWxldGVkX2ZpbGUpCisgICAg ICAgICAgICBkZWxldGVkX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihzZWxmLl93ZWJraXRf cm9vdCwgZGVsZXRlZF9maWxlKQorICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLnJlbW92ZShk ZWxldGVkX2ZpbGUpCiAKICAgICAgICAgaW1wb3J0X2xvZy5jbG9zZSgpCiAKICAgICBkZWYgd3Jp dGVfaW1wb3J0X2xvZyhzZWxmLCBpbXBvcnRfZGlyZWN0b3J5LCBmaWxlX2xpc3QsIHByb3BfbGlz dCwgcHJvcGVydHlfdmFsdWVzX2xpc3QpOgogICAgICAgICAiIiIgV3JpdGVzIGEgdzNjLWltcG9y dC5sb2cgZmlsZSBpbiBlYWNoIGRpcmVjdG9yeSB3aXRoIGltcG9ydGVkIGZpbGVzLiAiIiIKIAot ICAgICAgICBpbXBvcnRfbG9nID0gb3Blbihvcy5wYXRoLmpvaW4oaW1wb3J0X2RpcmVjdG9yeSwg J3czYy1pbXBvcnQubG9nJyksICd3JykKKyAgICAgICAgaW1wb3J0X2xvZyA9IG9wZW4oc2VsZi5m aWxlc3lzdGVtLmpvaW4oaW1wb3J0X2RpcmVjdG9yeSwgJ3czYy1pbXBvcnQubG9nJyksICd3JykK ICAgICAgICAgaW1wb3J0X2xvZy53cml0ZSgnVGhlIHRlc3RzIGluIHRoaXMgZGlyZWN0b3J5IHdl cmUgaW1wb3J0ZWQgZnJvbSB0aGUgVzNDIHJlcG9zaXRvcnkuXG4nKQogICAgICAgICBpbXBvcnRf bG9nLndyaXRlKCdEbyBOT1QgbW9kaWZ5IHRoZXNlIHRlc3RzIGRpcmVjdGx5IGluIFdlYmtpdC5c bicpCiAgICAgICAgIGltcG9ydF9sb2cud3JpdGUoJ0luc3RlYWQsIHB1c2ggY2hhbmdlcyB0byB0 aGUgVzNDIENTUyByZXBvOlxuJykK 247612 2015-02-28 13:52:35 -0800 2015-02-28 14:48:01 -0800 Patch for landing bug-142012-20150228225219.patch text/plain 9619 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwODM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDc5OTJiOTVhOTYyMzUxZDc5ZjMyYmU1OTk5ZTYyOTQ3 Y2NjZTgxYS4uNDhhZWVmNDhiMTkzMTE3OTJlM2YzYTEwMWMxZGVmZTdhZjQ3OTFiOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIy IEBACiAyMDE1LTAyLTI4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CiAKKyAgICAgICAgVzNDIGltcG9ydGVyIHNob3VsZCB1c2UgZmlsZXN5c3RlbSBpbnN0ZWFk IG9mIHNodXRpbC9ob3N0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDIwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBCZW0gSm9uZXMtQmV5LgorCisg ICAgICAgIFJlbW92ZWQgZGlyZWN0IHVzZSBvZiBweXRob24gc2h1dGlsIGFuZCBvcywgZXhjZXB0 IGZvciBvcy53YWxrIHdoaWNoIHdpbGwgcmVxdWlyZSBpdHMgb3duIGZpeC4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgIChtYWluKToK KyAgICAgICAgKFRlc3RJbXBvcnRlci5kb19pbXBvcnQpOgorICAgICAgICAoVGVzdEltcG9ydGVy LmZpbmRfaW1wb3J0YWJsZV90ZXN0cyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rl c3RzKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5yZW1vdmVfZGVsZXRlZF9maWxlcyk6CisgICAg ICAgIChUZXN0SW1wb3J0ZXIud3JpdGVfaW1wb3J0X2xvZyk6CisKKzIwMTUtMDItMjggIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KKwogICAgICAgICBXM0MgdGVz dCBpbXBvcnRlciBzaG91bGQgdXNlIGZpbGVzeXN0ZW0gdG8gcmVhZCBhbmQgd3JpdGUgZmlsZXMK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjA4NAog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQppbmRleCAzMTA3 ZTg3NDM1NGUwYWNjZmZiMTMyYmE4ZjY3OTMyODkwNzA1NWZhLi5kZTljZGEyMzZkYTc5NzQ2Y2I4 ZWNlMGUyNmJkNTE2YWRjZDllNDEwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2ltcG9ydGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rl c3RfaW1wb3J0ZXIucHkKQEAgLTY4LDE3ICs2OCwxNSBAQAogICAgICAgIFRoZSBzY3JpcHQgcmVt b3ZlcyB0aGVzZSBmaWxlcyBhY2NvcmRpbmdseS4KICIiIgogCi0jIEZJWE1FOiBDaGFuZ2UgdGhp cyBmaWxlIHRvIHVzZSB0aGUgSG9zdCBhYnN0cmFjdGlvbnMgcmF0aGVyIHRoYXQgb3MsIHN5cywg c2h1dGlscywgZXRjLgotCiBpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBkYXRldGltZQogaW1wb3J0 IGxvZ2dpbmcKIGltcG9ydCBtaW1ldHlwZXMKIGltcG9ydCBvcwotaW1wb3J0IHNodXRpbAogaW1w b3J0IHN5cwogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0Citmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQogZnJvbSB3 ZWJraXRweS5jb21tb24ud2Via2l0X2ZpbmRlciBpbXBvcnQgV2ViS2l0RmluZGVyCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogZnJvbSB3 ZWJraXRweS53M2MudGVzdF9wYXJzZXIgaW1wb3J0IFRlc3RQYXJzZXIKQEAgLTkyLDggKzkwLDgg QEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogZGVmIG1haW4oX2FyZ3YsIF9z dGRvdXQsIF9zdGRlcnIpOgogICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZV9hcmdzKF9hcmd2KQog ICAgIGltcG9ydF9kaXIgPSBhcmdzWzBdCi0KLSAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoaW1w b3J0X2Rpcik6CisgICAgZmlsZXN5c3RlbSA9IEZpbGVTeXN0ZW0oKQorICAgIGlmIG5vdCBmaWxl c3lzdGVtLmV4aXN0cyhpbXBvcnRfZGlyKToKICAgICAgICAgc3lzLmV4aXQoJ1NvdXJjZSBkaXJl Y3RvcnkgJXMgbm90IGZvdW5kIScgJSBpbXBvcnRfZGlyKQogCiAgICAgY29uZmlndXJlX2xvZ2dp bmcoKQpAQCAtMTYwLDcgKzE1OCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAg ICAgICAgICAgc2VsZi5maW5kX2ltcG9ydGFibGVfdGVzdHMoc2VsZi5zb3VyY2VfZGlyZWN0b3J5 KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgZm9yIHRlc3RfcGF0aCBpbiBzZWxmLm9wdGlv bnMudGVzdF9wYXRoczoKLSAgICAgICAgICAgICAgICBzZWxmLmZpbmRfaW1wb3J0YWJsZV90ZXN0 cyhvcy5wYXRoLmpvaW4oc2VsZi5zb3VyY2VfZGlyZWN0b3J5LCB0ZXN0X3BhdGgpKQorICAgICAg ICAgICAgICAgIHNlbGYuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKHNlbGYuZmlsZXN5c3RlbS5qb2lu KHNlbGYuc291cmNlX2RpcmVjdG9yeSwgdGVzdF9wYXRoKSkKICAgICAgICAgc2VsZi5pbXBvcnRf dGVzdHMoKQogCiAgICAgZGVmIHNob3VsZF9rZWVwX3N1YmRpcihzZWxmLCByb290LCBzdWJkaXIp OgpAQCAtMTk0LDcgKzE5Miw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAg ICAgICAgICAgIGlmIHNlbGYuc2hvdWxkX3NraXBfZmlsZShmaWxlbmFtZSk6CiAgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAgICAgICBmdWxscGF0aCA9IG9zLnBhdGgu am9pbihyb290LCBmaWxlbmFtZSkKKyAgICAgICAgICAgICAgICBmdWxscGF0aCA9IHNlbGYuZmls ZXN5c3RlbS5qb2luKHJvb3QsIGZpbGVuYW1lKQogCiAgICAgICAgICAgICAgICAgbWltZXR5cGUg PSBtaW1ldHlwZXMuZ3Vlc3NfdHlwZShmdWxscGF0aCkKICAgICAgICAgICAgICAgICBpZiBub3Qg J2h0bWwnIGluIHN0cihtaW1ldHlwZVswXSkgYW5kIG5vdCAnYXBwbGljYXRpb24veGh0bWwreG1s JyBpbiBzdHIobWltZXR5cGVbMF0pIGFuZCBub3QgJ2FwcGxpY2F0aW9uL3htbCcgaW4gc3RyKG1p bWV0eXBlWzBdKToKQEAgLTIwNSwyMiArMjAzLDIyIEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmpl Y3QpOgogICAgICAgICAgICAgICAgIHRlc3RfaW5mbyA9IHRlc3RfcGFyc2VyLmFuYWx5emVfdGVz dCgpCiAgICAgICAgICAgICAgICAgaWYgdGVzdF9pbmZvIGlzIE5vbmU6CiAgICAgICAgICAgICAg ICAgICAgICMgSWYgaHRtbCBmaWxlIGlzIGluIGEgInJlc291cmNlcyIgZm9sZGVyLCBpdCBzaG91 bGQgYmUgY29waWVkIGFueXdheQotICAgICAgICAgICAgICAgICAgICBpZiBvcy5wYXRoLmJhc2Vu YW1lKG9zLnBhdGguZGlybmFtZShmdWxscGF0aCkpID09ICJyZXNvdXJjZXMiOgorICAgICAgICAg ICAgICAgICAgICBpZiBzZWxmLmZpbGVzeXN0ZW0uYmFzZW5hbWUoc2VsZi5maWxlc3lzdGVtLmRp cm5hbWUoZnVsbHBhdGgpKSA9PSAicmVzb3VyY2VzIjoKICAgICAgICAgICAgICAgICAgICAgICAg IGNvcHlfbGlzdC5hcHBlbmQoeydzcmMnOiBmdWxscGF0aCwgJ2Rlc3QnOiBmaWxlbmFtZX0pCiAg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKICAgICAgICAgICAgICAgICBpZiAncmVmZXJl bmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpOgogICAgICAgICAgICAgICAgICAgICByZWZ0ZXN0cyAr PSAxCiAgICAgICAgICAgICAgICAgICAgIHRvdGFsX3Rlc3RzICs9IDEKLSAgICAgICAgICAgICAg ICAgICAgdGVzdF9iYXNlbmFtZSA9IG9zLnBhdGguYmFzZW5hbWUodGVzdF9pbmZvWyd0ZXN0J10p CisgICAgICAgICAgICAgICAgICAgIHRlc3RfYmFzZW5hbWUgPSBzZWxmLmZpbGVzeXN0ZW0uYmFz ZW5hbWUodGVzdF9pbmZvWyd0ZXN0J10pCiAKICAgICAgICAgICAgICAgICAgICAgIyBBZGQgdGhl IHJlZiBmaWxlLCBmb2xsb3dpbmcgV2ViS2l0IHN0eWxlLgogICAgICAgICAgICAgICAgICAgICAj IEZJWE1FOiBJZGVhbGx5IHdlJ2Qgc3VwcG9ydCByZWFkaW5nIHRoZSBtZXRhZGF0YQogICAgICAg ICAgICAgICAgICAgICAjIGRpcmVjdGx5IHJhdGhlciB0aGFuIHJlbHlpbmcgIG9uIGEgbmFtaW5n IGNvbnZlbnRpb24uCiAgICAgICAgICAgICAgICAgICAgICMgVXNpbmcgYSBuYW1pbmcgY29udmVu dGlvbiBjcmVhdGVzIGR1cGxpY2F0ZSBjb3BpZXMgb2YgdGhlCiAgICAgICAgICAgICAgICAgICAg ICMgcmVmZXJlbmNlIGZpbGVzLgotICAgICAgICAgICAgICAgICAgICByZWZfZmlsZSA9IG9zLnBh dGguc3BsaXRleHQodGVzdF9iYXNlbmFtZSlbMF0gKyAnLWV4cGVjdGVkJwotICAgICAgICAgICAg ICAgICAgICByZWZfZmlsZSArPSBvcy5wYXRoLnNwbGl0ZXh0KHRlc3RfYmFzZW5hbWUpWzFdCisg ICAgICAgICAgICAgICAgICAgIHJlZl9maWxlID0gc2VsZi5maWxlc3lzdGVtLnNwbGl0ZXh0KHRl c3RfYmFzZW5hbWUpWzBdICsgJy1leHBlY3RlZCcKKyAgICAgICAgICAgICAgICAgICAgcmVmX2Zp bGUgKz0gc2VsZi5maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3RfYmFzZW5hbWUpWzFdCiAKICAgICAg ICAgICAgICAgICAgICAgY29weV9saXN0LmFwcGVuZCh7J3NyYyc6IHRlc3RfaW5mb1sncmVmZXJl bmNlJ10sICdkZXN0JzogcmVmX2ZpbGUsICdyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJzogdGVzdF9p bmZvWydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ119KQogICAgICAgICAgICAgICAgICAgICBjb3B5 X2xpc3QuYXBwZW5kKHsnc3JjJzogdGVzdF9pbmZvWyd0ZXN0J10sICdkZXN0JzogZmlsZW5hbWV9 KQpAQCAtMjYwLDM3ICsyNTgsMzcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAKICAg ICAgICAgICAgIG9yaWdfcGF0aCA9IGRpcl90b19jb3B5WydkaXJuYW1lJ10KIAotICAgICAgICAg ICAgc3VicGF0aCA9IG9zLnBhdGgucmVscGF0aChvcmlnX3BhdGgsIHNlbGYuc291cmNlX2RpcmVj dG9yeSkKLSAgICAgICAgICAgIG5ld19wYXRoID0gb3MucGF0aC5qb2luKHNlbGYuZGVzdGluYXRp b25fZGlyZWN0b3J5LCBzdWJwYXRoKQorICAgICAgICAgICAgc3VicGF0aCA9IHNlbGYuZmlsZXN5 c3RlbS5yZWxwYXRoKG9yaWdfcGF0aCwgc2VsZi5zb3VyY2VfZGlyZWN0b3J5KQorICAgICAgICAg ICAgbmV3X3BhdGggPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihzZWxmLmRlc3RpbmF0aW9uX2RpcmVj dG9yeSwgc3VicGF0aCkKIAotICAgICAgICAgICAgaWYgbm90KG9zLnBhdGguZXhpc3RzKG5ld19w YXRoKSk6Ci0gICAgICAgICAgICAgICAgb3MubWFrZWRpcnMobmV3X3BhdGgpCisgICAgICAgICAg ICBpZiBub3Qoc2VsZi5maWxlc3lzdGVtLmV4aXN0cyhuZXdfcGF0aCkpOgorICAgICAgICAgICAg ICAgIHNlbGYuZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShuZXdfcGF0aCkKIAogICAg ICAgICAgICAgY29waWVkX2ZpbGVzID0gW10KIAogICAgICAgICAgICAgZm9yIGZpbGVfdG9fY29w eSBpbiBkaXJfdG9fY29weVsnY29weV9saXN0J106CiAgICAgICAgICAgICAgICAgIyBGSVhNRTog U3BsaXQgdGhpcyBibG9jayBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24uCi0gICAgICAgICAgICAg ICAgb3JpZ19maWxlcGF0aCA9IG9zLnBhdGgubm9ybXBhdGgoZmlsZV90b19jb3B5WydzcmMnXSkK KyAgICAgICAgICAgICAgICBvcmlnX2ZpbGVwYXRoID0gc2VsZi5maWxlc3lzdGVtLm5vcm1wYXRo KGZpbGVfdG9fY29weVsnc3JjJ10pCiAKLSAgICAgICAgICAgICAgICBpZiBvcy5wYXRoLmlzZGly KG9yaWdfZmlsZXBhdGgpOgorICAgICAgICAgICAgICAgIGlmIHNlbGYuZmlsZXN5c3RlbS5pc2Rp cihvcmlnX2ZpbGVwYXRoKToKICAgICAgICAgICAgICAgICAgICAgIyBGSVhNRTogRmlndXJlIG91 dCB3aGF0IGlzIHRyaWdnZXJpbmcgdGhpcyBhbmQgd2hhdCB0byBkbyBhYm91dCBpdC4KICAgICAg ICAgICAgICAgICAgICAgX2xvZy5lcnJvcignJXMgcmVmZXJzIHRvIGEgZGlyZWN0b3J5JyAlIG9y aWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAKLSAgICAgICAgICAg ICAgICBpZiBub3Qob3MucGF0aC5leGlzdHMob3JpZ19maWxlcGF0aCkpOgorICAgICAgICAgICAg ICAgIGlmIG5vdChzZWxmLmZpbGVzeXN0ZW0uZXhpc3RzKG9yaWdfZmlsZXBhdGgpKToKICAgICAg ICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCclcyBub3QgZm91bmQuIFBvc3NpYmxlIGVycm9y IGluIHRoZSB0ZXN0LicsIG9yaWdfZmlsZXBhdGgpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlCiAKLSAgICAgICAgICAgICAgICBuZXdfZmlsZXBhdGggPSBvcy5wYXRoLmpvaW4obmV3X3Bh dGgsIGZpbGVfdG9fY29weVsnZGVzdCddKQorICAgICAgICAgICAgICAgIG5ld19maWxlcGF0aCA9 IHNlbGYuZmlsZXN5c3RlbS5qb2luKG5ld19wYXRoLCBmaWxlX3RvX2NvcHlbJ2Rlc3QnXSkKICAg ICAgICAgICAgICAgICBpZiAncmVmZXJlbmNlX3N1cHBvcnRfaW5mbycgaW4gZmlsZV90b19jb3B5 LmtleXMoKSBhbmQgZmlsZV90b19jb3B5WydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ10gIT0ge306 CiAgICAgICAgICAgICAgICAgICAgIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSBmaWxlX3RvX2Nv cHlbJ3JlZmVyZW5jZV9zdXBwb3J0X2luZm8nXQogICAgICAgICAgICAgICAgIGVsc2U6CiAgICAg ICAgICAgICAgICAgICAgIHJlZmVyZW5jZV9zdXBwb3J0X2luZm8gPSBOb25lCiAKLSAgICAgICAg ICAgICAgICBpZiBub3Qob3MucGF0aC5leGlzdHMob3MucGF0aC5kaXJuYW1lKG5ld19maWxlcGF0 aCkpKToKLSAgICAgICAgICAgICAgICAgICAgb3MubWFrZWRpcnMob3MucGF0aC5kaXJuYW1lKG5l d19maWxlcGF0aCkpCisgICAgICAgICAgICAgICAgaWYgbm90KHNlbGYuZmlsZXN5c3RlbS5leGlz dHMoc2VsZi5maWxlc3lzdGVtLmRpcm5hbWUobmV3X2ZpbGVwYXRoKSkpOgorICAgICAgICAgICAg ICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3Rvcnkoc2VsZi5maWxlc3lz dGVtLmRpcm5hbWUobmV3X2ZpbGVwYXRoKSkKIAotICAgICAgICAgICAgICAgIGlmIG5vdCBzZWxm Lm9wdGlvbnMub3ZlcndyaXRlIGFuZCBvcy5wYXRoLmV4aXN0cyhuZXdfZmlsZXBhdGgpOgorICAg ICAgICAgICAgICAgIGlmIG5vdCBzZWxmLm9wdGlvbnMub3ZlcndyaXRlIGFuZCBzZWxmLmZpbGVz eXN0ZW0uZXhpc3RzKG5ld19maWxlcGF0aCk6CiAgICAgICAgICAgICAgICAgICAgIF9sb2cuaW5m bygnU2tpcHBpbmcgaW1wb3J0IG9mIGV4aXN0aW5nIGZpbGUgJyArIG5ld19maWxlcGF0aCkKICAg ICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBNYXliZSBk b2luZyBhIGZpbGUgZGlmZiBpcyBpbiBvcmRlciBoZXJlIGZvciBleGlzdGluZyBmaWxlcz8KQEAg LTMxMSw3ICszMDksNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnZlcnRlZF9maWxlID0gTm9uZQogCiAgICAgICAgICAgICAgICAgICAg IGlmIG5vdCBjb252ZXJ0ZWRfZmlsZToKLSAgICAgICAgICAgICAgICAgICAgICAgIHNodXRpbC5j b3B5ZmlsZShvcmlnX2ZpbGVwYXRoLCBuZXdfZmlsZXBhdGgpICAjIFRoZSBmaWxlIHdhcyB1bm1v ZGlmaWVkLgorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLmNvcHlmaWxl KG9yaWdfZmlsZXBhdGgsIG5ld19maWxlcGF0aCkgICMgVGhlIGZpbGUgd2FzIHVubW9kaWZpZWQu CiAgICAgICAgICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgICAgICAgICBmb3Ig cHJlZml4ZWRfcHJvcGVydHkgaW4gY29udmVydGVkX2ZpbGVbMF06CiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdG90YWxfcHJlZml4ZWRfcHJvcGVydGllcy5zZXRkZWZhdWx0KHByZWZpeGVk X3Byb3BlcnR5LCAwKQpAQCAtMzMwLDcgKzMyOCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmpl Y3QpOgogICAgICAgICAgICAgICAgICAgICAjIFNvbWUgYm90cyBkaXNsaWtlIGVtcHR5IF9faW5p dF9fLnB5LgogICAgICAgICAgICAgICAgICAgICBzZWxmLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9m aWxlKG5ld19maWxlcGF0aCwgJyMgVGhpcyBmaWxlIGlzIHJlcXVpcmVkIGZvciBQeXRob24gdG8g c2VhcmNoIHRoaXMgZGlyZWN0b3J5IGZvciBtb2R1bGVzLicpCiAgICAgICAgICAgICAgICAgZWxz ZToKLSAgICAgICAgICAgICAgICAgICAgc2h1dGlsLmNvcHlmaWxlKG9yaWdfZmlsZXBhdGgsIG5l d19maWxlcGF0aCkKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLmNvcHlmaWxl KG9yaWdfZmlsZXBhdGgsIG5ld19maWxlcGF0aCkKIAogICAgICAgICAgICAgICAgIGNvcGllZF9m aWxlcy5hcHBlbmQobmV3X2ZpbGVwYXRoLnJlcGxhY2Uoc2VsZi5fd2Via2l0X3Jvb3QsICcnKSkK IApAQCAtMzYxLDggKzM1OSw4IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogCiAgICAg ICAgIHByZXZpb3VzX2ZpbGVfbGlzdCA9IFtdCiAKLSAgICAgICAgaW1wb3J0X2xvZ19maWxlID0g b3MucGF0aC5qb2luKGltcG9ydF9kaXJlY3RvcnksICd3M2MtaW1wb3J0LmxvZycpCi0gICAgICAg IGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhpbXBvcnRfbG9nX2ZpbGUpOgorICAgICAgICBpbXBvcnRf bG9nX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihpbXBvcnRfZGlyZWN0b3J5LCAndzNjLWlt cG9ydC5sb2cnKQorICAgICAgICBpZiBub3Qgc2VsZi5maWxlc3lzdGVtLmV4aXN0cyhpbXBvcnRf bG9nX2ZpbGUpOgogICAgICAgICAgICAgcmV0dXJuCiAKICAgICAgICAgY29udGVudHMgPSBzZWxm LmZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoaW1wb3J0X2xvZ19maWxlKS5zcGxpdCgnXG4nKQpA QCAtMzc0LDggKzM3Miw4IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICBk ZWxldGVkX2ZpbGVzID0gc2V0KHByZXZpb3VzX2ZpbGVfbGlzdCkgLSBzZXQobmV3X2ZpbGVfbGlz dCkKICAgICAgICAgZm9yIGRlbGV0ZWRfZmlsZSBpbiBkZWxldGVkX2ZpbGVzOgogICAgICAgICAg ICAgX2xvZy5pbmZvKCdEZWxldGluZyBmaWxlIHJlbW92ZWQgZnJvbSB0aGUgVzNDIHJlcG86ICVz JywgZGVsZXRlZF9maWxlKQotICAgICAgICAgICAgZGVsZXRlZF9maWxlID0gb3MucGF0aC5qb2lu KHNlbGYuX3dlYmtpdF9yb290LCBkZWxldGVkX2ZpbGUpCi0gICAgICAgICAgICBvcy5yZW1vdmUo ZGVsZXRlZF9maWxlKQorICAgICAgICAgICAgZGVsZXRlZF9maWxlID0gc2VsZi5maWxlc3lzdGVt LmpvaW4oc2VsZi5fd2Via2l0X3Jvb3QsIGRlbGV0ZWRfZmlsZSkKKyAgICAgICAgICAgIHNlbGYu ZmlsZXN5c3RlbS5yZW1vdmUoZGVsZXRlZF9maWxlKQogCiAgICAgZGVmIHdyaXRlX2ltcG9ydF9s b2coc2VsZiwgaW1wb3J0X2RpcmVjdG9yeSwgZmlsZV9saXN0LCBwcm9wX2xpc3QsIHByb3BlcnR5 X3ZhbHVlc19saXN0KToKICAgICAgICAgIiIiIFdyaXRlcyBhIHczYy1pbXBvcnQubG9nIGZpbGUg aW4gZWFjaCBkaXJlY3Rvcnkgd2l0aCBpbXBvcnRlZCBmaWxlcy4gIiIiCg==