167448 2017-01-25 21:19:19 -0800 Improve W3C importer command line options 2017-02-09 08:04:43 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf achristensen agouaillard cdumez commit-queue glenn jiewen_tan joepeck lforschler rniwa oldest_to_newest 1270135 0 youennf 2017-01-25 21:19:19 -0800 Importer command line options are confusing to newcomers. 1270136 1 299792 youennf 2017-01-25 21:24:59 -0800 Created attachment 299792 Patch 1270137 2 youennf 2017-01-25 21:26:20 -0800 Patch transforms: import-w3c-tests -t web-platform-tests/webrtc my-path-to-repository into: import-w3c-tests web-platform-tests/webrtc -s my-path-to-repository 1270155 3 299792 joepeck 2017-01-26 01:01:35 -0800 Comment on attachment 299792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299792&action=review > Tools/Scripts/webkitpy/w3c/test_importer.py:119 > - parser = argparse.ArgumentParser(prog='import-w3c-tests [w3c_test_source_directory]') > + parser = argparse.ArgumentParser(prog='import-w3c-tests [web-platform-tests/test-suite-name...]') More than anything, import-w3c-tests needs example commands. Otherwise I'm just going to forgot how to use it anyways. A section of examples would go a long way! Thanks for improve this! 1270156 4 299792 joepeck 2017-01-26 01:02:44 -0800 Comment on attachment 299792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299792&action=review >> Tools/Scripts/webkitpy/w3c/test_importer.py:119 >> + parser = argparse.ArgumentParser(prog='import-w3c-tests [web-platform-tests/test-suite-name...]') > > More than anything, import-w3c-tests needs example commands. Otherwise I'm just going to forgot how to use it anyways. > > A section of examples would go a long way! Thanks for improve this! Err, I meant `import-w3c-tests --help` should have an examples section. Your previous bugzilla comment gives exactly what I would want to see in the help =) 1270198 5 299808 youennf 2017-01-26 07:51:17 -0800 Created attachment 299808 Patch 1270199 6 youennf 2017-01-26 07:52:15 -0800 (In reply to comment #4) > Comment on attachment 299792 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=299792&action=review > > >> Tools/Scripts/webkitpy/w3c/test_importer.py:119 > >> + parser = argparse.ArgumentParser(prog='import-w3c-tests [web-platform-tests/test-suite-name...]') > > > > More than anything, import-w3c-tests needs example commands. Otherwise I'm just going to forgot how to use it anyways. > > > > A section of examples would go a long way! Thanks for improve this! > > Err, I meant `import-w3c-tests --help` should have an examples section. Your > previous bugzilla comment gives exactly what I would want to see in the help > =) I added some examples. I also made link conversion off by default and disabled git module generation since bots can no longer get them properly. 1273870 7 youennf 2017-02-06 22:27:32 -0800 Ping review 1274648 8 299808 rniwa 2017-02-08 17:04:22 -0800 Comment on attachment 299808 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299808&action=review > Tools/Scripts/webkitpy/w3c/test_importer.py:128 > + parser.add_argument('-l', '--links-conversion', dest='convert_test_harness_links', action='store_true', default=False, > + help='Change links (testharness js or css e.g.). This option only applies when providing a source directory. If this option is set, links are converted to point to WebKit testharness files. When tests are downloaded from W3C repository, links are converted for CSS tests and remain unchanged for WPT tests') Given the webkit-dev discussion, we probably don't want to flip this default but rather we should fix the link conversion so that it always works (probably in a separate patch). 1274755 9 301017 youennf 2017-02-08 21:51:23 -0800 Created attachment 301017 Patch for landing 1274834 10 youennf 2017-02-09 07:37:46 -0800 (In reply to comment #8) > Comment on attachment 299808 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=299808&action=review > > > Tools/Scripts/webkitpy/w3c/test_importer.py:128 > > + parser.add_argument('-l', '--links-conversion', dest='convert_test_harness_links', action='store_true', default=False, > > + help='Change links (testharness js or css e.g.). This option only applies when providing a source directory. If this option is set, links are converted to point to WebKit testharness files. When tests are downloaded from W3C repository, links are converted for CSS tests and remain unchanged for WPT tests') > > Given the webkit-dev discussion, we probably don't want to flip this default > but rather we should fix the link conversion so that it always works > (probably in a separate patch). I left the option unchanged for now. 1274848 11 301017 commit-queue 2017-02-09 08:04:38 -0800 Comment on attachment 301017 Patch for landing Clearing flags on attachment: 301017 Committed r211954: <http://trac.webkit.org/changeset/211954> 1274849 12 commit-queue 2017-02-09 08:04:43 -0800 All reviewed patches have been landed. Closing bug. 299792 2017-01-25 21:24:59 -0800 2017-01-26 07:51:14 -0800 Patch bug-167448-20170125212258.patch text/plain 6902 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZjMzMyMjlmNjI1NDY1MjE1ZDEyNDViOGJkNzk3MmZj MzViNjBhOS4uN2ZmNjFiZjY4NGUyYTAyNWY4MWQ0NThlZWZlMTY0NjQyNzE1Y2VlOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE3LTAxLTI1ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXByb3ZlIFczQyBpbXBvcnRlciBjb21tYW5kIGxpbmUgb3B0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NDQ4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFraW5nIHRoZSBsaXN0IG9m IHRlc3QgcGF0aHMgdG8gaW1wb3J0IHRoZSBtYWluIGFyZ3VtZW50cyBvZiB0aGUgc2NyaXB0Lgor ICAgICAgICBBbGxvdyBwYXNzaW5nIHRoZSBzb3VyY2UgZGlyZWN0b3J5IHRvIGltcG9ydCBhcyBh IC1zIG9wdGlvbi4KKyAgICAgICAgQWRkaW5nIGEgd2FybmluZyB3aGVuIGdpdmVuIHRlc3QgcGF0 aHMgYXJlIHNraXBwZWQgYnkgZGVmYXVsdCBpbiBJbXBvcnRFeHBlY3RhdGlvbnMuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5OgorICAgICAgICAobWFp bik6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKFRlc3RJbXBvcnRlci5fX2luaXRf Xyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuZG9faW1wb3J0KToKKyAgICAgICAgKFRlc3RJbXBv cnRlcik6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuY2hlY2tfaW1wb3J0ZWRfZXhwZWN0YXRpb25z KToKKwogMjAxNy0wMS0yNSAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAg ICAgW2lvcy1zaW11bGF0b3JdIEFQSSB0ZXN0IFdlYktpdDIuV2Vic2l0ZVBvbGljaWVzQXV0b3Bs YXlFbmFibGVkIHRpbWluZyBvdXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyLnB5CmluZGV4IDExOTk4MGQwMmJiN2Y4OGU4MGZhZWJlOGQwMTdlNGZiMmQyOGU0NGUu LjExZGJjNDFhYjZjNDZmNjA5NTk5OTFiNzllZjU4MzM0ZjE5MjhkZTcgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtNzcsNyArNzcsNiBAQCBpbXBv cnQgYXJncGFyc2UKIGltcG9ydCBqc29uCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG1pbWV0eXBl cwotaW1wb3J0IHN5cwogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBm cm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBvcnQgRmlsZVN5c3RlbQpA QCAtOTIsMTUgKzkxLDExIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAog CiBkZWYgbWFpbihfYXJndiwgX3N0ZG91dCwgX3N0ZGVycik6Ci0gICAgb3B0aW9ucywgYXJncyA9 IHBhcnNlX2FyZ3MoX2FyZ3YpCi0gICAgaW1wb3J0X2RpciA9IGFyZ3NbMF0gaWYgYXJncyBlbHNl IE5vbmUKLSAgICBmaWxlc3lzdGVtID0gRmlsZVN5c3RlbSgpCi0gICAgaWYgaW1wb3J0X2RpciBh bmQgbm90IGZpbGVzeXN0ZW0uZXhpc3RzKGltcG9ydF9kaXIpOgotICAgICAgICBzeXMuZXhpdCgn U291cmNlIGRpcmVjdG9yeSAlcyBub3QgZm91bmQhJyAlIGltcG9ydF9kaXIpCisgICAgb3B0aW9u cywgdGVzdF9wYXRocyA9IHBhcnNlX2FyZ3MoX2FyZ3YpCiAKICAgICBjb25maWd1cmVfbG9nZ2lu ZygpCiAKLSAgICB0ZXN0X2ltcG9ydGVyID0gVGVzdEltcG9ydGVyKEhvc3QoKSwgaW1wb3J0X2Rp ciwgb3B0aW9ucykKKyAgICB0ZXN0X2ltcG9ydGVyID0gVGVzdEltcG9ydGVyKEhvc3QoKSwgdGVz dF9wYXRocywgb3B0aW9ucykKICAgICB0ZXN0X2ltcG9ydGVyLmRvX2ltcG9ydCgpCiAKIApAQCAt MTIxLDcgKzExNiw3IEBAIGRlZiBjb25maWd1cmVfbG9nZ2luZygpOgogCiAKIGRlZiBwYXJzZV9h cmdzKGFyZ3MpOgotICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKHByb2c9J2lt cG9ydC13M2MtdGVzdHMgW3czY190ZXN0X3NvdXJjZV9kaXJlY3RvcnldJykKKyAgICBwYXJzZXIg PSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihwcm9nPSdpbXBvcnQtdzNjLXRlc3RzIFt3ZWItcGxh dGZvcm0tdGVzdHMvdGVzdC1zdWl0ZS1uYW1lLi4uXScpCiAKICAgICBwYXJzZXIuYWRkX2FyZ3Vt ZW50KCctbicsICctLW5vLW92ZXJ3cml0ZScsIGRlc3Q9J292ZXJ3cml0ZScsIGFjdGlvbj0nc3Rv cmVfZmFsc2UnLCBkZWZhdWx0PVRydWUsCiAgICAgICAgIGhlbHA9J0ZsYWcgdG8gcHJldmVudCBk dXBsaWNhdGUgdGVzdCBmaWxlcyBmcm9tIG92ZXJ3cml0aW5nIGV4aXN0aW5nIHRlc3RzLiBCeSBk ZWZhdWx0LCB0aGV5IHdpbGwgYmUgb3ZlcndyaXR0ZW4nKQpAQCAtMTM0LDkgKzEyOSw4IEBAIGRl ZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1kJywgJy0tZGVz dC1kaXInLCBkZXN0PSdkZXN0aW5hdGlvbicsIGRlZmF1bHQ9ZnMuam9pbignaW1wb3J0ZWQnLCAn dzNjJyksCiAgICAgICAgIGhlbHA9J0ltcG9ydCBpbnRvIGEgc3BlY2lmaWVkIGRpcmVjdG9yeSBy ZWxhdGl2ZSB0byB0aGUgTGF5b3V0VGVzdHMgcm9vdC4gQnkgZGVmYXVsdCwgaW1wb3J0cyBpbnRv IGltcG9ydGVkL3czYycpCiAKLSAgICBsaXN0X29mX3JlcG9zaXRvcmllcyA9ICcgb3IgJy5qb2lu KFt0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSBmb3IgdGVzdF9yZXBvc2l0b3J5IGluIFRlc3REb3du bG9hZGVyLmxvYWRfdGVzdF9yZXBvc2l0b3JpZXMoKV0pCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVu dCgnLXQnLCAnLS10ZXN0LXBhdGgnLCBhY3Rpb249J2FwcGVuZCcsIGRlc3Q9J3Rlc3RfcGF0aHMn LCBkZWZhdWx0PVtdLAotICAgICAgICAgaGVscD0nSW1wb3J0IG9ubHkgdGVzdHMgaW4gdGhlIHN1 cHBsaWVkIHN1YmRpcmVjdG9yeSBvZiB0aGUgc291cmNlIGRpcmVjdG9yeS4gQ2FuIGJlIHN1cHBs aWVkIG11bHRpcGxlIHRpbWVzIHRvIGdpdmUgbXVsdGlwbGUgcGF0aHMuIEZvciB0ZXN0cyBkaXJl Y3RseSBjbG9uZWQgZnJvbSBXM0MgcmVwb3NpdG9yaWVzLCB1c2UgJyArIGxpc3Rfb2ZfcmVwb3Np dG9yaWVzICsgJyBwcmVmaXhlcyB0byBmaWx0ZXIgc3BlY2lmaWMgdGVzdHMnKQorICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy1zJywgJy0tc3JjLWRpcicsIGRlc3Q9J3NvdXJjZScsIGRlZmF1bHQ9 RmFsc2UsCisgICAgICAgIGhlbHA9J0ltcG9ydCBmcm9tIGEgc3BlY2lmaWMgZm9sZGVyIHdoaWNo IGNvbnRhaW5zIHdlYi1wbGF0Zm9ybS10ZXN0cyBhbmQvb3IgY3Nzd2ctdGVzdCBmb2xkZXJzLiBJ ZiBub3QgcHJvdmlkZWQsIHRoZSBzY3JpcHQgd2lsbCBjbG9uZSB0aGUgbmVjZXNzYXJ5IHJlcG9z aXRvcmllcy4nKQogCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLXYnLCAnLS12ZXJib3NlJywg YWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgIGhlbHA9J1ByaW50 IG1heGltYWwgbG9nJykKQEAgLTE0OSwxNyArMTQzLDE2IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3Mp OgogICAgICAgICAgaGVscD0nQ2xlYW4gZGVzdGluYXRpb24gZGlyZWN0b3J5LiBBbGwgZmlsZXMg aW4gdGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSB3aWxsIGJlIGRlbGV0ZWQgZXhjZXB0IGZvciBX ZWJLaXQgc3BlY2lmaWMgZmlsZXMgKHRlc3QgZXhwZWN0YXRpb25zLCAuZ2l0aWdub3JlLi4uKSBi ZWZvcmUgbmV3IHRlc3RzIGltcG9ydC4gRGFuZ2xpbmcgdGVzdCBleHBlY3RhdGlvbnMgKGV4cGVj dGF0aW9uIGZpbGUgdGhhdCBpcyBubyBsb25nZXIgcmVsYXRlZCB0byBhIHRlc3QpIGFyZSByZW1v dmVkIGFmdGVyIHRlc3RzIGltcG9ydC4nKQogCiAgICAgb3B0aW9ucywgYXJncyA9IHBhcnNlci5w YXJzZV9rbm93bl9hcmdzKGFyZ3MpCi0gICAgaWYgbGVuKGFyZ3MpID4gMToKLSAgICAgICAgcGFy c2VyLmVycm9yKCdJbmNvcnJlY3QgbnVtYmVyIG9mIGFyZ3VtZW50cycpCiAgICAgcmV0dXJuIG9w dGlvbnMsIGFyZ3MKIAogCiBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKIAotICAgIGRlZiBf X2luaXRfXyhzZWxmLCBob3N0LCBzb3VyY2VfZGlyZWN0b3J5LCBvcHRpb25zKToKKyAgICBkZWYg X19pbml0X18oc2VsZiwgaG9zdCwgdGVzdF9wYXRocywgb3B0aW9ucyk6CiAgICAgICAgIHNlbGYu aG9zdCA9IGhvc3QKLSAgICAgICAgc2VsZi5zb3VyY2VfZGlyZWN0b3J5ID0gc291cmNlX2RpcmVj dG9yeQorICAgICAgICBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgPSBvcHRpb25zLnNvdXJjZQogICAg ICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25zCisgICAgICAgIHNlbGYudGVzdF9wYXRocyA9IHRl c3RfcGF0aHMKIAogICAgICAgICBzZWxmLmZpbGVzeXN0ZW0gPSBzZWxmLmhvc3QuZmlsZXN5c3Rl bQogCkBAIC0xNzcsNyArMTcwLDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAg ICAgIHNlbGYuX3BvdGVudGlhbF90ZXN0X3Jlc291cmNlX2ZpbGVzID0gW10KIAogICAgICAgICBz ZWxmLmltcG9ydF9saXN0ID0gW10KLSAgICAgICAgc2VsZi5faW1wb3J0aW5nX2Rvd25sb2FkZWRf dGVzdHMgPSBzb3VyY2VfZGlyZWN0b3J5IGlzIE5vbmUKKyAgICAgICAgc2VsZi5faW1wb3J0aW5n X2Rvd25sb2FkZWRfdGVzdHMgPSBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgaXMgTm9uZQogCiAgICAg ICAgIHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXNfanNvbl9wYXRoID0gc2VsZi5maWxlc3lzdGVt LmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNfdzNjX3BhdGgsICJyZXNvdXJjZXMiLCAicmVzb3VyY2Ut ZmlsZXMuanNvbiIpCiAgICAgICAgIHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXMgPSBqc29uLmxv YWRzKHNlbGYuZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShzZWxmLl90ZXN0X3Jlc291cmNlX2Zp bGVzX2pzb25fcGF0aCkpIGlmIHNlbGYuZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fdGVzdF9yZXNv dXJjZV9maWxlc19qc29uX3BhdGgpIGVsc2UgTm9uZQpAQCAtMTk3LDkgKzE5MCw5IEBAIGNsYXNz IFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5zb3VyY2VfZGlyZWN0b3J5 ID0gc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi50ZXN0c19kb3dubG9hZF9wYXRoLCAndG8tYmUt aW1wb3J0ZWQnKQogICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0 b3J5KHNlbGYudGVzdHNfZG93bmxvYWRfcGF0aCkKICAgICAgICAgICAgIHNlbGYuZmlsZXN5c3Rl bS5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLnNvdXJjZV9kaXJlY3RvcnkpCi0gICAgICAgICAg ICBzZWxmLnRlc3RfZG93bmxvYWRlcigpLmRvd25sb2FkX3Rlc3RzKHNlbGYuc291cmNlX2RpcmVj dG9yeSwgc2VsZi5vcHRpb25zLnRlc3RfcGF0aHMpCisgICAgICAgICAgICBzZWxmLnRlc3RfZG93 bmxvYWRlcigpLmRvd25sb2FkX3Rlc3RzKHNlbGYuc291cmNlX2RpcmVjdG9yeSwgc2VsZi50ZXN0 X3BhdGhzKQogCi0gICAgICAgIHRlc3RfcGF0aHMgPSBzZWxmLm9wdGlvbnMudGVzdF9wYXRocyBp ZiBzZWxmLm9wdGlvbnMudGVzdF9wYXRocyBlbHNlIFt0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSBm b3IgdGVzdF9yZXBvc2l0b3J5IGluIHNlbGYudGVzdF9kb3dubG9hZGVyKCkudGVzdF9yZXBvc2l0 b3JpZXNdCisgICAgICAgIHRlc3RfcGF0aHMgPSBzZWxmLnRlc3RfcGF0aHMgaWYgc2VsZi50ZXN0 X3BhdGhzIGVsc2UgW3Rlc3RfcmVwb3NpdG9yeVsnbmFtZSddIGZvciB0ZXN0X3JlcG9zaXRvcnkg aW4gc2VsZi50ZXN0X2Rvd25sb2FkZXIoKS50ZXN0X3JlcG9zaXRvcmllc10KICAgICAgICAgZm9y IHRlc3RfcGF0aCBpbiB0ZXN0X3BhdGhzOgogICAgICAgICAgICAgc2VsZi5maW5kX2ltcG9ydGFi bGVfdGVzdHMoc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi5zb3VyY2VfZGlyZWN0b3J5LCB0ZXN0 X3BhdGgpKQogCkBAIC0yMTYsNiArMjA5LDEyIEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3Qp OgogICAgICAgICBpZiBzZWxmLl9pbXBvcnRpbmdfZG93bmxvYWRlZF90ZXN0czoKICAgICAgICAg ICAgIHNlbGYuZ2VuZXJhdGVfZ2l0X3N1Ym1vZHVsZXNfZGVzY3JpcHRpb25fZm9yX2FsbF9yZXBv c2l0b3JpZXMoKQogCisgICAgICAgIHNlbGYuY2hlY2tfaW1wb3J0ZWRfZXhwZWN0YXRpb25zKCkK KworICAgIGRlZiBjaGVja19pbXBvcnRlZF9leHBlY3RhdGlvbnMoc2VsZik6CisgICAgICAgIGZv ciBwYXRoIGluIFtwYXRoIGZvciBwYXRoIGluIHNlbGYudGVzdF9wYXRocyBpZiBwYXRoIGluIHNl bGYudGVzdF9kb3dubG9hZGVyKCkucGF0aHNfdG9fc2tpcF06CisgICAgICAgICAgICBfbG9nLndh cm4oJ1BsZWFzZSB1cGRhdGUgTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3Jlc291cmNlcy9JbXBv cnRFeHBlY3RhdGlvbnMgdG8gYXV0b21hdGUgaW1wb3J0aW5nIG9mICcgKyBwYXRoKQorCiAgICAg ZGVmIGdlbmVyYXRlX2dpdF9zdWJtb2R1bGVzX2Rlc2NyaXB0aW9uX2Zvcl9hbGxfcmVwb3NpdG9y aWVzKHNlbGYpOgogICAgICAgICBmb3IgdGVzdF9yZXBvc2l0b3J5IGluIHNlbGYuX3Rlc3RfZG93 bmxvYWRlci50ZXN0X3JlcG9zaXRvcmllczoKICAgICAgICAgICAgIGlmICdnZW5lcmF0ZV9naXRf c3VibW9kdWxlc19kZXNjcmlwdGlvbicgaW4gdGVzdF9yZXBvc2l0b3J5WydpbXBvcnRfb3B0aW9u cyddOgo= 299808 2017-01-26 07:51:17 -0800 2017-02-08 21:51:19 -0800 Patch bug-167448-20170126074915.patch text/plain 10285 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZjMzMyMjlmNjI1NDY1MjE1ZDEyNDViOGJkNzk3MmZj MzViNjBhOS4uNmU3Mjk1MWU4MGVlMzMwNGVkYTFhYTY3ZTgwMDQ3YjZkNzMxNTJkMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE3LTAxLTI2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXByb3ZlIFczQyBpbXBvcnRlciBjb21tYW5kIGxpbmUgb3B0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NDQ4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFraW5nIHRoZSBsaXN0IG9m IHRlc3QgcGF0aHMgdG8gaW1wb3J0IHRoZSBtYWluIGFyZ3VtZW50cyBvZiB0aGUgc2NyaXB0Lgor ICAgICAgICBBbGxvdyBwYXNzaW5nIHRoZSBzb3VyY2UgZGlyZWN0b3J5IHRvIGltcG9ydCBhcyBh IC1zIG9wdGlvbi4KKyAgICAgICAgQWRkaW5nIGEgd2FybmluZyB3aGVuIGdpdmVuIHRlc3QgcGF0 aHMgYXJlIHNraXBwZWQgYnkgZGVmYXVsdCBpbiBJbXBvcnRFeHBlY3RhdGlvbnMuCisKKyAgICAg ICAgTWFraW5nIGxpbmsgY29udmVyc2lvbiBvZmYgYnkgZGVmYXVsdCB3aGVuIGltcG9ydGluZyBm cm9tIGEgc3BlY2lmaWMgZGlyZWN0b3J5IHNpbmNlIHRoaXMgc2NyaXB0IGlzIG1vc3RseSB1c2Vk IHdpdGggd2ViLXBsYXRmb3JtLXRlc3RzLgorICAgICAgICBMaW5rIGNvbnZlcnNpb24gcnVsZXMg ZG8gbm90IGNoYW5nZSB3aGVuIGltcG9ydGVkIHRlc3RzIGFyZSBkb3dubG9hZGVkIGJ5IHRoZSBz Y3JpcHQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5 OgorICAgICAgICAobWFpbik6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAgKFRlc3RJ bXBvcnRlci5fX2luaXRfXyk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuZG9faW1wb3J0KToKKyAg ICAgICAgKFRlc3RJbXBvcnRlcik6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuY2hlY2tfaW1wb3J0 ZWRfZXhwZWN0YXRpb25zKToKKwogMjAxNy0wMS0yNSAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgW2lvcy1zaW11bGF0b3JdIEFQSSB0ZXN0IFdlYktpdDIuV2Vic2l0 ZVBvbGljaWVzQXV0b3BsYXlFbmFibGVkIHRpbWluZyBvdXQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDExOTk4MGQwMmJiN2Y4OGU4MGZhZWJlOGQw MTdlNGZiMmQyOGU0NGUuLjQ3Y2M2MjlmZWUxNmI4OTA1YjMzZmZhNzk0YTUxNGUxZWM5M2I1Njkg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtNzcs NyArNzcsNiBAQCBpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBqc29uCiBpbXBvcnQgbG9nZ2luZwog aW1wb3J0IG1pbWV0eXBlcwotaW1wb3J0IHN5cwogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0 IGltcG9ydCBIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBv cnQgRmlsZVN5c3RlbQpAQCAtOTIsMTUgKzkxLDExIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dl cihfX25hbWVfXykKIAogCiBkZWYgbWFpbihfYXJndiwgX3N0ZG91dCwgX3N0ZGVycik6Ci0gICAg b3B0aW9ucywgYXJncyA9IHBhcnNlX2FyZ3MoX2FyZ3YpCi0gICAgaW1wb3J0X2RpciA9IGFyZ3Nb MF0gaWYgYXJncyBlbHNlIE5vbmUKLSAgICBmaWxlc3lzdGVtID0gRmlsZVN5c3RlbSgpCi0gICAg aWYgaW1wb3J0X2RpciBhbmQgbm90IGZpbGVzeXN0ZW0uZXhpc3RzKGltcG9ydF9kaXIpOgotICAg ICAgICBzeXMuZXhpdCgnU291cmNlIGRpcmVjdG9yeSAlcyBub3QgZm91bmQhJyAlIGltcG9ydF9k aXIpCisgICAgb3B0aW9ucywgdGVzdF9wYXRocyA9IHBhcnNlX2FyZ3MoX2FyZ3YpCiAKICAgICBj b25maWd1cmVfbG9nZ2luZygpCiAKLSAgICB0ZXN0X2ltcG9ydGVyID0gVGVzdEltcG9ydGVyKEhv c3QoKSwgaW1wb3J0X2Rpciwgb3B0aW9ucykKKyAgICB0ZXN0X2ltcG9ydGVyID0gVGVzdEltcG9y dGVyKEhvc3QoKSwgdGVzdF9wYXRocywgb3B0aW9ucykKICAgICB0ZXN0X2ltcG9ydGVyLmRvX2lt cG9ydCgpCiAKIApAQCAtMTIxLDEyICsxMTYsMTYgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6 CiAKIAogZGVmIHBhcnNlX2FyZ3MoYXJncyk6Ci0gICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1l bnRQYXJzZXIocHJvZz0naW1wb3J0LXczYy10ZXN0cyBbdzNjX3Rlc3Rfc291cmNlX2RpcmVjdG9y eV0nKQorICAgIGRlc2NyaXB0aW9uID0gIiIiCitUbyBpbXBvcnQgYSB3ZWItcGxhdGZvcm0tdGVz dHMgdGVzdCBzdWl0ZSBuYW1lZCB4eXosIHVzZTogJ2ltcG9ydC13M2MtdGVzdHMgd2ViLXBsYXRm b3JtLXRlc3RzL3h5eicuCitUbyBpbXBvcnQgYSBjc3N3Zy10ZXN0IHRlc3Qgc3VpdGUgbmFtZWQg YWJjLCB1c2UgJ2ltcG9ydC13M2MtdGVzdHMgY3Nzd2ctdGVzdC9hYmMnLgorVG8gaW1wb3J0IGEg d2ViLXBsYXRmb3JtLXRlc3RzL2Nzc3dnLXRlc3QgdGVzdCBzdWl0ZSBmcm9tIGEgc3BlY2lmaWMg Zm9sZGVyLCB1c2UgJ2ltcG9ydC13M2MtdGVzdHMgd2ViLXBsYXRmb3JtLXRlc3RzL3h5eiAtcyBt eS1mb2xkZXItY29udGFpbmluZy13ZWItcGxhdGZvcm0tdGVzdHMtZm9sZGVyJyIiIgorICAgIHBh cnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKHByb2c9J2ltcG9ydC13M2MtdGVzdHMgW3dl Yi1wbGF0Zm9ybS10ZXN0cy90ZXN0LXN1aXRlLW5hbWUuLi5dJywgZGVzY3JpcHRpb249ZGVzY3Jp cHRpb24sIGZvcm1hdHRlcl9jbGFzcz1hcmdwYXJzZS5SYXdEZXNjcmlwdGlvbkhlbHBGb3JtYXR0 ZXIpCiAKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctbicsICctLW5vLW92ZXJ3cml0ZScsIGRl c3Q9J292ZXJ3cml0ZScsIGFjdGlvbj0nc3RvcmVfZmFsc2UnLCBkZWZhdWx0PVRydWUsCiAgICAg ICAgIGhlbHA9J0ZsYWcgdG8gcHJldmVudCBkdXBsaWNhdGUgdGVzdCBmaWxlcyBmcm9tIG92ZXJ3 cml0aW5nIGV4aXN0aW5nIHRlc3RzLiBCeSBkZWZhdWx0LCB0aGV5IHdpbGwgYmUgb3ZlcndyaXR0 ZW4nKQotICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1sJywgJy0tbm8tbGlua3MtY29udmVyc2lv bicsIGRlc3Q9J2NvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzJywgYWN0aW9uPSdzdG9yZV9mYWxz ZScsIGRlZmF1bHQ9VHJ1ZSwKLSAgICAgICBoZWxwPSdEbyBub3QgY2hhbmdlIGxpbmtzICh0ZXN0 aGFybmVzcyBqcyBvciBjc3MgZS5nLikuIFRoaXMgb3B0aW9uIG9ubHkgYXBwbGllcyB3aGVuIHBy b3ZpZGluZyBhIHNvdXJjZSBkaXJlY3RvcnksIGluIHdoaWNoIGNhc2UgYnkgZGVmYXVsdCwgbGlu a3MgYXJlIGNvbnZlcnRlZCB0byBwb2ludCB0byBXZWJLaXQgdGVzdGhhcm5lc3MgZmlsZXMuIFdo ZW4gdGVzdHMgYXJlIGRvd25sb2FkZWQgZnJvbSBXM0MgcmVwb3NpdG9yeSwgbGlua3MgYXJlIGNv bnZlcnRlZCBmb3IgQ1NTIHRlc3RzIGFuZCByZW1haW4gdW5jaGFuZ2VkIGZvciBXUFQgdGVzdHMn KQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1sJywgJy0tbGlua3MtY29udmVyc2lvbicsIGRl c3Q9J2NvbnZlcnRfdGVzdF9oYXJuZXNzX2xpbmtzJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVm YXVsdD1GYWxzZSwKKyAgICAgICBoZWxwPSdDaGFuZ2UgbGlua3MgKHRlc3RoYXJuZXNzIGpzIG9y IGNzcyBlLmcuKS4gVGhpcyBvcHRpb24gb25seSBhcHBsaWVzIHdoZW4gcHJvdmlkaW5nIGEgc291 cmNlIGRpcmVjdG9yeS4gSWYgdGhpcyBvcHRpb24gaXMgc2V0LCBsaW5rcyBhcmUgY29udmVydGVk IHRvIHBvaW50IHRvIFdlYktpdCB0ZXN0aGFybmVzcyBmaWxlcy4gV2hlbiB0ZXN0cyBhcmUgZG93 bmxvYWRlZCBmcm9tIFczQyByZXBvc2l0b3J5LCBsaW5rcyBhcmUgY29udmVydGVkIGZvciBDU1Mg dGVzdHMgYW5kIHJlbWFpbiB1bmNoYW5nZWQgZm9yIFdQVCB0ZXN0cycpCiAKICAgICBwYXJzZXIu YWRkX2FyZ3VtZW50KCctYScsICctLWFsbCcsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9 RmFsc2UsCiAgICAgICAgIGhlbHA9J0ltcG9ydCBhbGwgdGVzdHMgaW5jbHVkaW5nIHJlZnRlc3Rz LCBKUyB0ZXN0cywgYW5kIG1hbnVhbC9waXhlbCB0ZXN0cy4gQnkgZGVmYXVsdCwgb25seSByZWZ0 ZXN0cyBhbmQgSlMgdGVzdHMgYXJlIGltcG9ydGVkJykKQEAgLTEzNCw5ICsxMzMsOCBAQCBkZWYg cGFyc2VfYXJncyhhcmdzKToKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctZCcsICctLWRlc3Qt ZGlyJywgZGVzdD0nZGVzdGluYXRpb24nLCBkZWZhdWx0PWZzLmpvaW4oJ2ltcG9ydGVkJywgJ3cz YycpLAogICAgICAgICBoZWxwPSdJbXBvcnQgaW50byBhIHNwZWNpZmllZCBkaXJlY3RvcnkgcmVs YXRpdmUgdG8gdGhlIExheW91dFRlc3RzIHJvb3QuIEJ5IGRlZmF1bHQsIGltcG9ydHMgaW50byBp bXBvcnRlZC93M2MnKQogCi0gICAgbGlzdF9vZl9yZXBvc2l0b3JpZXMgPSAnIG9yICcuam9pbihb dGVzdF9yZXBvc2l0b3J5WyduYW1lJ10gZm9yIHRlc3RfcmVwb3NpdG9yeSBpbiBUZXN0RG93bmxv YWRlci5sb2FkX3Rlc3RfcmVwb3NpdG9yaWVzKCldKQotICAgIHBhcnNlci5hZGRfYXJndW1lbnQo Jy10JywgJy0tdGVzdC1wYXRoJywgYWN0aW9uPSdhcHBlbmQnLCBkZXN0PSd0ZXN0X3BhdGhzJywg ZGVmYXVsdD1bXSwKLSAgICAgICAgIGhlbHA9J0ltcG9ydCBvbmx5IHRlc3RzIGluIHRoZSBzdXBw bGllZCBzdWJkaXJlY3Rvcnkgb2YgdGhlIHNvdXJjZSBkaXJlY3RvcnkuIENhbiBiZSBzdXBwbGll ZCBtdWx0aXBsZSB0aW1lcyB0byBnaXZlIG11bHRpcGxlIHBhdGhzLiBGb3IgdGVzdHMgZGlyZWN0 bHkgY2xvbmVkIGZyb20gVzNDIHJlcG9zaXRvcmllcywgdXNlICcgKyBsaXN0X29mX3JlcG9zaXRv cmllcyArICcgcHJlZml4ZXMgdG8gZmlsdGVyIHNwZWNpZmljIHRlc3RzJykKKyAgICBwYXJzZXIu YWRkX2FyZ3VtZW50KCctcycsICctLXNyYy1kaXInLCBkZXN0PSdzb3VyY2UnLCBkZWZhdWx0PU5v bmUsCisgICAgICAgIGhlbHA9J0ltcG9ydCBmcm9tIGEgc3BlY2lmaWMgZm9sZGVyIHdoaWNoIGNv bnRhaW5zIHdlYi1wbGF0Zm9ybS10ZXN0cyBhbmQvb3IgY3Nzd2ctdGVzdCBmb2xkZXJzLiBJZiBu b3QgcHJvdmlkZWQsIHRoZSBzY3JpcHQgd2lsbCBjbG9uZSB0aGUgbmVjZXNzYXJ5IHJlcG9zaXRv cmllcy4nKQogCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLXYnLCAnLS12ZXJib3NlJywgYWN0 aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgIGhlbHA9J1ByaW50IG1h eGltYWwgbG9nJykKQEAgLTE0OSwxNyArMTQ3LDE2IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3MpOgog ICAgICAgICAgaGVscD0nQ2xlYW4gZGVzdGluYXRpb24gZGlyZWN0b3J5LiBBbGwgZmlsZXMgaW4g dGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSB3aWxsIGJlIGRlbGV0ZWQgZXhjZXB0IGZvciBXZWJL aXQgc3BlY2lmaWMgZmlsZXMgKHRlc3QgZXhwZWN0YXRpb25zLCAuZ2l0aWdub3JlLi4uKSBiZWZv cmUgbmV3IHRlc3RzIGltcG9ydC4gRGFuZ2xpbmcgdGVzdCBleHBlY3RhdGlvbnMgKGV4cGVjdGF0 aW9uIGZpbGUgdGhhdCBpcyBubyBsb25nZXIgcmVsYXRlZCB0byBhIHRlc3QpIGFyZSByZW1vdmVk IGFmdGVyIHRlc3RzIGltcG9ydC4nKQogCiAgICAgb3B0aW9ucywgYXJncyA9IHBhcnNlci5wYXJz ZV9rbm93bl9hcmdzKGFyZ3MpCi0gICAgaWYgbGVuKGFyZ3MpID4gMToKLSAgICAgICAgcGFyc2Vy LmVycm9yKCdJbmNvcnJlY3QgbnVtYmVyIG9mIGFyZ3VtZW50cycpCiAgICAgcmV0dXJuIG9wdGlv bnMsIGFyZ3MKIAogCiBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKIAotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBob3N0LCBzb3VyY2VfZGlyZWN0b3J5LCBvcHRpb25zKToKKyAgICBkZWYgX19p bml0X18oc2VsZiwgaG9zdCwgdGVzdF9wYXRocywgb3B0aW9ucyk6CiAgICAgICAgIHNlbGYuaG9z dCA9IGhvc3QKLSAgICAgICAgc2VsZi5zb3VyY2VfZGlyZWN0b3J5ID0gc291cmNlX2RpcmVjdG9y eQorICAgICAgICBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgPSBvcHRpb25zLnNvdXJjZQogICAgICAg ICBzZWxmLm9wdGlvbnMgPSBvcHRpb25zCisgICAgICAgIHNlbGYudGVzdF9wYXRocyA9IHRlc3Rf cGF0aHMKIAogICAgICAgICBzZWxmLmZpbGVzeXN0ZW0gPSBzZWxmLmhvc3QuZmlsZXN5c3RlbQog CkBAIC0xNzcsNyArMTc0LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAg IHNlbGYuX3BvdGVudGlhbF90ZXN0X3Jlc291cmNlX2ZpbGVzID0gW10KIAogICAgICAgICBzZWxm LmltcG9ydF9saXN0ID0gW10KLSAgICAgICAgc2VsZi5faW1wb3J0aW5nX2Rvd25sb2FkZWRfdGVz dHMgPSBzb3VyY2VfZGlyZWN0b3J5IGlzIE5vbmUKKyAgICAgICAgc2VsZi5faW1wb3J0aW5nX2Rv d25sb2FkZWRfdGVzdHMgPSBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgaXMgTm9uZQogCiAgICAgICAg IHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXNfanNvbl9wYXRoID0gc2VsZi5maWxlc3lzdGVtLmpv aW4oc2VsZi5sYXlvdXRfdGVzdHNfdzNjX3BhdGgsICJyZXNvdXJjZXMiLCAicmVzb3VyY2UtZmls ZXMuanNvbiIpCiAgICAgICAgIHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXMgPSBqc29uLmxvYWRz KHNlbGYuZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShzZWxmLl90ZXN0X3Jlc291cmNlX2ZpbGVz X2pzb25fcGF0aCkpIGlmIHNlbGYuZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5fdGVzdF9yZXNvdXJj ZV9maWxlc19qc29uX3BhdGgpIGVsc2UgTm9uZQpAQCAtMTk3LDkgKzE5NCw5IEBAIGNsYXNzIFRl c3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5zb3VyY2VfZGlyZWN0b3J5ID0g c2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi50ZXN0c19kb3dubG9hZF9wYXRoLCAndG8tYmUtaW1w b3J0ZWQnKQogICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5 KHNlbGYudGVzdHNfZG93bmxvYWRfcGF0aCkKICAgICAgICAgICAgIHNlbGYuZmlsZXN5c3RlbS5t YXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLnNvdXJjZV9kaXJlY3RvcnkpCi0gICAgICAgICAgICBz ZWxmLnRlc3RfZG93bmxvYWRlcigpLmRvd25sb2FkX3Rlc3RzKHNlbGYuc291cmNlX2RpcmVjdG9y eSwgc2VsZi5vcHRpb25zLnRlc3RfcGF0aHMpCisgICAgICAgICAgICBzZWxmLnRlc3RfZG93bmxv YWRlcigpLmRvd25sb2FkX3Rlc3RzKHNlbGYuc291cmNlX2RpcmVjdG9yeSwgc2VsZi50ZXN0X3Bh dGhzKQogCi0gICAgICAgIHRlc3RfcGF0aHMgPSBzZWxmLm9wdGlvbnMudGVzdF9wYXRocyBpZiBz ZWxmLm9wdGlvbnMudGVzdF9wYXRocyBlbHNlIFt0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSBmb3Ig dGVzdF9yZXBvc2l0b3J5IGluIHNlbGYudGVzdF9kb3dubG9hZGVyKCkudGVzdF9yZXBvc2l0b3Jp ZXNdCisgICAgICAgIHRlc3RfcGF0aHMgPSBzZWxmLnRlc3RfcGF0aHMgaWYgc2VsZi50ZXN0X3Bh dGhzIGVsc2UgW3Rlc3RfcmVwb3NpdG9yeVsnbmFtZSddIGZvciB0ZXN0X3JlcG9zaXRvcnkgaW4g c2VsZi50ZXN0X2Rvd25sb2FkZXIoKS50ZXN0X3JlcG9zaXRvcmllc10KICAgICAgICAgZm9yIHRl c3RfcGF0aCBpbiB0ZXN0X3BhdGhzOgogICAgICAgICAgICAgc2VsZi5maW5kX2ltcG9ydGFibGVf dGVzdHMoc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi5zb3VyY2VfZGlyZWN0b3J5LCB0ZXN0X3Bh dGgpKQogCkBAIC0yMTYsNiArMjEzLDEyIEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgog ICAgICAgICBpZiBzZWxmLl9pbXBvcnRpbmdfZG93bmxvYWRlZF90ZXN0czoKICAgICAgICAgICAg IHNlbGYuZ2VuZXJhdGVfZ2l0X3N1Ym1vZHVsZXNfZGVzY3JpcHRpb25fZm9yX2FsbF9yZXBvc2l0 b3JpZXMoKQogCisgICAgICAgIHNlbGYuY2hlY2tfaW1wb3J0ZWRfZXhwZWN0YXRpb25zKCkKKwor ICAgIGRlZiBjaGVja19pbXBvcnRlZF9leHBlY3RhdGlvbnMoc2VsZik6CisgICAgICAgIGZvciBw YXRoIGluIFtwYXRoIGZvciBwYXRoIGluIHNlbGYudGVzdF9wYXRocyBpZiBwYXRoIGluIHNlbGYu dGVzdF9kb3dubG9hZGVyKCkucGF0aHNfdG9fc2tpcF06CisgICAgICAgICAgICBfbG9nLndhcm4o J1BsZWFzZSB1cGRhdGUgTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3Jlc291cmNlcy9JbXBvcnRF eHBlY3RhdGlvbnMgdG8gYXV0b21hdGUgaW1wb3J0aW5nIG9mICcgKyBwYXRoKQorCiAgICAgZGVm IGdlbmVyYXRlX2dpdF9zdWJtb2R1bGVzX2Rlc2NyaXB0aW9uX2Zvcl9hbGxfcmVwb3NpdG9yaWVz KHNlbGYpOgogICAgICAgICBmb3IgdGVzdF9yZXBvc2l0b3J5IGluIHNlbGYuX3Rlc3RfZG93bmxv YWRlci50ZXN0X3JlcG9zaXRvcmllczoKICAgICAgICAgICAgIGlmICdnZW5lcmF0ZV9naXRfc3Vi bW9kdWxlc19kZXNjcmlwdGlvbicgaW4gdGVzdF9yZXBvc2l0b3J5WydpbXBvcnRfb3B0aW9ucydd OgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggYzFkNDhjZDQ3NjBjNjc0ZDg3MDI3 M2E0MzY1MjIxZGI5OTE2MjIzOC4uZTE5MDVkZDM4NmJkY2Y2M2UyMzY2NzYwNGY2NjBhZjE0NDU0 YWZjMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIw MTctMDEtMjYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIElt cHJvdmUgVzNDIGltcG9ydGVyIGNvbW1hbmQgbGluZSBvcHRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc0NDgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc291cmNlcy9UZXN0UmVwb3NpdG9y aWVzOiBTa2lwcGVkIG1vZHVsZSBnZW5lcmF0aW9uIGFuZCBnaXRpZ25vcmUgZ2VuZXJhdGlvbiBm b3IgdGhlIG1vbWVudC4KKwogMjAxNy0wMS0yMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIGlubmVyVGV4dCBzaG91bGQgcmVwbGFjZSBleGlzdGluZyB0ZXh0IG5v ZGUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9yZXNvdXJjZXMvVGVzdFJl cG9zaXRvcmllcyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9yZXNvdXJjZXMvVGVzdFJlcG9z aXRvcmllcwppbmRleCBkYTA3YjM1NGRjNjVmYmMwYWQxOGE1YzQzMWEzYWMzMzE1YjU4ODUwLi5k OThkMTZlMWJkMjNkYjVmNzYyY2JmZjhhOTRmNzZlYmQyODg0NzA4IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2MvcmVzb3VyY2VzL1Rlc3RSZXBvc2l0b3JpZXMKKysrIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3Jlc291cmNlcy9UZXN0UmVwb3NpdG9yaWVzCkBAIC0xLDcg KzEsNyBAQAogWwogICAgIHsKICAgICAgICAgIm5hbWUiOiAiY3Nzd2ctdGVzdCIsCi0gICAgICAg ICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3czYy9jc3N3Zy10ZXN0LmdpdCIsIAorICAgICAg ICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctdGVzdC5naXQiLAogICAgICAg ICAicmV2aXNpb24iOiAiYjJkYWE0MjZhZGRkNWNjYjhlOWNlMWM1ZDgwMGY5ZDgyNjAzZjFlYyIs CiAgICAgICAgICJwYXRoc190b19za2lwIjogWwogICAgICAgICAgICAgInN1cHBvcnQiLApAQCAt MzAsNiArMzAsNiBAQAogICAgICAgICAgICAgImNvbmZpZy5kZWZhdWx0Lmpzb24iLAogICAgICAg ICAgICAgInNlcnZlLnB5IgogICAgICAgICBdLAotICAgICAgICAiaW1wb3J0X29wdGlvbnMiOiBb ImdlbmVyYXRlX2dpdF9zdWJtb2R1bGVzX2Rlc2NyaXB0aW9uIiwgImdlbmVyYXRlX2dpdGlnbm9y ZSIsICJnZW5lcmF0ZV9pbml0X3B5Il0KKyAgICAgICAgImltcG9ydF9vcHRpb25zIjogWyJnZW5l cmF0ZV9pbml0X3B5Il0KICAgICB9CiBdCg== 301017 2017-02-08 21:51:23 -0800 2017-02-09 08:04:38 -0800 Patch for landing bug-167448-20170208214902.patch text/plain 11676 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjExODUxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzYwOTU5ODgxYTEyNWE1ZDUzN2QzYjVmMWJkOGM0ODE1 MWY4N2VmMS4uMDk5ZjY2MzljMGI5OWFkNjQ3ODI5N2Y1MzYwZTUzMmVmYjg4MTljYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDE3LTAyLTA4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAg ICAgICBJbXByb3ZlIFczQyBpbXBvcnRlciBjb21tYW5kIGxpbmUgb3B0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NDQ4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIE1ha2luZyB0aGUgbGlzdCBvZiB0 ZXN0IHBhdGhzIHRvIGltcG9ydCB0aGUgbWFpbiBhcmd1bWVudHMgb2YgdGhlIHNjcmlwdC4KKyAg ICAgICAgQWxsb3cgcGFzc2luZyB0aGUgc291cmNlIGRpcmVjdG9yeSB0byBpbXBvcnQgYXMgYSAt cyBvcHRpb24uCisgICAgICAgIEFkZGluZyBhIHdhcm5pbmcgd2hlbiBnaXZlbiB0ZXN0IHBhdGhz IGFyZSBza2lwcGVkIGJ5IGRlZmF1bHQgaW4gSW1wb3J0RXhwZWN0YXRpb25zLgorCisgICAgICAg IE1ha2luZyBsaW5rIGNvbnZlcnNpb24gb2ZmIGJ5IGRlZmF1bHQgd2hlbiBpbXBvcnRpbmcgZnJv bSBhIHNwZWNpZmljIGRpcmVjdG9yeSBzaW5jZSB0aGlzIHNjcmlwdCBpcyBtb3N0bHkgdXNlZCB3 aXRoIHdlYi1wbGF0Zm9ybS10ZXN0cy4KKyAgICAgICAgTGluayBjb252ZXJzaW9uIHJ1bGVzIGRv IG5vdCBjaGFuZ2Ugd2hlbiBpbXBvcnRlZCB0ZXN0cyBhcmUgZG93bmxvYWRlZCBieSB0aGUgc2Ny aXB0LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weToK KyAgICAgICAgKG1haW4pOgorICAgICAgICAocGFyc2VfYXJncyk6CisgICAgICAgIChUZXN0SW1w b3J0ZXIuX19pbml0X18pOgorICAgICAgICAoVGVzdEltcG9ydGVyLmRvX2ltcG9ydCk6CisgICAg ICAgIChUZXN0SW1wb3J0ZXIpOgorICAgICAgICAoVGVzdEltcG9ydGVyLmNoZWNrX2ltcG9ydGVk X2V4cGVjdGF0aW9ucyk6CisKKzIwMTctMDItMDggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgorCiAgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBpbmNvbWluZyBhdWRpbwogCiAg ICAgICAgIFtXZWJSVENdIEltcGxlbWVudCBJbmNvbWluZyBsaWJ3ZWJydGMgYXVkaW8gc291cmNl IHN1cHBvcnQuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpp bmRleCAzODFiYTAxYjkxMjczZTE3OTE0MDJhNzFkZjdmNjhmNjA5ZmQ5ZDQxLi4wNWVkNjRjYWNm MGQ2MDY0NWU1YTc4ZTRiMmFmOGI3Yzg2YWFlZmU2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKQEAgLTc3LDcgKzc3LDYgQEAgaW1wb3J0IGFyZ3BhcnNl CiBpbXBvcnQganNvbgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBtaW1ldHlwZXMKLWltcG9ydCBz eXMKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRw eS5jb21tb24uc3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KQEAgLTkyLDE1ICs5 MSwxMSBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAogZGVmIG1haW4o X2FyZ3YsIF9zdGRvdXQsIF9zdGRlcnIpOgotICAgIG9wdGlvbnMsIGFyZ3MgPSBwYXJzZV9hcmdz KF9hcmd2KQotICAgIGltcG9ydF9kaXIgPSBhcmdzWzBdIGlmIGFyZ3MgZWxzZSBOb25lCi0gICAg ZmlsZXN5c3RlbSA9IEZpbGVTeXN0ZW0oKQotICAgIGlmIGltcG9ydF9kaXIgYW5kIG5vdCBmaWxl c3lzdGVtLmV4aXN0cyhpbXBvcnRfZGlyKToKLSAgICAgICAgc3lzLmV4aXQoJ1NvdXJjZSBkaXJl Y3RvcnkgJXMgbm90IGZvdW5kIScgJSBpbXBvcnRfZGlyKQorICAgIG9wdGlvbnMsIHRlc3RfcGF0 aHMgPSBwYXJzZV9hcmdzKF9hcmd2KQogCiAgICAgY29uZmlndXJlX2xvZ2dpbmcoKQogCi0gICAg dGVzdF9pbXBvcnRlciA9IFRlc3RJbXBvcnRlcihIb3N0KCksIGltcG9ydF9kaXIsIG9wdGlvbnMp CisgICAgdGVzdF9pbXBvcnRlciA9IFRlc3RJbXBvcnRlcihIb3N0KCksIHRlc3RfcGF0aHMsIG9w dGlvbnMpCiAgICAgdGVzdF9pbXBvcnRlci5kb19pbXBvcnQoKQogCiAKQEAgLTEyMSw3ICsxMTYs MTEgQEAgZGVmIGNvbmZpZ3VyZV9sb2dnaW5nKCk6CiAKIAogZGVmIHBhcnNlX2FyZ3MoYXJncyk6 Ci0gICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIocHJvZz0naW1wb3J0LXczYy10 ZXN0cyBbdzNjX3Rlc3Rfc291cmNlX2RpcmVjdG9yeV0nKQorICAgIGRlc2NyaXB0aW9uID0gIiIi CitUbyBpbXBvcnQgYSB3ZWItcGxhdGZvcm0tdGVzdHMgdGVzdCBzdWl0ZSBuYW1lZCB4eXosIHVz ZTogJ2ltcG9ydC13M2MtdGVzdHMgd2ViLXBsYXRmb3JtLXRlc3RzL3h5eicuCitUbyBpbXBvcnQg YSBjc3N3Zy10ZXN0IHRlc3Qgc3VpdGUgbmFtZWQgYWJjLCB1c2UgJ2ltcG9ydC13M2MtdGVzdHMg Y3Nzd2ctdGVzdC9hYmMnLgorVG8gaW1wb3J0IGEgd2ViLXBsYXRmb3JtLXRlc3RzL2Nzc3dnLXRl c3QgdGVzdCBzdWl0ZSBmcm9tIGEgc3BlY2lmaWMgZm9sZGVyLCB1c2UgJ2ltcG9ydC13M2MtdGVz dHMgd2ViLXBsYXRmb3JtLXRlc3RzL3h5eiAtcyBteS1mb2xkZXItY29udGFpbmluZy13ZWItcGxh dGZvcm0tdGVzdHMtZm9sZGVyJyIiIgorICAgIHBhcnNlciA9IGFyZ3BhcnNlLkFyZ3VtZW50UGFy c2VyKHByb2c9J2ltcG9ydC13M2MtdGVzdHMgW3dlYi1wbGF0Zm9ybS10ZXN0cy90ZXN0LXN1aXRl LW5hbWUuLi5dJywgZGVzY3JpcHRpb249ZGVzY3JpcHRpb24sIGZvcm1hdHRlcl9jbGFzcz1hcmdw YXJzZS5SYXdEZXNjcmlwdGlvbkhlbHBGb3JtYXR0ZXIpCiAKICAgICBwYXJzZXIuYWRkX2FyZ3Vt ZW50KCctbicsICctLW5vLW92ZXJ3cml0ZScsIGRlc3Q9J292ZXJ3cml0ZScsIGFjdGlvbj0nc3Rv cmVfZmFsc2UnLCBkZWZhdWx0PVRydWUsCiAgICAgICAgIGhlbHA9J0ZsYWcgdG8gcHJldmVudCBk dXBsaWNhdGUgdGVzdCBmaWxlcyBmcm9tIG92ZXJ3cml0aW5nIGV4aXN0aW5nIHRlc3RzLiBCeSBk ZWZhdWx0LCB0aGV5IHdpbGwgYmUgb3ZlcndyaXR0ZW4nKQpAQCAtMTM0LDkgKzEzMyw4IEBAIGRl ZiBwYXJzZV9hcmdzKGFyZ3MpOgogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy1kJywgJy0tZGVz dC1kaXInLCBkZXN0PSdkZXN0aW5hdGlvbicsIGRlZmF1bHQ9ZnMuam9pbignaW1wb3J0ZWQnLCAn dzNjJyksCiAgICAgICAgIGhlbHA9J0ltcG9ydCBpbnRvIGEgc3BlY2lmaWVkIGRpcmVjdG9yeSBy ZWxhdGl2ZSB0byB0aGUgTGF5b3V0VGVzdHMgcm9vdC4gQnkgZGVmYXVsdCwgaW1wb3J0cyBpbnRv IGltcG9ydGVkL3czYycpCiAKLSAgICBsaXN0X29mX3JlcG9zaXRvcmllcyA9ICcgb3IgJy5qb2lu KFt0ZXN0X3JlcG9zaXRvcnlbJ25hbWUnXSBmb3IgdGVzdF9yZXBvc2l0b3J5IGluIFRlc3REb3du bG9hZGVyLmxvYWRfdGVzdF9yZXBvc2l0b3JpZXMoKV0pCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVu dCgnLXQnLCAnLS10ZXN0LXBhdGgnLCBhY3Rpb249J2FwcGVuZCcsIGRlc3Q9J3Rlc3RfcGF0aHMn LCBkZWZhdWx0PVtdLAotICAgICAgICAgaGVscD0nSW1wb3J0IG9ubHkgdGVzdHMgaW4gdGhlIHN1 cHBsaWVkIHN1YmRpcmVjdG9yeSBvZiB0aGUgc291cmNlIGRpcmVjdG9yeS4gQ2FuIGJlIHN1cHBs aWVkIG11bHRpcGxlIHRpbWVzIHRvIGdpdmUgbXVsdGlwbGUgcGF0aHMuIEZvciB0ZXN0cyBkaXJl Y3RseSBjbG9uZWQgZnJvbSBXM0MgcmVwb3NpdG9yaWVzLCB1c2UgJyArIGxpc3Rfb2ZfcmVwb3Np dG9yaWVzICsgJyBwcmVmaXhlcyB0byBmaWx0ZXIgc3BlY2lmaWMgdGVzdHMnKQorICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy1zJywgJy0tc3JjLWRpcicsIGRlc3Q9J3NvdXJjZScsIGRlZmF1bHQ9 Tm9uZSwKKyAgICAgICAgaGVscD0nSW1wb3J0IGZyb20gYSBzcGVjaWZpYyBmb2xkZXIgd2hpY2gg Y29udGFpbnMgd2ViLXBsYXRmb3JtLXRlc3RzIGFuZC9vciBjc3N3Zy10ZXN0IGZvbGRlcnMuIElm IG5vdCBwcm92aWRlZCwgdGhlIHNjcmlwdCB3aWxsIGNsb25lIHRoZSBuZWNlc3NhcnkgcmVwb3Np dG9yaWVzLicpCiAKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctdicsICctLXZlcmJvc2UnLCBh Y3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgaGVscD0nUHJpbnQg bWF4aW1hbCBsb2cnKQpAQCAtMTQ5LDE3ICsxNDcsMTYgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncyk6 CiAgICAgICAgICBoZWxwPSdDbGVhbiBkZXN0aW5hdGlvbiBkaXJlY3RvcnkuIEFsbCBmaWxlcyBp biB0aGUgZGVzdGluYXRpb24gZGlyZWN0b3J5IHdpbGwgYmUgZGVsZXRlZCBleGNlcHQgZm9yIFdl YktpdCBzcGVjaWZpYyBmaWxlcyAodGVzdCBleHBlY3RhdGlvbnMsIC5naXRpZ25vcmUuLi4pIGJl Zm9yZSBuZXcgdGVzdHMgaW1wb3J0LiBEYW5nbGluZyB0ZXN0IGV4cGVjdGF0aW9ucyAoZXhwZWN0 YXRpb24gZmlsZSB0aGF0IGlzIG5vIGxvbmdlciByZWxhdGVkIHRvIGEgdGVzdCkgYXJlIHJlbW92 ZWQgYWZ0ZXIgdGVzdHMgaW1wb3J0LicpCiAKICAgICBvcHRpb25zLCBhcmdzID0gcGFyc2VyLnBh cnNlX2tub3duX2FyZ3MoYXJncykKLSAgICBpZiBsZW4oYXJncykgPiAxOgotICAgICAgICBwYXJz ZXIuZXJyb3IoJ0luY29ycmVjdCBudW1iZXIgb2YgYXJndW1lbnRzJykKICAgICByZXR1cm4gb3B0 aW9ucywgYXJncwogCiAKIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogCi0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIGhvc3QsIHNvdXJjZV9kaXJlY3RvcnksIG9wdGlvbnMpOgorICAgIGRlZiBf X2luaXRfXyhzZWxmLCBob3N0LCB0ZXN0X3BhdGhzLCBvcHRpb25zKToKICAgICAgICAgc2VsZi5o b3N0ID0gaG9zdAotICAgICAgICBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgPSBzb3VyY2VfZGlyZWN0 b3J5CisgICAgICAgIHNlbGYuc291cmNlX2RpcmVjdG9yeSA9IG9wdGlvbnMuc291cmNlCiAgICAg ICAgIHNlbGYub3B0aW9ucyA9IG9wdGlvbnMKKyAgICAgICAgc2VsZi50ZXN0X3BhdGhzID0gdGVz dF9wYXRocyBpZiB0ZXN0X3BhdGhzIGVsc2UgW10KIAogICAgICAgICBzZWxmLmZpbGVzeXN0ZW0g PSBzZWxmLmhvc3QuZmlsZXN5c3RlbQogCkBAIC0xNzcsNyArMTc0LDcgQEAgY2xhc3MgVGVzdElt cG9ydGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3BvdGVudGlhbF90ZXN0X3Jlc291cmNlX2Zp bGVzID0gW10KIAogICAgICAgICBzZWxmLmltcG9ydF9saXN0ID0gW10KLSAgICAgICAgc2VsZi5f aW1wb3J0aW5nX2Rvd25sb2FkZWRfdGVzdHMgPSBzb3VyY2VfZGlyZWN0b3J5IGlzIE5vbmUKKyAg ICAgICAgc2VsZi5faW1wb3J0aW5nX2Rvd25sb2FkZWRfdGVzdHMgPSBzZWxmLnNvdXJjZV9kaXJl Y3RvcnkgaXMgTm9uZQogCiAgICAgICAgIHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXNfanNvbl9w YXRoID0gc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi5sYXlvdXRfdGVzdHNfdzNjX3BhdGgsICJy ZXNvdXJjZXMiLCAicmVzb3VyY2UtZmlsZXMuanNvbiIpCiAgICAgICAgIHNlbGYuX3Rlc3RfcmVz b3VyY2VfZmlsZXMgPSBqc29uLmxvYWRzKHNlbGYuZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShz ZWxmLl90ZXN0X3Jlc291cmNlX2ZpbGVzX2pzb25fcGF0aCkpIGlmIHNlbGYuZmlsZXN5c3RlbS5l eGlzdHMoc2VsZi5fdGVzdF9yZXNvdXJjZV9maWxlc19qc29uX3BhdGgpIGVsc2UgTm9uZQpAQCAt MTk3LDkgKzE5NCw5IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICAgICAg c2VsZi5zb3VyY2VfZGlyZWN0b3J5ID0gc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi50ZXN0c19k b3dubG9hZF9wYXRoLCAndG8tYmUtaW1wb3J0ZWQnKQogICAgICAgICAgICAgc2VsZi5maWxlc3lz dGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYudGVzdHNfZG93bmxvYWRfcGF0aCkKICAgICAg ICAgICAgIHNlbGYuZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLnNvdXJjZV9k aXJlY3RvcnkpCi0gICAgICAgICAgICBzZWxmLnRlc3RfZG93bmxvYWRlcigpLmRvd25sb2FkX3Rl c3RzKHNlbGYuc291cmNlX2RpcmVjdG9yeSwgc2VsZi5vcHRpb25zLnRlc3RfcGF0aHMpCisgICAg ICAgICAgICBzZWxmLnRlc3RfZG93bmxvYWRlcigpLmRvd25sb2FkX3Rlc3RzKHNlbGYuc291cmNl X2RpcmVjdG9yeSwgc2VsZi50ZXN0X3BhdGhzKQogCi0gICAgICAgIHRlc3RfcGF0aHMgPSBzZWxm Lm9wdGlvbnMudGVzdF9wYXRocyBpZiBzZWxmLm9wdGlvbnMudGVzdF9wYXRocyBlbHNlIFt0ZXN0 X3JlcG9zaXRvcnlbJ25hbWUnXSBmb3IgdGVzdF9yZXBvc2l0b3J5IGluIHNlbGYudGVzdF9kb3du bG9hZGVyKCkudGVzdF9yZXBvc2l0b3JpZXNdCisgICAgICAgIHRlc3RfcGF0aHMgPSBzZWxmLnRl c3RfcGF0aHMgaWYgc2VsZi50ZXN0X3BhdGhzIGVsc2UgW3Rlc3RfcmVwb3NpdG9yeVsnbmFtZSdd IGZvciB0ZXN0X3JlcG9zaXRvcnkgaW4gc2VsZi50ZXN0X2Rvd25sb2FkZXIoKS50ZXN0X3JlcG9z aXRvcmllc10KICAgICAgICAgZm9yIHRlc3RfcGF0aCBpbiB0ZXN0X3BhdGhzOgogICAgICAgICAg ICAgc2VsZi5maW5kX2ltcG9ydGFibGVfdGVzdHMoc2VsZi5maWxlc3lzdGVtLmpvaW4oc2VsZi5z b3VyY2VfZGlyZWN0b3J5LCB0ZXN0X3BhdGgpKQogCkBAIC0yMTYsNiArMjEzLDEyIEBAIGNsYXNz IFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICBpZiBzZWxmLl9pbXBvcnRpbmdfZG93bmxv YWRlZF90ZXN0czoKICAgICAgICAgICAgIHNlbGYuZ2VuZXJhdGVfZ2l0X3N1Ym1vZHVsZXNfZGVz Y3JpcHRpb25fZm9yX2FsbF9yZXBvc2l0b3JpZXMoKQogCisgICAgICAgIHNlbGYuY2hlY2tfaW1w b3J0ZWRfZXhwZWN0YXRpb25zKCkKKworICAgIGRlZiBjaGVja19pbXBvcnRlZF9leHBlY3RhdGlv bnMoc2VsZik6CisgICAgICAgIGZvciBwYXRoIGluIFtwYXRoIGZvciBwYXRoIGluIHNlbGYudGVz dF9wYXRocyBpZiBwYXRoIGluIHNlbGYudGVzdF9kb3dubG9hZGVyKCkucGF0aHNfdG9fc2tpcF06 CisgICAgICAgICAgICBfbG9nLndhcm4oJ1BsZWFzZSB1cGRhdGUgTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3Jlc291cmNlcy9JbXBvcnRFeHBlY3RhdGlvbnMgdG8gYXV0b21hdGUgaW1wb3J0aW5n IG9mICcgKyBwYXRoKQorCiAgICAgZGVmIGdlbmVyYXRlX2dpdF9zdWJtb2R1bGVzX2Rlc2NyaXB0 aW9uX2Zvcl9hbGxfcmVwb3NpdG9yaWVzKHNlbGYpOgogICAgICAgICBmb3IgdGVzdF9yZXBvc2l0 b3J5IGluIHNlbGYuX3Rlc3RfZG93bmxvYWRlci50ZXN0X3JlcG9zaXRvcmllczoKICAgICAgICAg ICAgIGlmICdnZW5lcmF0ZV9naXRfc3VibW9kdWxlc19kZXNjcmlwdGlvbicgaW4gdGVzdF9yZXBv c2l0b3J5WydpbXBvcnRfb3B0aW9ucyddOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3QucHkKaW5kZXggZTExMmViMzA3MjEwNzFkODQ5 MjA3Y2U2Yjg2N2Q2MGY1NWU3MWQxOC4uMjY1YTAyYjNhMDVjMjFjYWU4MTA4MWMwNzBhNDU4YjNh ZjlkM2RhYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBv cnRlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyX3VuaXR0ZXN0LnB5CkBAIC03MiwxMSArNzIsMTMgQEAgY2xhc3MgVGVzdEltcG9ydGVy VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHJldHVybiBvcHRpb25zCiAKICAgICBk ZWYgdGVzdF9pbXBvcnRfZGlyX3dpdGhfbm9fdGVzdHNfYW5kX25vX2hnKHNlbGYpOgorICAgICAg ICBGQUtFX0ZJTEVTLnVwZGF0ZShGQUtFX1JFUE9TSVRPUlkpCisKICAgICAgICAgaG9zdCA9IE1v Y2tIb3N0KCkKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihleGNlcHRp b249T1NFcnJvcigpKQogICAgICAgICBob3N0LmZpbGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbShm aWxlcz1GQUtFX0ZJTEVTKQogCi0gICAgICAgIGltcG9ydGVyID0gVGVzdEltcG9ydGVyKGhvc3Qs IEZBS0VfU09VUkNFX0RJUiwgc2VsZi5fcGFyc2Vfb3B0aW9ucyhbJy1uJywgJy1kJywgJ3czYycs ICctdCcsIEZBS0VfVEVTVF9QQVRIXSkpCisgICAgICAgIGltcG9ydGVyID0gVGVzdEltcG9ydGVy KGhvc3QsIEZBS0VfVEVTVF9QQVRILCBzZWxmLl9wYXJzZV9vcHRpb25zKFsnLW4nLCAnLWQnLCAn dzNjJywgJy1zJywgRkFLRV9TT1VSQ0VfRElSXSkpCiAKICAgICAgICAgb2MgPSBPdXRwdXRDYXB0 dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQpAQCAtODYsMTEgKzg4LDEzIEBAIGNs YXNzIFRlc3RJbXBvcnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgb2Mu cmVzdG9yZV9vdXRwdXQoKQogCiAgICAgZGVmIHRlc3RfaW1wb3J0X2Rpcl93aXRoX25vX3Rlc3Rz KHNlbGYpOgorICAgICAgICBGQUtFX0ZJTEVTLnVwZGF0ZShGQUtFX1JFUE9TSVRPUlkpCisKICAg ICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhl Y3V0aXZlMihleGNlcHRpb249U2NyaXB0RXJyb3IoImFib3J0OiBubyByZXBvc2l0b3J5IGZvdW5k IGluICcvVm9sdW1lcy9Tb3VyY2Uvc3JjL3drL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjJyAo LmhnIG5vdCBmb3VuZCkhIikpCiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lz dGVtKGZpbGVzPUZBS0VfRklMRVMpCiAKLSAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIo aG9zdCwgRkFLRV9TT1VSQ0VfRElSLCBzZWxmLl9wYXJzZV9vcHRpb25zKFsnLW4nLCAnLWQnLCAn dzNjJywgJy10JywgRkFLRV9URVNUX1BBVEhdKSkKKyAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1w b3J0ZXIoaG9zdCwgRkFLRV9URVNUX1BBVEgsIHNlbGYuX3BhcnNlX29wdGlvbnMoWyctbicsICct ZCcsICd3M2MnLCAnLXMnLCBGQUtFX1NPVVJDRV9ESVJdKSkKICAgICAgICAgb2MgPSBPdXRwdXRD YXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICB0cnk6CkBAIC0x MDMsMTEgKzEwNywxMiBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgICAgICcvdGVzdHMvY3Nzd2cvdGVzdDEvX19pbml0X18ucHknOiAnJywKICAg ICAgICAgICAgICcvdGVzdHMvY3Nzd2cvdGVzdDIvX19pbml0X18ucHknOiAnTk9URU1QVFknLAog ICAgICAgICB9CisgICAgICAgIEZBS0VfRklMRVMudXBkYXRlKEZBS0VfUkVQT1NJVE9SWSkKIAog ICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAgICAgICBob3N0LmZpbGVzeXN0ZW0gPSBNb2Nr RmlsZVN5c3RlbShmaWxlcz1GQUtFX0ZJTEVTKQogCi0gICAgICAgIGltcG9ydGVyID0gVGVzdElt cG9ydGVyKGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgc2VsZi5fcGFyc2Vfb3B0aW9ucyhbJy1uJywg Jy1kJywgJ3czYycsICctdCcsICcvdGVzdHMvY3Nzd2cnXSkpCisgICAgICAgIGltcG9ydGVyID0g VGVzdEltcG9ydGVyKGhvc3QsIFsndGVzdDEnLCAndGVzdDInXSwgc2VsZi5fcGFyc2Vfb3B0aW9u cyhbJy1uJywgJy1kJywgJ3czYycsICctcycsIEZBS0VfU09VUkNFX0RJUl0pKQogICAgICAgICBp bXBvcnRlci5kb19pbXBvcnQoKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShob3N0LmZpbGVz eXN0ZW0uZXhpc3RzKCIvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy93M2MvdGVzdDEvX19pbml0 X18ucHkiKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGM2M2ZkM2EwNjczOTg2 N2FhOTE1MjQ2MThiYzRiNWUyNjViYzczNDkuLmQzMGViMzQ4MzEwN2I5MWM5MDE1NDM2MmQyODkx OWNkOTIyODI4M2YgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDE3LTAyLTA4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBJbXByb3ZlIFczQyBpbXBvcnRlciBjb21tYW5kIGxpbmUgb3B0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NDQ4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgICogcmVzb3VyY2VzL1Rlc3RSZXBv c2l0b3JpZXM6IFNraXBwZWQgbW9kdWxlIGdlbmVyYXRpb24gYW5kIGdpdGlnbm9yZSBnZW5lcmF0 aW9uIGZvciB0aGUgbW9tZW50LgorCiAyMDE3LTAyLTA3ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u QGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYSBKU09OIGZpbGUgdG8gZGVmaW5lIHdoaWNoIFdQ VCBmaWxlcy9mb2xkZXJzIHRvIGltcG9ydApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3Jlc291cmNlcy9UZXN0UmVwb3NpdG9yaWVzIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3Jlc291cmNlcy9UZXN0UmVwb3NpdG9yaWVzCmluZGV4IGRhMDdiMzU0ZGM2NWZiYzBhZDE4 YTVjNDMxYTNhYzMzMTViNTg4NTAuLmQ5OGQxNmUxYmQyM2RiNWY3NjJjYmZmOGE5NGY3NmViZDI4 ODQ3MDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9yZXNvdXJjZXMvVGVz dFJlcG9zaXRvcmllcworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvcmVzb3VyY2VzL1Rl c3RSZXBvc2l0b3JpZXMKQEAgLTEsNyArMSw3IEBACiBbCiAgICAgewogICAgICAgICAibmFtZSI6 ICJjc3N3Zy10ZXN0IiwKLSAgICAgICAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdzNjL2Nz c3dnLXRlc3QuZ2l0IiwgCisgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3czYy9j c3N3Zy10ZXN0LmdpdCIsCiAgICAgICAgICJyZXZpc2lvbiI6ICJiMmRhYTQyNmFkZGQ1Y2NiOGU5 Y2UxYzVkODAwZjlkODI2MDNmMWVjIiwKICAgICAgICAgInBhdGhzX3RvX3NraXAiOiBbCiAgICAg ICAgICAgICAic3VwcG9ydCIsCkBAIC0zMCw2ICszMCw2IEBACiAgICAgICAgICAgICAiY29uZmln LmRlZmF1bHQuanNvbiIsCiAgICAgICAgICAgICAic2VydmUucHkiCiAgICAgICAgIF0sCi0gICAg ICAgICJpbXBvcnRfb3B0aW9ucyI6IFsiZ2VuZXJhdGVfZ2l0X3N1Ym1vZHVsZXNfZGVzY3JpcHRp b24iLCAiZ2VuZXJhdGVfZ2l0aWdub3JlIiwgImdlbmVyYXRlX2luaXRfcHkiXQorICAgICAgICAi aW1wb3J0X29wdGlvbnMiOiBbImdlbmVyYXRlX2luaXRfcHkiXQogICAgIH0KIF0K