150332 2015-10-19 09:10:44 -0700 WPT server should use its own testharness.js file and generate a warning when it does not match WebKit version 2015-11-19 00:17:55 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 151262 151295 1 youennf youennf cdumez commit-queue darin glenn lforschler rniwa oldest_to_newest 1134586 0 youennf 2015-10-19 09:10:44 -0700 As discussed with rniwa and bem in the past, wpt server uses WebKit testharness.js file to run the tests. This is ok in most cases, except when syncing WPT tests. When syncing WPT tests, one needs first to sync WebKit testharness.js to ensure that nothing wrong happens. Then syncing WPT tests can be done. This adds unnecessary burden to the task of syncing WPT tests, which is already complex enough. It might be more appropriate to: - Always use WPT version for WPT tests. - Add a warning when WK testharness.js is not matching WPT version so that WK testharness.js gets updated. 1134590 1 263485 youennf 2015-10-19 09:13:39 -0700 Created attachment 263485 Patch 1135151 2 youennf 2015-10-21 00:18:41 -0700 (In reply to comment #1) > Created attachment 263485 [details] > Patch Need to wait to land this patch as WebKit testharness timeouts are different from WPT default values. 1142116 3 263485 commit-queue 2015-11-15 10:17:32 -0800 Comment on attachment 263485 Patch Clearing flags on attachment: 263485 Committed r192462: <http://trac.webkit.org/changeset/192462> 1142117 4 commit-queue 2015-11-15 10:17:37 -0800 All reviewed patches have been landed. Closing bug. 1142120 5 commit-queue 2015-11-15 10:48:19 -0800 Re-opened since this is blocked by bug 151295 1142184 6 265574 youennf 2015-11-16 01:13:36 -0800 Created attachment 265574 Fixing python tests 1142185 7 265574 youennf 2015-11-16 01:14:08 -0800 Comment on attachment 265574 Fixing python tests Fixing python tests. Marking it as r? again. 1142408 8 265574 rniwa 2015-11-16 17:04:47 -0800 Comment on attachment 265574 Fixing python tests View in context: https://bugs.webkit.org/attachment.cgi?id=265574&action=review > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:103 > + wk_testharnessjs_file = self._filesystem.join(self._layout_root, "resources", "testharness.js") Since everything is in WebKit, it's probably better to call it layout_test_testharnessjs_file instead. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:104 > + # Next two lines are a temp hack for this patch to land smoothly on bots. They should be removed once patch landed and each bot runs these lines once. Nit: an extra space at the beginning. Also, this should probably be a FIXME. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:107 > + # Let's check whether WPT testharness.js is the same as WK version I don't think this comment is necessary. Please remove it. > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:109 > + _log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n") Nit: according WPT testharness.js. 1143212 9 265852 youennf 2015-11-18 23:57:16 -0800 Created attachment 265852 Patch for landing 1143213 10 youennf 2015-11-19 00:00:27 -0800 Thanks for the review. I updated according your comments... > > Tools/Scripts/webkitpy/layout_tests/servers/web_platform_test_server.py:109 > > + _log.warning("\n//////////\nWPT tests are not using the same testharness.js file as other WebKit Layout tests.\nWebKit testharness.js might need to be updated according WPT testharness.js.\n//////////\n") > > Nit: according WPT testharness.js. Except for this one. I am not sure what you are suggesting. Let me know and I'll be able to fix that as a follow-up patch. 1143221 11 265852 commit-queue 2015-11-19 00:17:50 -0800 Comment on attachment 265852 Patch for landing Clearing flags on attachment: 265852 Committed r192617: <http://trac.webkit.org/changeset/192617> 1143222 12 commit-queue 2015-11-19 00:17:55 -0800 All reviewed patches have been landed. Closing bug. 263485 2015-10-19 09:13:39 -0700 2015-11-16 01:13:29 -0800 Patch bug-150332-20151019181249.patch text/plain 3620 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMjg4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjE1NTI5ZTdkNTJkYjdkNTU1NmQ4MTdlNmYxZTYyM2Yw NTkxNmUyYS4uYTI2ZWIzMDRlNjJkZWM3NWJkZjQ0NDYyYTA5MTE3ODVmZGU3MDUxYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE1LTEwLTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgV1BUIHNlcnZlciBzaG91bGQgdXNlIGl0cyBvd24gdGVzdGhhcm5lc3Mu anMgZmlsZSBhbmQgZ2VuZXJhdGUgYSB3YXJuaW5nIHdoZW4gaXQgZG9lcyBub3QgbWF0Y2ggV2Vi S2l0IHZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MDMzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93ZWJfcGxhdGZvcm1f dGVzdF9zZXJ2ZXIucHk6CisgICAgICAgIChXZWJQbGF0Zm9ybVRlc3RTZXJ2ZXIuX19pbml0X18p OiBSZW1vdmVkIHRlc3RoYXJuZXNzLmpzIGFzIGZpbGUgdG8gY29weSBmcm9tIFdLIHRvIFdQVC4K KyAgICAgICAgKFdlYlBsYXRmb3JtVGVzdFNlcnZlci5fY29weV93ZWJraXRfdGVzdF9maWxlcyk6 IEFkZGVkIHdhcm5pbmcgZ2VuZXJhdGlvbiB3aGVuIFdLIHRlc3RoYXJuZXNzLmpzIGlzIG5vdCBt YXRjaGluZyBXUFQgdmVyc2lvbi4KKwogMjAxNS0xMC0xOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8 b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBoaXN0b3JpY2FsIGFkZHJlc3NlcyB0byBj b250cmlidXRvcnMuanNvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvc2VydmVycy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZl ci5weQppbmRleCA0YWFlZjg1YzRjYzkxMjBjNjRlNjI2Y2FmOTdhMzc3N2E2MWFmYjkxLi40Yjg3 ZDE1MDkzNWFhMGFiOTBjZmM0ODVhMmQwZGFkNDk5OGJjNGEyIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3Nl cnZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJz L3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlci5weQpAQCAtMjEsNiArMjEsNyBAQAogIyAgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkg T1VUIE9GIFRIRSBVU0UKICMgIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCBmaWxlY21wCiBpbXBvcnQg anNvbgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBzeXMKQEAgLTcyLDcgKzczLDcgQEAgY2xhc3Mg V2ViUGxhdGZvcm1UZXN0U2VydmVyKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgog ICAgICAgICBzZWxmLl9sYXlvdXRfcm9vdCA9IHBvcnRfb2JqLnBhdGhfZnJvbV93ZWJraXRfYmFz ZSgiTGF5b3V0VGVzdHMiKQogICAgICAgICBzZWxmLl9kb2Nfcm9vdCA9IHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihzZWxmLl9sYXlvdXRfcm9vdCwgZG9jX3Jvb3QocG9ydF9vYmopKQogCi0gICAgICAg IHNlbGYuX3Jlc291cmNlc19maWxlc190b19jb3B5ID0gWyd0ZXN0aGFybmVzcy5qcycsICd0ZXN0 aGFybmVzcy5jc3MnLCAndGVzdGhhcm5lc3NyZXBvcnQuanMnXQorICAgICAgICBzZWxmLl9yZXNv dXJjZXNfZmlsZXNfdG9fY29weSA9IFsndGVzdGhhcm5lc3MuY3NzJywgJ3Rlc3RoYXJuZXNzcmVw b3J0LmpzJ10KIAogICAgICAgICBjdXJyZW50X2Rpcl9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5h YnNwYXRoKHNlbGYuX2ZpbGVzeXN0ZW0uc3BsaXQoX19maWxlX18pWzBdKQogICAgICAgICBzZWxm Ll9zdGFydF9jbWQgPSBbInB5dGhvbiIsIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihjdXJyZW50X2Rp cl9wYXRoLCAid2ViX3BsYXRmb3JtX3Rlc3RfbGF1bmNoZXIucHkiKSwgc2VsZi5fc2VydmVyc19m aWxlXQpAQCAtOTksNiArMTAwLDE1IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdFNlcnZlcihodHRw X3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAgICAgICAgIGNvbmZpZ19qc29uID0g c2VsZi5fZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShjb25maWdfd2tfZmlsZW5hbWUpLnJlcGxh Y2UoIiVDRVJUU19ESVIlIiwgc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX291dHB1dF9kaXIs ICJfd3B0X2NlcnRzIikpCiAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLndyaXRlX3RleHRf ZmlsZShzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fZG9jX3Jvb3QsICJjb25maWcuanNvbiIp LCBjb25maWdfanNvbikKIAorICAgICAgICB3cHRfdGVzdGhhcm5lc3Nqc19maWxlID0gc2VsZi5f ZmlsZXN5c3RlbS5qb2luKHNlbGYuX2RvY19yb290LCAicmVzb3VyY2VzIiwgInRlc3RoYXJuZXNz LmpzIikKKyAgICAgICAgd2tfdGVzdGhhcm5lc3Nqc19maWxlID0gc2VsZi5fZmlsZXN5c3RlbS5q b2luKHNlbGYuX2xheW91dF9yb290LCAicmVzb3VyY2VzIiwgInRlc3RoYXJuZXNzLmpzIikKKyAg ICAgICAgICMgTmV4dCB0d28gbGluZXMgYXJlIGEgdGVtcCBoYWNrIGZvciB0aGlzIHBhdGNoIHRv IGxhbmQgc21vb3RobHkgb24gYm90cy4gVGhleSBzaG91bGQgYmUgcmVtb3ZlZCBvbmNlIHBhdGNo IGxhbmRlZCBhbmQgZWFjaCBib3QgcnVucyB0aGVzZSBsaW5lcyBvbmNlLgorICAgICAgICBpZiAo bm90IHNlbGYuX2ZpbGVzeXN0ZW0uaXNmaWxlKHdwdF90ZXN0aGFybmVzc2pzX2ZpbGUpKToKKyAg ICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0uY29weWZpbGUod2tfdGVzdGhhcm5lc3Nqc19maWxl LCB3cHRfdGVzdGhhcm5lc3Nqc19maWxlKQorICAgICAgICAjIExldCdzIGNoZWNrIHdoZXRoZXIg V1BUIHRlc3RoYXJuZXNzLmpzIGlzIHRoZSBzYW1lIGFzIFdLIHZlcnNpb24KKyAgICAgICAgaWYg KG5vdCBmaWxlY21wLmNtcCh3cHRfdGVzdGhhcm5lc3Nqc19maWxlLCB3a190ZXN0aGFybmVzc2pz X2ZpbGUpKToKKyAgICAgICAgICAgIF9sb2cud2FybmluZygiXG4vLy8vLy8vLy8vXG5XUFQgdGVz dHMgYXJlIG5vdCB1c2luZyB0aGUgc2FtZSB0ZXN0aGFybmVzcy5qcyBmaWxlIGFzIG90aGVyIFdl YktpdCBMYXlvdXQgdGVzdHMuXG5XZWJLaXQgdGVzdGhhcm5lc3MuanMgbWlnaHQgbmVlZCB0byBi ZSB1cGRhdGVkIGFjY29yZGluZyBXUFQgdGVzdGhhcm5lc3MuanMuXG4vLy8vLy8vLy8vXG4iKQor CiAgICAgZGVmIF9jbGVhbl93ZWJraXRfdGVzdF9maWxlcyhzZWxmKToKICAgICAgICAgX2xvZy5k ZWJ1ZygnQ2xlYW5pbmcgV1BUIHJlc291cmNlcyBmaWxlcycpCiAgICAgICAgIGZvciBmIGluIHNl bGYuX3Jlc291cmNlc19maWxlc190b19jb3B5Ogo= 265574 2015-11-16 01:13:36 -0800 2015-11-18 23:57:08 -0800 Fixing python tests bug-150332-20151116101326.patch text/plain 7268 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNDY0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmE0ZTk2NmZlMzE0ODhkMDhlZjA2NGFjODAyNTBmZWMy MmFjMWI5MS4uODliODc4NjEyNzhjNjY2NDU4ZTYyYTUzYTY4NTdmOGZjYTQyYmE0YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE1LTExLTE2ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgV1BUIHNlcnZlciBzaG91bGQgdXNlIGl0cyBvd24gdGVzdGhhcm5lc3Mu anMgZmlsZSBhbmQgZ2VuZXJhdGUgYSB3YXJuaW5nIHdoZW4gaXQgZG9lcyBub3QgbWF0Y2ggV2Vi S2l0IHZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MDMzMgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAg IFJlbW92aW5nIHRlc3RoYXJuZXNzLmpzIG92ZXJ3cml0aW5nIGZyb20gTGF5b3V0VGVzdHMvcmVz b3VyY2VzIHRvIExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcmVz b3VyY2VzLgorICAgICAgICBBZGRpbmcgc3VwcG9ydCBmb3IgZmlsZSBjb21wYXJpc29uIGluIHB5 dGhvbiBmaWxlc3lzdGVtLgorICAgICAgICAjTm91c1NvbW1lc1VuaXMuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weToKKyAgICAgICAgKEZp bGVTeXN0ZW0uY29tcGFyZSk6IEFkZGluZyBjb21wYXJlIGFzIGEgd3JhcHBlciBhcm91bmQgZmls ZWNtcC5jbXAuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVz eXN0ZW1fbW9jay5weToKKyAgICAgICAgKE1vY2tGaWxlU3lzdGVtLmNvbXBhcmUpOiBBZGRpbmcg YSBtb2NrIGNvbXBhcmUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv c2VydmVycy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIucHk6CisgICAgICAgIChXZWJQbGF0Zm9y bVRlc3RTZXJ2ZXIuX19pbml0X18pOiBSZW1vdmVkIHRlc3RoYXJuZXNzLmpzIGFzIGZpbGUgdG8g Y29weSBmcm9tIFdLIHRvIFdQVC4KKyAgICAgICAgKFdlYlBsYXRmb3JtVGVzdFNlcnZlci5fY29w eV93ZWJraXRfdGVzdF9maWxlcyk6IEFkZGVkIHdhcm5pbmcgZ2VuZXJhdGlvbiB3aGVuIFdLIHRl c3RoYXJuZXNzLmpzIGlzIG5vdCBtYXRjaGluZyBXUFQgdmVyc2lvbi4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZl cl91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RXZWJQbGF0Zm9ybVRlc3RTZXJ2ZXIudGVzdF9w cmV2aW91c2x5X3NwYXduZWRfaW5zdGFuY2UpOiBVcGRhdGVkIHRlc3RzIHRvIGFkZCB0ZXN0aGFy bmVzcy5qcyB0byBtb2NrIGZpbGVzeXN0ZW0uCisgICAgICAgIChUZXN0V2ViUGxhdGZvcm1UZXN0 U2VydmVyLnRlc3RfY29ycnVwdGVkX3N1YnNlcnZlcl9maWxlcyk6IERpdHRvLgorCiAyMDE1LTEx LTE1ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMTkyNDYyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weQppbmRleCA3NDc0ODZjYjJhYTk1MDhi MWQ4NDI2N2JmYjVkNDllMDYwOTJhNzIxLi5jMGQ2ZDc5N2Q0NDM2ZmJjNDMwNTkxN2QzN2IwNmEy MjM1NTUzMDBjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vZmlsZXN5c3RlbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0 ZW0vZmlsZXN5c3RlbS5weQpAQCAtMzEsNiArMzEsNyBAQAogaW1wb3J0IGNvZGVjcwogaW1wb3J0 IGVycm5vCiBpbXBvcnQgZXhjZXB0aW9ucworaW1wb3J0IGZpbGVjbXAKIGltcG9ydCBnbG9iCiBp bXBvcnQgaGFzaGxpYgogaW1wb3J0IG9zCkBAIC0zMDQsMyArMzA1LDYgQEAgY2xhc3MgRmlsZVN5 c3RlbShvYmplY3QpOgogICAgIGRlZiBzcGxpdGV4dChzZWxmLCBwYXRoKToKICAgICAgICAgIiIi UmV0dXJuIChkaXJuYW1lICsgb3Muc2VwICsgYmFzZW5hbWUsICcuJyArIGV4dCkiIiIKICAgICAg ICAgcmV0dXJuIG9zLnBhdGguc3BsaXRleHQocGF0aCkKKworICAgIGRlZiBjb21wYXJlKHNlbGYs IHBhdGgxLCBwYXRoMik6CisgICAgICAgIHJldHVybiBmaWxlY21wLmNtcChwYXRoMSwgcGF0aDIp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5 c3RlbV9tb2NrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVz eXN0ZW1fbW9jay5weQppbmRleCAxYWU4ZjkwZmFiNDhhNzM4NzZjOWUzODAxZTY5MjRjODcwMDYw MzIyLi5kN2M0NTg4MzVlMjc0NDkzNWQxYmVmZDFhZDY2Y2NlNzQ5OWU4NmM0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21v Y2sucHkKQEAgLTQxOCw2ICs0MTgsOSBAQCBjbGFzcyBNb2NrRmlsZVN5c3RlbShvYmplY3QpOgog ICAgICAgICAgICAgaWR4ID0gbGVuKHBhdGgpCiAgICAgICAgIHJldHVybiAocGF0aFswOmlkeF0s IHBhdGhbaWR4Ol0pCiAKKyAgICBkZWYgY29tcGFyZShzZWxmLCBwYXRoMSwgcGF0aDIpOgorICAg ICAgICByZXR1cm4gc2VsZi5yZWFkX2JpbmFyeV9maWxlKHBhdGgxKSA9PSBzZWxmLnJlYWRfYmlu YXJ5X2ZpbGUocGF0aDIpCisKIAogY2xhc3MgV3JpdGFibGVCaW5hcnlGaWxlT2JqZWN0KG9iamVj dCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZzLCBwYXRoKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvd2ViX3BsYXRmb3JtX3Rlc3Rf c2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93 ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIucHkKaW5kZXggNGFhZWY4NWM0Y2M5MTIwYzY0ZTYyNmNh Zjk3YTM3NzdhNjFhZmI5MS4uNjg0MTI1MDg2OGNlMDJiOTkzZDBmZDQ2NTViMGMwZDZjMjRlMWQ5 NSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVy cy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvc2VydmVycy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIucHkKQEAgLTcy LDcgKzcyLDcgQEAgY2xhc3MgV2ViUGxhdGZvcm1UZXN0U2VydmVyKGh0dHBfc2VydmVyX2Jhc2Uu SHR0cFNlcnZlckJhc2UpOgogICAgICAgICBzZWxmLl9sYXlvdXRfcm9vdCA9IHBvcnRfb2JqLnBh dGhfZnJvbV93ZWJraXRfYmFzZSgiTGF5b3V0VGVzdHMiKQogICAgICAgICBzZWxmLl9kb2Nfcm9v dCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9sYXlvdXRfcm9vdCwgZG9jX3Jvb3QocG9y dF9vYmopKQogCi0gICAgICAgIHNlbGYuX3Jlc291cmNlc19maWxlc190b19jb3B5ID0gWyd0ZXN0 aGFybmVzcy5qcycsICd0ZXN0aGFybmVzcy5jc3MnLCAndGVzdGhhcm5lc3NyZXBvcnQuanMnXQor ICAgICAgICBzZWxmLl9yZXNvdXJjZXNfZmlsZXNfdG9fY29weSA9IFsndGVzdGhhcm5lc3MuY3Nz JywgJ3Rlc3RoYXJuZXNzcmVwb3J0LmpzJ10KIAogICAgICAgICBjdXJyZW50X2Rpcl9wYXRoID0g c2VsZi5fZmlsZXN5c3RlbS5hYnNwYXRoKHNlbGYuX2ZpbGVzeXN0ZW0uc3BsaXQoX19maWxlX18p WzBdKQogICAgICAgICBzZWxmLl9zdGFydF9jbWQgPSBbInB5dGhvbiIsIHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihjdXJyZW50X2Rpcl9wYXRoLCAid2ViX3BsYXRmb3JtX3Rlc3RfbGF1bmNoZXIucHki KSwgc2VsZi5fc2VydmVyc19maWxlXQpAQCAtOTksNiArOTksMTUgQEAgY2xhc3MgV2ViUGxhdGZv cm1UZXN0U2VydmVyKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAgICAgICAg ICAgY29uZmlnX2pzb24gPSBzZWxmLl9maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKGNvbmZpZ193 a19maWxlbmFtZSkucmVwbGFjZSgiJUNFUlRTX0RJUiUiLCBzZWxmLl9maWxlc3lzdGVtLmpvaW4o c2VsZi5fb3V0cHV0X2RpciwgIl93cHRfY2VydHMiKSkKICAgICAgICAgICAgIHNlbGYuX2ZpbGVz eXN0ZW0ud3JpdGVfdGV4dF9maWxlKHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9kb2Nfcm9v dCwgImNvbmZpZy5qc29uIiksIGNvbmZpZ19qc29uKQogCisgICAgICAgIHdwdF90ZXN0aGFybmVz c2pzX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fZG9jX3Jvb3QsICJyZXNvdXJj ZXMiLCAidGVzdGhhcm5lc3MuanMiKQorICAgICAgICB3a190ZXN0aGFybmVzc2pzX2ZpbGUgPSBz ZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fbGF5b3V0X3Jvb3QsICJyZXNvdXJjZXMiLCAidGVz dGhhcm5lc3MuanMiKQorICAgICAgICAgIyBOZXh0IHR3byBsaW5lcyBhcmUgYSB0ZW1wIGhhY2sg Zm9yIHRoaXMgcGF0Y2ggdG8gbGFuZCBzbW9vdGhseSBvbiBib3RzLiBUaGV5IHNob3VsZCBiZSBy ZW1vdmVkIG9uY2UgcGF0Y2ggbGFuZGVkIGFuZCBlYWNoIGJvdCBydW5zIHRoZXNlIGxpbmVzIG9u Y2UuCisgICAgICAgIGlmIChub3Qgc2VsZi5fZmlsZXN5c3RlbS5pc2ZpbGUod3B0X3Rlc3RoYXJu ZXNzanNfZmlsZSkpOgorICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5jb3B5ZmlsZSh3a190 ZXN0aGFybmVzc2pzX2ZpbGUsIHdwdF90ZXN0aGFybmVzc2pzX2ZpbGUpCisgICAgICAgICMgTGV0 J3MgY2hlY2sgd2hldGhlciBXUFQgdGVzdGhhcm5lc3MuanMgaXMgdGhlIHNhbWUgYXMgV0sgdmVy c2lvbgorICAgICAgICBpZiAobm90IHNlbGYuX2ZpbGVzeXN0ZW0uY29tcGFyZSh3cHRfdGVzdGhh cm5lc3Nqc19maWxlLCB3a190ZXN0aGFybmVzc2pzX2ZpbGUpKToKKyAgICAgICAgICAgIF9sb2cu d2FybmluZygiXG4vLy8vLy8vLy8vXG5XUFQgdGVzdHMgYXJlIG5vdCB1c2luZyB0aGUgc2FtZSB0 ZXN0aGFybmVzcy5qcyBmaWxlIGFzIG90aGVyIFdlYktpdCBMYXlvdXQgdGVzdHMuXG5XZWJLaXQg dGVzdGhhcm5lc3MuanMgbWlnaHQgbmVlZCB0byBiZSB1cGRhdGVkIGFjY29yZGluZyBXUFQgdGVz dGhhcm5lc3MuanMuXG4vLy8vLy8vLy8vXG4iKQorCiAgICAgZGVmIF9jbGVhbl93ZWJraXRfdGVz dF9maWxlcyhzZWxmKToKICAgICAgICAgX2xvZy5kZWJ1ZygnQ2xlYW5pbmcgV1BUIHJlc291cmNl cyBmaWxlcycpCiAgICAgICAgIGZvciBmIGluIHNlbGYuX3Jlc291cmNlc19maWxlc190b19jb3B5 OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVy cy93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl91bml0 dGVzdC5weQppbmRleCBjMWVmOTNiNjA2MWU5M2FiZmUzMGE2NGZjNjA2MWU4ODc4YmUxMGE2Li4x OThlZjVmMWE0MjMxYTExNjFlOGM0YThmNTBiMmI4ZTlhNTQxZDk3IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0 X3NlcnZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl91bml0dGVzdC5weQpAQCAtNDIs NiArNDIsOCBAQCBjbGFzcyBUZXN0V2ViUGxhdGZvcm1UZXN0U2VydmVyKHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VydmVyID0gV2ViUGxhdGZvcm1UZXN0U2VydmVyKHBvcnQsICJ3cHR0 ZXN0IiwgIi9tb2NrL291dHB1dF9kaXIiLCAiL21vY2svb3V0cHV0X2Rpci9waWQudHh0IikKICAg ICAgICAgc2VydmVyLl9jaGVja190aGF0X2FsbF9wb3J0c19hcmVfYXZhaWxhYmxlID0gbGFtYmRh OiBUcnVlCiAgICAgICAgIHNlcnZlci5faXNfc2VydmVyX3J1bm5pbmdfb25fYWxsX3BvcnRzID0g bGFtYmRhOiBUcnVlCisgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoIi9t b2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyIsICIwIikK KyAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgiL21vY2stY2hlY2tvdXQv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJjZXMvdGVz dGhhcm5lc3MuanMiLCAiMCIpCiAKICAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRf ZmlsZSgiL21vY2tfb3V0cHV0X2Rpci9waWQudHh0IiwgIjAiKQogICAgICAgICBzZXJ2ZXIuc3Rh cnQoKQpAQCAtNTMsNiArNTUsOCBAQCBjbGFzcyBUZXN0V2ViUGxhdGZvcm1UZXN0U2VydmVyKHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VydmVyID0gV2ViUGxhdGZvcm1UZXN0U2VydmVy KHBvcnQsICJ3cHR0ZXN0IiwgIi9tb2NrL291dHB1dF9kaXIiLCAiL21vY2svb3V0cHV0X2Rpci9w aWQudHh0IikKICAgICAgICAgc2VydmVyLl9jaGVja190aGF0X2FsbF9wb3J0c19hcmVfYXZhaWxh YmxlID0gbGFtYmRhOiBUcnVlCiAgICAgICAgIHNlcnZlci5faXNfc2VydmVyX3J1bm5pbmdfb25f YWxsX3BvcnRzID0gbGFtYmRhOiBUcnVlCisgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90 ZXh0X2ZpbGUoIi9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3Jlc291cmNlcy90ZXN0aGFybmVz cy5qcyIsICIwIikKKyAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgiL21v Y2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9y ZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiLCAiMCIpCiAKICAgICAgICAgaG9zdC5maWxlc3lzdGVt LndyaXRlX3RleHRfZmlsZSgiL21vY2tfb3V0cHV0X2Rpci93cHR0ZXN0X3NlcnZlcnMuanNvbiIs ICIwIikKICAgICAgICAgc2VydmVyLnN0b3AoKQo= 265852 2015-11-18 23:57:16 -0800 2015-11-19 00:17:50 -0800 Patch for landing bug-150332-20151119085704.patch text/plain 7319 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyNjE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM1ZTA5ZTBlNmIyNTYyNWRjNTQ4YjE1MzBkNGM4OTRi NmZhN2MwZC4uYmM2YTdkMThkYTI0MTlhNDU1N2U1NzljNTMwYTMxOTFmMGE5ZDYxYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDE1LTExLTE4ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24u ZnI+CisKKyAgICAgICAgV1BUIHNlcnZlciBzaG91bGQgdXNlIGl0cyBvd24gdGVzdGhhcm5lc3Mu anMgZmlsZSBhbmQgZ2VuZXJhdGUgYSB3YXJuaW5nIHdoZW4gaXQgZG9lcyBub3QgbWF0Y2ggV2Vi S2l0IHZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1MDMzMgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyIGFuZCBSeW9zdWtl IE5pd2EuCisKKyAgICAgICAgUmVtb3ZpbmcgdGVzdGhhcm5lc3MuanMgb3ZlcndyaXRpbmcgZnJv bSBMYXlvdXRUZXN0cy9yZXNvdXJjZXMgdG8gTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9yZXNvdXJjZXMuCisgICAgICAgIEFkZGluZyBzdXBwb3J0IGZvciBmaWxl IGNvbXBhcmlzb24gaW4gcHl0aG9uIGZpbGVzeXN0ZW0uCisgICAgICAgICNOb3VzU29tbWVzVW5p cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVt LnB5OgorICAgICAgICAoRmlsZVN5c3RlbS5jb21wYXJlKTogQWRkaW5nIGNvbXBhcmUgYXMgYSB3 cmFwcGVyIGFyb3VuZCBmaWxlY21wLmNtcC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5OgorICAgICAgICAoTW9ja0ZpbGVTeXN0ZW0u Y29tcGFyZSk6IEFkZGluZyBhIG1vY2sgY29tcGFyZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlci5weToKKyAg ICAgICAgKFdlYlBsYXRmb3JtVGVzdFNlcnZlci5fX2luaXRfXyk6IFJlbW92ZWQgdGVzdGhhcm5l c3MuanMgYXMgZmlsZSB0byBjb3B5IGZyb20gV0sgdG8gV1BULgorICAgICAgICAoV2ViUGxhdGZv cm1UZXN0U2VydmVyLl9jb3B5X3dlYmtpdF90ZXN0X2ZpbGVzKTogQWRkZWQgd2FybmluZyBnZW5l cmF0aW9uIHdoZW4gV0sgdGVzdGhhcm5lc3MuanMgaXMgbm90IG1hdGNoaW5nIFdQVCB2ZXJzaW9u LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvd2ViX3Bs YXRmb3JtX3Rlc3Rfc2VydmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFdlYlBsYXRmb3Jt VGVzdFNlcnZlci50ZXN0X3ByZXZpb3VzbHlfc3Bhd25lZF9pbnN0YW5jZSk6IFVwZGF0ZWQgdGVz dHMgdG8gYWRkIHRlc3RoYXJuZXNzLmpzIHRvIG1vY2sgZmlsZXN5c3RlbS4KKyAgICAgICAgKFRl c3RXZWJQbGF0Zm9ybVRlc3RTZXJ2ZXIudGVzdF9jb3JydXB0ZWRfc3Vic2VydmVyX2ZpbGVzKTog RGl0dG8uCisKIDIwMTUtMTEtMTggIEppZXdlbiBUYW4gIDxqaWV3ZW5fdGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbV0sxXSBDcmFzaCBsb2FkaW5nIEJsaW5rIGxheW91dCB0ZXN0IGZhc3QvZG9t L1dpbmRvdy9wcm9wZXJ0eS1hY2Nlc3Mtb24tY2FjaGVkLXdpbmRvdy1hZnRlci1mcmFtZS1yZW1v dmVkLmh0bWwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9maWxlc3lzdGVtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2Zp bGVzeXN0ZW0ucHkKaW5kZXggNzQ3NDg2Y2IyYWE5NTA4YjFkODQyNjdiZmI1ZDQ5ZTA2MDkyYTcy MS4uYzBkNmQ3OTdkNDQzNmZiYzQzMDU5MTdkMzdiMDZhMjIzNTU1MzAwYyAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkKQEAgLTMx LDYgKzMxLDcgQEAKIGltcG9ydCBjb2RlY3MKIGltcG9ydCBlcnJubwogaW1wb3J0IGV4Y2VwdGlv bnMKK2ltcG9ydCBmaWxlY21wCiBpbXBvcnQgZ2xvYgogaW1wb3J0IGhhc2hsaWIKIGltcG9ydCBv cwpAQCAtMzA0LDMgKzMwNSw2IEBAIGNsYXNzIEZpbGVTeXN0ZW0ob2JqZWN0KToKICAgICBkZWYg c3BsaXRleHQoc2VsZiwgcGF0aCk6CiAgICAgICAgICIiIlJldHVybiAoZGlybmFtZSArIG9zLnNl cCArIGJhc2VuYW1lLCAnLicgKyBleHQpIiIiCiAgICAgICAgIHJldHVybiBvcy5wYXRoLnNwbGl0 ZXh0KHBhdGgpCisKKyAgICBkZWYgY29tcGFyZShzZWxmLCBwYXRoMSwgcGF0aDIpOgorICAgICAg ICByZXR1cm4gZmlsZWNtcC5jbXAocGF0aDEsIHBhdGgyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKaW5kZXggMWFl OGY5MGZhYjQ4YTczODc2YzllMzgwMWU2OTI0Yzg3MDA2MDMyMi4uZDdjNDU4ODM1ZTI3NDQ5MzVk MWJlZmQxYWQ2NmNjZTc0OTllODZjNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CkBAIC00MTgsNiArNDE4LDkg QEAgY2xhc3MgTW9ja0ZpbGVTeXN0ZW0ob2JqZWN0KToKICAgICAgICAgICAgIGlkeCA9IGxlbihw YXRoKQogICAgICAgICByZXR1cm4gKHBhdGhbMDppZHhdLCBwYXRoW2lkeDpdKQogCisgICAgZGVm IGNvbXBhcmUoc2VsZiwgcGF0aDEsIHBhdGgyKToKKyAgICAgICAgcmV0dXJuIHNlbGYucmVhZF9i aW5hcnlfZmlsZShwYXRoMSkgPT0gc2VsZi5yZWFkX2JpbmFyeV9maWxlKHBhdGgyKQorCiAKIGNs YXNzIFdyaXRhYmxlQmluYXJ5RmlsZU9iamVjdChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBmcywgcGF0aCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVy LnB5CmluZGV4IDRhYWVmODVjNGNjOTEyMGM2NGU2MjZjYWY5N2EzNzc3YTYxYWZiOTEuLjRiYjJl NGI4NjNiNzM3MDc2N2Q2NDNlYmI0MGY0YTQ0ZTIxN2FkNWIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvd2ViX3BsYXRmb3JtX3Rlc3Rfc2Vy dmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMv d2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLnB5CkBAIC03Miw3ICs3Miw3IEBAIGNsYXNzIFdlYlBs YXRmb3JtVGVzdFNlcnZlcihodHRwX3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAg ICAgc2VsZi5fbGF5b3V0X3Jvb3QgPSBwb3J0X29iai5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoIkxh eW91dFRlc3RzIikKICAgICAgICAgc2VsZi5fZG9jX3Jvb3QgPSBzZWxmLl9maWxlc3lzdGVtLmpv aW4oc2VsZi5fbGF5b3V0X3Jvb3QsIGRvY19yb290KHBvcnRfb2JqKSkKIAotICAgICAgICBzZWxm Ll9yZXNvdXJjZXNfZmlsZXNfdG9fY29weSA9IFsndGVzdGhhcm5lc3MuanMnLCAndGVzdGhhcm5l c3MuY3NzJywgJ3Rlc3RoYXJuZXNzcmVwb3J0LmpzJ10KKyAgICAgICAgc2VsZi5fcmVzb3VyY2Vz X2ZpbGVzX3RvX2NvcHkgPSBbJ3Rlc3RoYXJuZXNzLmNzcycsICd0ZXN0aGFybmVzc3JlcG9ydC5q cyddCiAKICAgICAgICAgY3VycmVudF9kaXJfcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uYWJzcGF0 aChzZWxmLl9maWxlc3lzdGVtLnNwbGl0KF9fZmlsZV9fKVswXSkKICAgICAgICAgc2VsZi5fc3Rh cnRfY21kID0gWyJweXRob24iLCBzZWxmLl9maWxlc3lzdGVtLmpvaW4oY3VycmVudF9kaXJfcGF0 aCwgIndlYl9wbGF0Zm9ybV90ZXN0X2xhdW5jaGVyLnB5IiksIHNlbGYuX3NlcnZlcnNfZmlsZV0K QEAgLTk5LDYgKzk5LDE0IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdFNlcnZlcihodHRwX3NlcnZl cl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAgICAgICAgIGNvbmZpZ19qc29uID0gc2VsZi5f ZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShjb25maWdfd2tfZmlsZW5hbWUpLnJlcGxhY2UoIiVD RVJUU19ESVIlIiwgc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX291dHB1dF9kaXIsICJfd3B0 X2NlcnRzIikpCiAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShz ZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fZG9jX3Jvb3QsICJjb25maWcuanNvbiIpLCBjb25m aWdfanNvbikKIAorICAgICAgICB3cHRfdGVzdGhhcm5lc3Nqc19maWxlID0gc2VsZi5fZmlsZXN5 c3RlbS5qb2luKHNlbGYuX2RvY19yb290LCAicmVzb3VyY2VzIiwgInRlc3RoYXJuZXNzLmpzIikK KyAgICAgICAgbGF5b3V0X3Rlc3RzX3Rlc3RoYXJuZXNzanNfZmlsZSA9IHNlbGYuX2ZpbGVzeXN0 ZW0uam9pbihzZWxmLl9sYXlvdXRfcm9vdCwgInJlc291cmNlcyIsICJ0ZXN0aGFybmVzcy5qcyIp CisgICAgICAgICMgRklYTUU6IE5leHQgdHdvIGxpbmVzIGFyZSBhIHRlbXAgaGFjayBmb3IgdGhp cyBwYXRjaCB0byBsYW5kIHNtb290aGx5IG9uIGJvdHMuIFRoZXkgc2hvdWxkIGJlIHJlbW92ZWQg b25jZSBwYXRjaCBsYW5kZWQgYW5kIGVhY2ggYm90IHJ1bnMgdGhlc2UgbGluZXMgb25jZS4KKyAg ICAgICAgaWYgKG5vdCBzZWxmLl9maWxlc3lzdGVtLmlzZmlsZSh3cHRfdGVzdGhhcm5lc3Nqc19m aWxlKSk6CisgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLmNvcHlmaWxlKGxheW91dF90ZXN0 c190ZXN0aGFybmVzc2pzX2ZpbGUsIHdwdF90ZXN0aGFybmVzc2pzX2ZpbGUpCisgICAgICAgIGlm IChub3Qgc2VsZi5fZmlsZXN5c3RlbS5jb21wYXJlKHdwdF90ZXN0aGFybmVzc2pzX2ZpbGUsIGxh eW91dF90ZXN0c190ZXN0aGFybmVzc2pzX2ZpbGUpKToKKyAgICAgICAgICAgIF9sb2cud2Fybmlu ZygiXG4vLy8vLy8vLy8vXG5XUFQgdGVzdHMgYXJlIG5vdCB1c2luZyB0aGUgc2FtZSB0ZXN0aGFy bmVzcy5qcyBmaWxlIGFzIG90aGVyIFdlYktpdCBMYXlvdXQgdGVzdHMuXG5XZWJLaXQgdGVzdGhh cm5lc3MuanMgbWlnaHQgbmVlZCB0byBiZSB1cGRhdGVkIGFjY29yZGluZyBXUFQgdGVzdGhhcm5l c3MuanMuXG4vLy8vLy8vLy8vXG4iKQorCiAgICAgZGVmIF9jbGVhbl93ZWJraXRfdGVzdF9maWxl cyhzZWxmKToKICAgICAgICAgX2xvZy5kZWJ1ZygnQ2xlYW5pbmcgV1BUIHJlc291cmNlcyBmaWxl cycpCiAgICAgICAgIGZvciBmIGluIHNlbGYuX3Jlc291cmNlc19maWxlc190b19jb3B5OgpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy93ZWJf cGxhdGZvcm1fdGVzdF9zZXJ2ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl91bml0dGVzdC5w eQppbmRleCBjMWVmOTNiNjA2MWU5M2FiZmUzMGE2NGZjNjA2MWU4ODc4YmUxMGE2Li4xOThlZjVm MWE0MjMxYTExNjFlOGM0YThmNTBiMmI4ZTlhNTQxZDk3IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9zZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZl cl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9z ZXJ2ZXJzL3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl91bml0dGVzdC5weQpAQCAtNDIsNiArNDIs OCBAQCBjbGFzcyBUZXN0V2ViUGxhdGZvcm1UZXN0U2VydmVyKHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgc2VydmVyID0gV2ViUGxhdGZvcm1UZXN0U2VydmVyKHBvcnQsICJ3cHR0ZXN0Iiwg Ii9tb2NrL291dHB1dF9kaXIiLCAiL21vY2svb3V0cHV0X2Rpci9waWQudHh0IikKICAgICAgICAg c2VydmVyLl9jaGVja190aGF0X2FsbF9wb3J0c19hcmVfYXZhaWxhYmxlID0gbGFtYmRhOiBUcnVl CiAgICAgICAgIHNlcnZlci5faXNfc2VydmVyX3J1bm5pbmdfb25fYWxsX3BvcnRzID0gbGFtYmRh OiBUcnVlCisgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoIi9tb2NrLWNo ZWNrb3V0L0xheW91dFRlc3RzL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyIsICIwIikKKyAgICAg ICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgiL21vY2stY2hlY2tvdXQvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJjZXMvdGVzdGhhcm5l c3MuanMiLCAiMCIpCiAKICAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgi L21vY2tfb3V0cHV0X2Rpci9waWQudHh0IiwgIjAiKQogICAgICAgICBzZXJ2ZXIuc3RhcnQoKQpA QCAtNTMsNiArNTUsOCBAQCBjbGFzcyBUZXN0V2ViUGxhdGZvcm1UZXN0U2VydmVyKHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgc2VydmVyID0gV2ViUGxhdGZvcm1UZXN0U2VydmVyKHBvcnQs ICJ3cHR0ZXN0IiwgIi9tb2NrL291dHB1dF9kaXIiLCAiL21vY2svb3V0cHV0X2Rpci9waWQudHh0 IikKICAgICAgICAgc2VydmVyLl9jaGVja190aGF0X2FsbF9wb3J0c19hcmVfYXZhaWxhYmxlID0g bGFtYmRhOiBUcnVlCiAgICAgICAgIHNlcnZlci5faXNfc2VydmVyX3J1bm5pbmdfb25fYWxsX3Bv cnRzID0gbGFtYmRhOiBUcnVlCisgICAgICAgIGhvc3QuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2Zp bGUoIi9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyIs ICIwIikKKyAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZSgiL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9yZXNvdXJj ZXMvdGVzdGhhcm5lc3MuanMiLCAiMCIpCiAKICAgICAgICAgaG9zdC5maWxlc3lzdGVtLndyaXRl X3RleHRfZmlsZSgiL21vY2tfb3V0cHV0X2Rpci93cHR0ZXN0X3NlcnZlcnMuanNvbiIsICIwIikK ICAgICAgICAgc2VydmVyLnN0b3AoKQo=