235038 2022-01-10 10:59:23 -0800 WPT importer improvements 2023-05-31 13:37:07 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=231183 InRadar P2 Normal --- 256751 256846 256849 235032 1 gsnedders gsnedders ews-watchlist glenn jbedard webkit-bug-importer youennf oldest_to_newest 1829556 0 gsnedders 2022-01-10 10:59:23 -0800 split out of 235032 fixes a number of things, including: * Make --clean-dist-dir safe for partial imports (231183) * Handle mismatch & match refs together * Move to Python 3 1829557 1 448777 gsnedders 2022-01-10 11:00:37 -0800 Created attachment 448777 Patch 1830043 2 448777 youennf 2022-01-12 01:42:54 -0800 Comment on attachment 448777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=448777&action=review > Tools/ChangeLog:14 > + (TestImporter.remove_slow_from_w3c_tests_options): Make --clean-dist-dir safe for partial imports Can we write a unit test for this option? 1831536 3 webkit-bug-importer 2022-01-17 11:28:52 -0800 <rdar://problem/87686118> 1959143 4 gsnedders 2023-05-31 13:37:07 -0700 This got split up and landed in the dependent bugs. 448777 2022-01-10 11:00:37 -0800 2022-01-12 01:42:54 -0800 Patch bug-235038-20220110190036.patch text/plain 20163 gsnedders U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODM2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjJiYmY0MzlhYWE0OGZjMTE1Y2RlYTM1YjExMGRhM2Zm OTA0ZThiZC4uNDZjNmI3ZmZkMDM4NTA1MzcxMzM5ODEzNjNmZGFmYzllMmIxZDJkZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIyLTAxLTEwICBTYW0gU25lZGRvbiAgPGdzbmVkZGVyc0BhcHBsZS5jb20+CisKKyAg ICAgICAgSW1wcm92ZSBXUFQgaW1wb3J0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNTAzOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9pbXBvcnQtdzNjLXRlc3RzOiBNb3ZlIHRvIFB5 dGhvbiAzCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9kb3dubG9hZGVyLnB5 OgorICAgICAgICAoVGVzdERvd25sb2FkZXIudXBkYXRlX2ltcG9ydF9leHBlY3RhdGlvbnMpOiBL ZWVwIEpTT04gZHVtcCBjb25zaXN0ZW50IHdpdGggUHl0aG9uIDwgMy40CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weToKKyAgICAgICAgKFRlc3RJbXBvcnRl ci5fX2luaXRfXyk6IE1ha2UgLS1jbGVhbi1kaXN0LWRpciBzYWZlIGZvciBwYXJ0aWFsIGltcG9y dHMKKyAgICAgICAgKFRlc3RJbXBvcnRlci5kb19pbXBvcnQpOiBIYW5kbGUgbWlzbWF0Y2ggJiBt YXRjaCByZWZzIHRvZ2V0aGVyCisgICAgICAgIChUZXN0SW1wb3J0ZXIucmVtb3ZlX3Nsb3dfZnJv bV93M2NfdGVzdHNfb3B0aW9ucyk6IE1ha2UgLS1jbGVhbi1kaXN0LWRpciBzYWZlIGZvciBwYXJ0 aWFsIGltcG9ydHMKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X3BhcnNlci5w eToKKyAgICAgICAgKFRlc3RQYXJzZXIuYW5hbHl6ZV90ZXN0KTogSGFuZGxlIG1pc21hdGNoICYg bWF0Y2ggcmVmcyB0b2dldGhlcgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf cGFyc2VyX3VuaXR0ZXN0LnB5OiBIYW5kbGUgbWlzbWF0Y2ggJiBtYXRjaCByZWZzIHRvZ2V0aGVy CisKIDIwMjItMDEtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtHVEtdW2ExMXldIFdUUjogZG8gbm90IHNob3cgaHRtbC1pZCBhbmQgdG9v bGtpdCBhdHRyaWJ1dGVzIGluIHRlc3QgcmVzdWx0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9pbXBvcnQtdzNjLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9pbXBvcnQtdzNjLXRlc3RzCmluZGV4 IGJiNzIwOTZjMDYxNTZiM2VlNTE4NDJlY2U5YzdjOTlkNDI5MWY4MmEuLmVjYTAyMzVmMjEyNTMx OTNhNjM5ZDI5ZjA5ZTgwNWJjYWFjNGNmYzIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvaW1w b3J0LXczYy10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL2ltcG9ydC13M2MtdGVzdHMKQEAgLTEs NCArMSw0IEBACi0jIS91c3IvYmluL2VudiBweXRob24KKyMhL3Vzci9iaW4vZW52IHB5dGhvbjMK IAogIyBDb3B5cmlnaHQgKEMpIDIwMTMgQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQuIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAjCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3cz Yy90ZXN0X2Rvd25sb2FkZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Rv d25sb2FkZXIucHkKaW5kZXggNDNiZTMyZmFmMDE1MjFjZWY4NjdmNGE0MjY4YTY5ZDVkM2ZkMTQ3 NS4uOGE3OWM2YjlhOGRmMmYyOTZjM2RlZjcwZDUxODg2OTUyYzM4YzllNSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9kb3dubG9hZGVyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZG93bmxvYWRlci5weQpAQCAtMTA4LDcgKzEwOCw3 IEBAIGNsYXNzIFRlc3REb3dubG9hZGVyKG9iamVjdCk6CiAgICAgICAgIGltcG9ydF9saW5lcyA9 IGpzb24ubG9hZHMoc2VsZi5fZmlsZXN5c3RlbS5yZWFkX3RleHRfZmlsZShzZWxmLmltcG9ydF9l eHBlY3RhdGlvbnNfcGF0aCkpCiAgICAgICAgIGZvciBwYXRoIGluIHRlc3RfcGF0aHM6CiAgICAg ICAgICAgICBpbXBvcnRfbGluZXNbcGF0aF0gPSAnaW1wb3J0JwotICAgICAgICBzZWxmLl9maWxl c3lzdGVtLndyaXRlX3RleHRfZmlsZShzZWxmLmltcG9ydF9leHBlY3RhdGlvbnNfcGF0aCwganNv bi5kdW1wcyhpbXBvcnRfbGluZXMsIHNvcnRfa2V5cz1UcnVlLCBpbmRlbnQ9NCkpCisgICAgICAg IHNlbGYuX2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHNlbGYuaW1wb3J0X2V4cGVjdGF0aW9u c19wYXRoLCBqc29uLmR1bXBzKGltcG9ydF9saW5lcywgc29ydF9rZXlzPVRydWUsIGluZGVudD00 LCBzZXBhcmF0b3JzPSgnLCAnLCAnOiAnKSkpCiAKICAgICBkZWYgX2FkZF90ZXN0X3N1aXRlX3Bh dGhzKHNlbGYsIHRlc3RfcGF0aHMsIGRpcmVjdG9yeSwgd2Via2l0X3BhdGgpOgogICAgICAgICBm b3IgbmFtZSBpbiBzZWxmLl9maWxlc3lzdGVtLmxpc3RkaXIoZGlyZWN0b3J5KToKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDYxOGVmM2JiY2U0YTc4 MDMxMzlkN2EzZWM4YThkOTAyMDBkMGU2NTcuLjk4OTg1NTY1ZDcxMGNjMmI4ODFmYmFkM2RkNGE5 YmJmMWE2N2IzMmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf aW1wb3J0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRl ci5weQpAQCAtMTg1LDExICsxODUsNiBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAg ICAgICAgc2VsZi5fdGVzdHNfb3B0aW9ucyA9IGpzb24ubG9hZHMoc2VsZi5maWxlc3lzdGVtLnJl YWRfdGV4dF9maWxlKHNlbGYuX3Rlc3RzX29wdGlvbnNfanNvbl9wYXRoKSkgaWYgc2VsZi5maWxl c3lzdGVtLmV4aXN0cyhzZWxmLl90ZXN0c19vcHRpb25zX2pzb25fcGF0aCkgZWxzZSBOb25lCiAg ICAgICAgIHNlbGYuX3Nsb3dfdGVzdHMgPSBbXQogCi0gICAgICAgIGlmIHNlbGYub3B0aW9ucy5j bGVhbl9kZXN0aW5hdGlvbl9kaXJlY3RvcnkgYW5kIHNlbGYuX3Rlc3RfcmVzb3VyY2VfZmlsZXM6 Ci0gICAgICAgICAgICBzZWxmLl90ZXN0X3Jlc291cmNlX2ZpbGVzWyJmaWxlcyJdID0gW10KLSAg ICAgICAgICAgIGlmIHNlbGYuX3Rlc3RzX29wdGlvbnM6Ci0gICAgICAgICAgICAgICAgc2VsZi5y ZW1vdmVfc2xvd19mcm9tX3czY190ZXN0c19vcHRpb25zKCkKLQogICAgICAgICBzZWxmLmdsb2Jh bFRvU3VmZml4ID0gZGljdCgKICAgICAgICAgICAgIHdpbmRvdz0naHRtbCcsCiAgICAgICAgICAg ICB3b3JrZXI9J3dvcmtlci5odG1sJywKQEAgLTIxMSw2ICsyMDYsMTIgQEAgY2xhc3MgVGVzdElt cG9ydGVyKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYub3B0aW9ucy5jbGVhbl9kZXN0aW5hdGlv bl9kaXJlY3Rvcnk6CiAgICAgICAgICAgICBmb3IgdGVzdF9wYXRoIGluIHRlc3RfcGF0aHM6CiAg ICAgICAgICAgICAgICAgc2VsZi5jbGVhbl9kZXN0aW5hdGlvbl9kaXJlY3RvcnkodGVzdF9wYXRo KQorICAgICAgICAgICAgaWYgc2VsZi5fdGVzdF9yZXNvdXJjZV9maWxlczoKKyAgICAgICAgICAg ICAgICB0ZXN0X3BhdGhzX3R1cGxlID0gdHVwbGUodGVzdF9wYXRocykKKyAgICAgICAgICAgICAg ICBzZWxmLl90ZXN0X3Jlc291cmNlX2ZpbGVzWyJmaWxlcyJdID0gW3QgZm9yIHQgaW4gc2VsZi5f dGVzdF9yZXNvdXJjZV9maWxlc1siZmlsZXMiXQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgbm90IHQuc3RhcnRzd2l0aCh0ZXN0X3BhdGhz X3R1cGxlKV0KKyAgICAgICAgICAgICAgICBpZiBzZWxmLl90ZXN0c19vcHRpb25zOgorICAgICAg ICAgICAgICAgICAgICBzZWxmLnJlbW92ZV9zbG93X2Zyb21fdzNjX3Rlc3RzX29wdGlvbnModGVz dF9wYXRoc190dXBsZSkKIAogICAgICAgICBzZWxmLmltcG9ydF90ZXN0cygpCiAKQEAgLTMzOCw3 ICszMzksNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAg ICAgIyBTa2lwIGl0IHNpbmNlLCB0aGUgY29ycmVzcG9uZGluZyByZWZlcmVuY2UgdGVzdCBzaG91 bGQgaGF2ZSBhIGxpbmsgdG8gdGhpcyBmaWxlCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVl CiAKLSAgICAgICAgICAgICAgICBpZiAncmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpOgor ICAgICAgICAgICAgICAgIGlmICdtYXRjaF9yZWZlcmVuY2UnIGluIHRlc3RfaW5mby5rZXlzKCkg b3IgJ21pc21hdGNoX3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKToKICAgICAgICAgICAg ICAgICAgICAgcmVmdGVzdHMgKz0gMQogICAgICAgICAgICAgICAgICAgICB0b3RhbF90ZXN0cyAr PSAxCiAgICAgICAgICAgICAgICAgICAgIHRlc3RfYmFzZW5hbWUgPSBzZWxmLmZpbGVzeXN0ZW0u YmFzZW5hbWUodGVzdF9pbmZvWyd0ZXN0J10pCkBAIC0zNDgsMTIgKzM0OSwxNiBAQCBjbGFzcyBU ZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAgIyBkaXJlY3RseSByYXRo ZXIgdGhhbiByZWx5aW5nICBvbiBhIG5hbWluZyBjb252ZW50aW9uLgogICAgICAgICAgICAgICAg ICAgICAjIFVzaW5nIGEgbmFtaW5nIGNvbnZlbnRpb24gY3JlYXRlcyBkdXBsaWNhdGUgY29waWVz IG9mIHRoZQogICAgICAgICAgICAgICAgICAgICAjIHJlZmVyZW5jZSBmaWxlcy4KLSAgICAgICAg ICAgICAgICAgICAgcmVmX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uc3BsaXRleHQodGVzdF9iYXNl bmFtZSlbMF0gKyAnLWV4cGVjdGVkJwotICAgICAgICAgICAgICAgICAgICBpZiAndHlwZScgaW4g dGVzdF9pbmZvIGFuZCB0ZXN0X2luZm9bJ3R5cGUnXSA9PSAnbWlzbWF0Y2gnOgotICAgICAgICAg ICAgICAgICAgICAgICAgcmVmX2ZpbGUgKz0gJy1taXNtYXRjaCcKLSAgICAgICAgICAgICAgICAg ICAgcmVmX2ZpbGUgKz0gc2VsZi5maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3RfaW5mb1sncmVmZXJl bmNlJ10pWzFdCisgICAgICAgICAgICAgICAgICAgIGlmICdtYXRjaF9yZWZlcmVuY2UnIGluIHRl c3RfaW5mby5rZXlzKCk6CisgICAgICAgICAgICAgICAgICAgICAgICByZWZfZmlsZSA9IHNlbGYu ZmlsZXN5c3RlbS5zcGxpdGV4dCh0ZXN0X2Jhc2VuYW1lKVswXSArICctZXhwZWN0ZWQnCisgICAg ICAgICAgICAgICAgICAgICAgICByZWZfZmlsZSArPSBzZWxmLmZpbGVzeXN0ZW0uc3BsaXRleHQo dGVzdF9pbmZvWydtYXRjaF9yZWZlcmVuY2UnXSlbMV0KKyAgICAgICAgICAgICAgICAgICAgICAg IGNvcHlfbGlzdC5hcHBlbmQoeydzcmMnOiB0ZXN0X2luZm9bJ21hdGNoX3JlZmVyZW5jZSddLCAn ZGVzdCc6IHJlZl9maWxlLCAncmVmZXJlbmNlX3N1cHBvcnRfaW5mbyc6IHRlc3RfaW5mb1snbWF0 Y2hfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbyddfSkKKworICAgICAgICAgICAgICAgICAgICBpZiAn bWlzbWF0Y2hfcmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpOgorICAgICAgICAgICAgICAg ICAgICAgICAgcmVmX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uc3BsaXRleHQodGVzdF9iYXNlbmFt ZSlbMF0gKyAnLWV4cGVjdGVkLW1pc21hdGNoJworICAgICAgICAgICAgICAgICAgICAgICAgcmVm X2ZpbGUgKz0gc2VsZi5maWxlc3lzdGVtLnNwbGl0ZXh0KHRlc3RfaW5mb1snbWlzbWF0Y2hfcmVm ZXJlbmNlJ10pWzFdCisgICAgICAgICAgICAgICAgICAgICAgICBjb3B5X2xpc3QuYXBwZW5kKHsn c3JjJzogdGVzdF9pbmZvWydtaXNtYXRjaF9yZWZlcmVuY2UnXSwgJ2Rlc3QnOiByZWZfZmlsZSwg J3JlZmVyZW5jZV9zdXBwb3J0X2luZm8nOiB0ZXN0X2luZm9bJ21pc21hdGNoX3JlZmVyZW5jZV9z dXBwb3J0X2luZm8nXX0pCiAKLSAgICAgICAgICAgICAgICAgICAgY29weV9saXN0LmFwcGVuZCh7 J3NyYyc6IHRlc3RfaW5mb1sncmVmZXJlbmNlJ10sICdkZXN0JzogcmVmX2ZpbGUsICdyZWZlcmVu Y2Vfc3VwcG9ydF9pbmZvJzogdGVzdF9pbmZvWydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ119KQog ICAgICAgICAgICAgICAgICAgICBjb3B5X2xpc3QuYXBwZW5kKHsnc3JjJzogdGVzdF9pbmZvWyd0 ZXN0J10sICdkZXN0JzogZmlsZW5hbWV9KQogCiAgICAgICAgICAgICAgICAgZWxpZiAnanN0ZXN0 JyBpbiB0ZXN0X2luZm8ua2V5cygpOgpAQCAtNjE4LDkgKzYyMyw5IEBAIGNsYXNzIFRlc3RJbXBv cnRlcihvYmplY3QpOgogICAgICAgICBpZiBzaG91bGRfdXBkYXRlOgogICAgICAgICAgICAgc2Vs Zi5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShzZWxmLl90ZXN0c19vcHRpb25zX2pzb25fcGF0 aCwganNvbi5kdW1wcyhzZWxmLl90ZXN0c19vcHRpb25zLCBzb3J0X2tleXM9VHJ1ZSwgaW5kZW50 PTQpLnJlcGxhY2UoJyBcbicsICdcbicpKQogCi0gICAgZGVmIHJlbW92ZV9zbG93X2Zyb21fdzNj X3Rlc3RzX29wdGlvbnMoc2VsZik6CisgICAgZGVmIHJlbW92ZV9zbG93X2Zyb21fdzNjX3Rlc3Rz X29wdGlvbnMoc2VsZiwgdGVzdF9wYXRocyk6CiAgICAgICAgIGZvciB0ZXN0X3BhdGggaW4gc2Vs Zi5fdGVzdHNfb3B0aW9ucy5rZXlzKCk6Ci0gICAgICAgICAgICBpZiBzZWxmLnRlc3RzX3czY19y ZWxhdGl2ZV9wYXRoIGluIHRlc3RfcGF0aDoKKyAgICAgICAgICAgIGlmIHNlbGYudGVzdHNfdzNj X3JlbGF0aXZlX3BhdGggaW4gdGVzdF9wYXRoIGFuZCB0ZXN0X3BhdGguc3RhcnRzd2l0aCh0ZXN0 X3BhdGhzKToKICAgICAgICAgICAgICAgICBvcHRpb25zID0gc2VsZi5fdGVzdHNfb3B0aW9uc1t0 ZXN0X3BhdGhdCiAgICAgICAgICAgICAgICAgb3B0aW9ucy5yZW1vdmUoJ3Nsb3cnKQogICAgICAg ICAgICAgICAgIGlmIG5vdCBvcHRpb25zOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS93M2MvdGVzdF9wYXJzZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X3BhcnNlci5weQppbmRleCA4MTZmYjExNDRlNDc4YTQ5NTgzZjI3MGRlMDY3MGYwMTUzMDZiZTgw Li5kZWI2ZGZhNWFlYWNkZTNhYjY4MWE2MGJkNjczNGMxMmJkZmFhZGVhIDEwMDc1NQotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X3BhcnNlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3czYy90ZXN0X3BhcnNlci5weQpAQCAtODMsNDYgKzgzLDU3IEBAIGNsYXNz IFRlc3RQYXJzZXIob2JqZWN0KToKICAgICAgICAgaWYgcmVmX2NvbnRlbnRzIGlzIG5vdCBOb25l OgogICAgICAgICAgICAgc2VsZi5yZWZfZG9jID0gUGFyc2VyKHJlZl9jb250ZW50cykKIAotICAg ICAgICBtYXRjaGVzID0gc2VsZi5yZWZlcmVuY2VfbGlua3Nfb2ZfdHlwZSgnbWF0Y2gnKSArIHNl bGYucmVmZXJlbmNlX2xpbmtzX29mX3R5cGUoJ21pc21hdGNoJykKKyAgICAgICAgbWF0Y2hlcyA9 IHNlbGYucmVmZXJlbmNlX2xpbmtzX29mX3R5cGUoJ21hdGNoJykKKyAgICAgICAgbWlzbWF0Y2hl cyA9IHNlbGYucmVmZXJlbmNlX2xpbmtzX29mX3R5cGUoJ21pc21hdGNoJykKIAogICAgICAgICAj IE1hbnVhbCB0ZXN0cyBtYXkgYWxzbyBoYXZlIHByb3BlcnRpZXMgdGhhdCBtYWtlIHRoZW0gbG9v ayBsaWtlIG5vbi1tYW51YWwgcmVmZXJlbmNlIG9yIEpTCiAgICAgICAgICMgdGVzdHMsIHNvIGV4 Y2x1ZGUgdGhlbSBmaXJzdC4KICAgICAgICAgaWYgc2VsZi5pc193cHRfbWFudWFsdGVzdCgpIGFu ZCBub3Qgc2VsZi5pc19yZWZlcmVuY2VfZmlsZW5hbWUoKToKICAgICAgICAgICAgIHRlc3RfaW5m byA9IHsndGVzdCc6IHNlbGYuZmlsZW5hbWUsICdtYW51YWx0ZXN0JzogVHJ1ZX0KLSAgICAgICAg ZWxpZiBtYXRjaGVzOgotICAgICAgICAgICAgaWYgbGVuKG1hdGNoZXMpID4gMToKKworICAgICAg ICBlbGlmIG1hdGNoZXMgb3IgbWlzbWF0Y2hlczoKKyAgICAgICAgICAgIGlmIGxlbihtYXRjaGVz KSA+IDEgb3IgbGVuKG1pc21hdGNoZXMpID4gMToKICAgICAgICAgICAgICAgICAjIEZJWE1FOiBJ cyB0aGlzIGFjdHVhbGx5IHRydWU/IFdlIHNob3VsZCBmaXggdGhpcy4KLSAgICAgICAgICAgICAg ICBfbG9nLndhcm5pbmcoJ011bHRpcGxlIHJlZmVyZW5jZXMgYXJlIG5vdCBzdXBwb3J0ZWQuIElt cG9ydGluZyB0aGUgZmlyc3QgcmVmIGRlZmluZWQgaW4gJXMnLAorICAgICAgICAgICAgICAgIF9s b2cud2FybmluZygnTXVsdGlwbGUgcmVmZXJlbmNlcyBvZiB0aGUgc2FtZSB0eXBlIGFyZSBub3Qg c3VwcG9ydGVkLiBJbXBvcnRpbmcgdGhlIGZpcnN0IHJlZiBkZWZpbmVkIGluICVzJywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5maWxlc3lzdGVtLmJhc2VuYW1lKHNlbGYuZmls ZW5hbWUpKQogCi0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgaHJlZl9tYXRjaF9m aWxlID0gbWF0Y2hlc1swXVsnaHJlZiddLnN0cmlwKCkKLSAgICAgICAgICAgICAgICBpZiBocmVm X21hdGNoX2ZpbGUuc3RhcnRzd2l0aCgnLycpOgotICAgICAgICAgICAgICAgICAgICByZWZfZmls ZSA9IHNlbGYuZmlsZXN5c3RlbS5qb2luKHNlbGYuc291cmNlX3Jvb3RfZGlyZWN0b3J5LCBocmVm X21hdGNoX2ZpbGUubHN0cmlwKCcvJykpCi0gICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAg ICAgICAgICAgICAgcmVmX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihzZWxmLmZpbGVzeXN0 ZW0uZGlybmFtZShzZWxmLmZpbGVuYW1lKSwgaHJlZl9tYXRjaF9maWxlKQotCi0gICAgICAgICAg ICAgICAgcmVmZXJlbmNlX3R5cGUgPSBtYXRjaGVzWzBdWydyZWwnXVswXSBpZiBpc2luc3RhbmNl KG1hdGNoZXNbMF1bJ3JlbCddLCBsaXN0KSBlbHNlIG1hdGNoZXNbMF1bJ3JlbCddCi0gICAgICAg ICAgICBleGNlcHQgS2V5RXJyb3IgYXMgZToKLSAgICAgICAgICAgICAgICAjIEZJWE1FOiBGaWd1 cmUgb3V0IHdoYXQgdG8gZG8gdy8gaW52YWxpZCB0ZXN0IGZpbGVzLgotICAgICAgICAgICAgICAg IF9sb2cuZXJyb3IoJyVzIGhhcyBhIHJlZmVyZW5jZSBsaW5rIGJ1dCBpcyBtaXNzaW5nIHRoZSAi aHJlZiInLCBzZWxmLmZpbGVzeXN0ZW0pCi0gICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKKyAg ICAgICAgICAgIHJlZnNfdG9faW1wb3J0ID0gW10KKyAgICAgICAgICAgIGlmIG1hdGNoZXM6Cisg ICAgICAgICAgICAgICAgcmVmc190b19pbXBvcnQuYXBwZW5kKG1hdGNoZXNbMF0pCisgICAgICAg ICAgICBpZiBtaXNtYXRjaGVzOgorICAgICAgICAgICAgICAgIHJlZnNfdG9faW1wb3J0LmFwcGVu ZChtaXNtYXRjaGVzWzBdKQogCi0gICAgICAgICAgICBpZiAocmVmX2ZpbGUgPT0gc2VsZi5maWxl bmFtZSk6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHsncmVmZXJlbmNlZmlsZSc6IHNlbGYuZmls ZW5hbWV9Ci0KLSAgICAgICAgICAgIGlmIHNlbGYucmVmX2RvYyBpcyBOb25lOgotICAgICAgICAg ICAgICAgIHNlbGYubG9hZF9maWxlKHJlZl9maWxlLCBUcnVlKQotCi0gICAgICAgICAgICB0ZXN0 X2luZm8gPSB7J3Rlc3QnOiBzZWxmLmZpbGVuYW1lLCAncmVmZXJlbmNlJzogcmVmX2ZpbGUsICd0 eXBlJzogcmVmZXJlbmNlX3R5cGV9CisgICAgICAgICAgICB0ZXN0X2luZm8gPSB7J3Rlc3QnOiBz ZWxmLmZpbGVuYW1lfQogCi0gICAgICAgICAgICAjIElmIHRoZSByZWYgZmlsZSBkb2VzIG5vdCBs aXZlIGluIHRoZSBzYW1lIGRpcmVjdG9yeSBhcyB0aGUgdGVzdCBmaWxlLCBjaGVjayBpdCBmb3Ig c3VwcG9ydCBmaWxlcwotICAgICAgICAgICAgdGVzdF9pbmZvWydyZWZlcmVuY2Vfc3VwcG9ydF9p bmZvJ10gPSB7fQotICAgICAgICAgICAgaWYgc2VsZi5maWxlc3lzdGVtLmRpcm5hbWUocmVmX2Zp bGUpICE9IHNlbGYuZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYuZmlsZW5hbWUpOgotICAgICAgICAg ICAgICAgIHJlZmVyZW5jZV9zdXBwb3J0X2ZpbGVzID0gc2VsZi5zdXBwb3J0X2ZpbGVzKHNlbGYu cmVmX2RvYykKLSAgICAgICAgICAgICAgICBpZiBsZW4ocmVmZXJlbmNlX3N1cHBvcnRfZmlsZXMp ID4gMDoKLSAgICAgICAgICAgICAgICAgICAgcmVmZXJlbmNlX3JlbHBhdGggPSBzZWxmLmZpbGVz eXN0ZW0ucmVscGF0aChzZWxmLmZpbGVzeXN0ZW0uZGlybmFtZShzZWxmLmZpbGVuYW1lKSwgc2Vs Zi5maWxlc3lzdGVtLmRpcm5hbWUocmVmX2ZpbGUpKSArIHNlbGYuZmlsZXN5c3RlbS5zZXAKLSAg ICAgICAgICAgICAgICAgICAgdGVzdF9pbmZvWydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ10gPSB7 J3JlZmVyZW5jZV9yZWxwYXRoJzogcmVmZXJlbmNlX3JlbHBhdGgsICdmaWxlcyc6IHJlZmVyZW5j ZV9zdXBwb3J0X2ZpbGVzfQorICAgICAgICAgICAgZm9yIHJlZl90b19pbXBvcnQgaW4gcmVmc190 b19pbXBvcnQ6CisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAgICBocmVm X21hdGNoX2ZpbGUgPSByZWZfdG9faW1wb3J0WydocmVmJ10uc3RyaXAoKQorICAgICAgICAgICAg ICAgICAgICBpZiBocmVmX21hdGNoX2ZpbGUuc3RhcnRzd2l0aCgnLycpOgorICAgICAgICAgICAg ICAgICAgICAgICAgcmVmX2ZpbGUgPSBzZWxmLmZpbGVzeXN0ZW0uam9pbihzZWxmLnNvdXJjZV9y b290X2RpcmVjdG9yeSwgaHJlZl9tYXRjaF9maWxlLmxzdHJpcCgnLycpKQorICAgICAgICAgICAg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICAgICAgcmVmX2ZpbGUgPSBzZWxmLmZp bGVzeXN0ZW0uam9pbihzZWxmLmZpbGVzeXN0ZW0uZGlybmFtZShzZWxmLmZpbGVuYW1lKSwgaHJl Zl9tYXRjaF9maWxlKQorCisgICAgICAgICAgICAgICAgICAgIHJlZmVyZW5jZV90eXBlID0gcmVm X3RvX2ltcG9ydFsncmVsJ11bMF0gaWYgaXNpbnN0YW5jZShyZWZfdG9faW1wb3J0WydyZWwnXSwg bGlzdCkgZWxzZSByZWZfdG9faW1wb3J0WydyZWwnXQorICAgICAgICAgICAgICAgIGV4Y2VwdCBL ZXlFcnJvciBhcyBlOgorICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBGaWd1cmUgb3V0IHdo YXQgdG8gZG8gdy8gaW52YWxpZCB0ZXN0IGZpbGVzLgorICAgICAgICAgICAgICAgICAgICBfbG9n LmVycm9yKCclcyBoYXMgYSByZWZlcmVuY2UgbGluayBidXQgaXMgbWlzc2luZyB0aGUgImhyZWYi Jywgc2VsZi5maWxlc3lzdGVtKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQorCisg ICAgICAgICAgICAgICAgaWYgKHJlZl9maWxlID09IHNlbGYuZmlsZW5hbWUpOgorICAgICAgICAg ICAgICAgICAgICByZXR1cm4geydyZWZlcmVuY2VmaWxlJzogc2VsZi5maWxlbmFtZX0KKworICAg ICAgICAgICAgICAgIGlmIHNlbGYucmVmX2RvYyBpcyBOb25lOgorICAgICAgICAgICAgICAgICAg ICBzZWxmLmxvYWRfZmlsZShyZWZfZmlsZSwgVHJ1ZSkKKworICAgICAgICAgICAgICAgIHRlc3Rf aW5mb1tyZWZlcmVuY2VfdHlwZSArICdfcmVmZXJlbmNlJ10gPSByZWZfZmlsZQorICAgICAgICAg ICAgICAgIHRlc3RfaW5mb1tyZWZlcmVuY2VfdHlwZSArICdfcmVmZXJlbmNlX3N1cHBvcnRfaW5m byddID0ge30KKworICAgICAgICAgICAgICAgICMgSWYgdGhlIHJlZiBmaWxlIGRvZXMgbm90IGxp dmUgaW4gdGhlIHNhbWUgZGlyZWN0b3J5IGFzIHRoZSB0ZXN0IGZpbGUsIGNoZWNrIGl0IGZvciBz dXBwb3J0IGZpbGVzCisgICAgICAgICAgICAgICAgaWYgc2VsZi5maWxlc3lzdGVtLmRpcm5hbWUo cmVmX2ZpbGUpICE9IHNlbGYuZmlsZXN5c3RlbS5kaXJuYW1lKHNlbGYuZmlsZW5hbWUpOgorICAg ICAgICAgICAgICAgICAgICByZWZlcmVuY2Vfc3VwcG9ydF9maWxlcyA9IHNlbGYuc3VwcG9ydF9m aWxlcyhzZWxmLnJlZl9kb2MpCisgICAgICAgICAgICAgICAgICAgIGlmIGxlbihyZWZlcmVuY2Vf c3VwcG9ydF9maWxlcykgPiAwOgorICAgICAgICAgICAgICAgICAgICAgICAgcmVmZXJlbmNlX3Jl bHBhdGggPSBzZWxmLmZpbGVzeXN0ZW0ucmVscGF0aChzZWxmLmZpbGVzeXN0ZW0uZGlybmFtZShz ZWxmLmZpbGVuYW1lKSwgc2VsZi5maWxlc3lzdGVtLmRpcm5hbWUocmVmX2ZpbGUpKSArIHNlbGYu ZmlsZXN5c3RlbS5zZXAKKyAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfaW5mb1tyZWZlcmVu Y2VfdHlwZSArICdfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbyddID0geydyZWZlcmVuY2VfcmVscGF0 aCc6IHJlZmVyZW5jZV9yZWxwYXRoLCAnZmlsZXMnOiByZWZlcmVuY2Vfc3VwcG9ydF9maWxlc30K IAogICAgICAgICBlbGlmIHNlbGYuaXNfanN0ZXN0KCk6CiAgICAgICAgICAgICB0ZXN0X2luZm8g PSB7J3Rlc3QnOiBzZWxmLmZpbGVuYW1lLCAnanN0ZXN0JzogVHJ1ZX0KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfcGFyc2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9wYXJzZXJfdW5pdHRlc3QucHkKaW5kZXggODU5NmVm NmYyNTdiMjFlYWE2M2RlZGRlNTA3MDAzYzBjMjEwNDZhOS4uMzM2YTVmZTA0OTE2OWI4YjU0MTQ4 OTQ1OGFjMDc0OWNiYTEzZDBkMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9wYXJzZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93 M2MvdGVzdF9wYXJzZXJfdW5pdHRlc3QucHkKQEAgLTUxLDEwICs1MSw4IEBAIGNsYXNzIFRlc3RQ YXJzZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgICAgICBzZWxmLmFzc2VydE5vdEVx dWFsKHRlc3RfaW5mbywgTm9uZSwgJ2RpZCBub3QgZmluZCBhIHRlc3QnKQogICAgICAgICBzZWxm LmFzc2VydFRydWUoJ3Rlc3QnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSB0 ZXN0IGZpbGUnKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JlZmVyZW5jZScgaW4gdGVzdF9p bmZvLmtleXMoKSwgJ2RpZCBub3QgZmluZCBhIHJlZmVyZW5jZSBmaWxlJykKLSAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKHRlc3RfaW5mb1sncmVmZXJlbmNlJ10uc3RhcnRzd2l0aCh0ZXN0X3BhdGgp LCAncmVmZXJlbmNlIHBhdGggaXMgbm90IGNvcnJlY3QnKQotICAgICAgICBzZWxmLmFzc2VydFRy dWUoJ3R5cGUnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSByZWZlcmVuY2Ug dHlwZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdF9pbmZvWyd0eXBlJ10sICdtYXRj aCcsICdyZWZlcmVuY2UgdHlwZSBpcyBub3QgY29ycmVjdCcpCisgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZSgnbWF0Y2hfcmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpLCAnZGlkIG5vdCBmaW5k IGEgcmVmZXJlbmNlIGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUodGVzdF9pbmZvWydt YXRjaF9yZWZlcmVuY2UnXS5zdGFydHN3aXRoKHRlc3RfcGF0aCksICdyZWZlcmVuY2UgcGF0aCBp cyBub3QgY29ycmVjdCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ3JlZnN1cHBvcnQnIGlu IHRlc3RfaW5mby5rZXlzKCksICd0aGVyZSBzaG91bGQgYmUgbm8gcmVmc3VwcG9ydCBmaWxlcyBm b3IgdGhpcyB0ZXN0JykKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSgnanN0ZXN0JyBpbiB0ZXN0 X2luZm8ua2V5cygpLCAndGVzdCBzaG91bGQgbm90IGhhdmUgYmVlbiBhbmFseXplZCBhcyBhIGpz dGVzdCcpCiAKQEAgLTY5LDEwICs2Nyw4IEBAIGNsYXNzIFRlc3RQYXJzZXJUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKIAogICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFsKHRlc3RfaW5mbywgTm9u ZSwgJ2RpZCBub3QgZmluZCBhIHRlc3QnKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3Rlc3Qn IGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSB0ZXN0IGZpbGUnKQotICAgICAg ICBzZWxmLmFzc2VydFRydWUoJ3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ2RpZCBu b3QgZmluZCBhIHJlZmVyZW5jZSBmaWxlJykKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRlc3Rf aW5mb1sncmVmZXJlbmNlJ10uc3RhcnRzd2l0aCh0ZXN0X3BhdGgpLCAncmVmZXJlbmNlIHBhdGgg aXMgbm90IGNvcnJlY3QnKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3R5cGUnIGluIHRlc3Rf aW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSByZWZlcmVuY2UgdHlwZScpCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwodGVzdF9pbmZvWyd0eXBlJ10sICdtaXNtYXRjaCcsICdyZWZlcmVuY2Ug dHlwZSBpcyBub3QgY29ycmVjdCcpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnbWlzbWF0Y2hf cmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpLCAnZGlkIG5vdCBmaW5kIGEgcmVmZXJlbmNl IGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUodGVzdF9pbmZvWydtaXNtYXRjaF9yZWZl cmVuY2UnXS5zdGFydHN3aXRoKHRlc3RfcGF0aCksICdyZWZlcmVuY2UgcGF0aCBpcyBub3QgY29y cmVjdCcpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ3JlZnN1cHBvcnQnIGluIHRlc3RfaW5m by5rZXlzKCksICd0aGVyZSBzaG91bGQgYmUgbm8gcmVmc3VwcG9ydCBmaWxlcyBmb3IgdGhpcyB0 ZXN0JykKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSgnanN0ZXN0JyBpbiB0ZXN0X2luZm8ua2V5 cygpLCAndGVzdCBzaG91bGQgbm90IGhhdmUgYmVlbiBhbmFseXplZCBhcyBhIGpzdGVzdCcpCiAK QEAgLTkwLDE0ICs4NiwxNCBAQCBjbGFzcyBUZXN0UGFyc2VyVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAKICAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbCh0ZXN0X2luZm8sIE5vbmUsICdkaWQg bm90IGZpbmQgYSB0ZXN0JykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCd0ZXN0JyBpbiB0ZXN0 X2luZm8ua2V5cygpLCAnZGlkIG5vdCBmaW5kIGEgdGVzdCBmaWxlJykKLSAgICAgICAgc2VsZi5h c3NlcnRUcnVlKCdyZWZlcmVuY2UnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQg YSByZWZlcmVuY2UgZmlsZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSh0ZXN0X2luZm9bJ3Jl ZmVyZW5jZSddLnN0YXJ0c3dpdGgodGVzdF9wYXRoKSwgJ3JlZmVyZW5jZSBwYXRoIGlzIG5vdCBj b3JyZWN0JykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdtYXRjaF9yZWZlcmVuY2UnIGluIHRl c3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSByZWZlcmVuY2UgZmlsZScpCisgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZSh0ZXN0X2luZm9bJ21hdGNoX3JlZmVyZW5jZSddLnN0YXJ0c3dpdGgo dGVzdF9wYXRoKSwgJ3JlZmVyZW5jZSBwYXRoIGlzIG5vdCBjb3JyZWN0JykKICAgICAgICAgc2Vs Zi5hc3NlcnRGYWxzZSgncmVmc3VwcG9ydCcgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ3RoZXJlIHNo b3VsZCBiZSBubyByZWZzdXBwb3J0IGZpbGVzIGZvciB0aGlzIHRlc3QnKQogICAgICAgICBzZWxm LmFzc2VydEZhbHNlKCdqc3Rlc3QnIGluIHRlc3RfaW5mby5rZXlzKCksICd0ZXN0IHNob3VsZCBu b3QgaGF2ZSBiZWVuIGFuYWx5emVkIGFzIGEganN0ZXN0JykKIAogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKAogICAgICAgICAgICAgY2FwdHVyZWQucm9vdC5sb2cuZ2V0dmFsdWUoKSwKLSAgICAg ICAgICAgICdNdWx0aXBsZSByZWZlcmVuY2VzIGFyZSBub3Qgc3VwcG9ydGVkLiBJbXBvcnRpbmcg dGhlIGZpcnN0IHJlZiBkZWZpbmVkIGluIHNvbWVmaWxlLmh0bWxcbicsCisgICAgICAgICAgICAn TXVsdGlwbGUgcmVmZXJlbmNlcyBvZiB0aGUgc2FtZSB0eXBlIGFyZSBub3Qgc3VwcG9ydGVkLiBJ bXBvcnRpbmcgdGhlIGZpcnN0IHJlZiBkZWZpbmVkIGluIHNvbWVmaWxlLmh0bWxcbicsCiAgICAg ICAgICkKIAogICAgIGRlZiB0ZXN0X2FuYWx5emVfdGVzdF9yZWZ0ZXN0X21hdGNoX2FuZF9taXNt YXRjaChzZWxmKToKQEAgLTExNCwxNCArMTEwLDE2IEBAIGNsYXNzIFRlc3RQYXJzZXJUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKIAogICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFsKHRlc3RfaW5m bywgTm9uZSwgJ2RpZCBub3QgZmluZCBhIHRlc3QnKQogICAgICAgICBzZWxmLmFzc2VydFRydWUo J3Rlc3QnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSB0ZXN0IGZpbGUnKQot ICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKSwg J2RpZCBub3QgZmluZCBhIHJlZmVyZW5jZSBmaWxlJykKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVl KHRlc3RfaW5mb1sncmVmZXJlbmNlJ10uc3RhcnRzd2l0aCh0ZXN0X3BhdGgpLCAncmVmZXJlbmNl IHBhdGggaXMgbm90IGNvcnJlY3QnKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ21hdGNoX3Jl ZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ2RpZCBub3QgZmluZCBhIHJlZmVyZW5jZSBm aWxlJykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRlc3RfaW5mb1snbWF0Y2hfcmVmZXJlbmNl J10uc3RhcnRzd2l0aCh0ZXN0X3BhdGgpLCAncmVmZXJlbmNlIHBhdGggaXMgbm90IGNvcnJlY3Qn KQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ21pc21hdGNoX3JlZmVyZW5jZScgaW4gdGVzdF9p bmZvLmtleXMoKSwgJ2RpZCBub3QgZmluZCBhIHJlZmVyZW5jZSBmaWxlJykKKyAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKHRlc3RfaW5mb1snbWlzbWF0Y2hfcmVmZXJlbmNlJ10uc3RhcnRzd2l0aCh0 ZXN0X3BhdGgpLCAncmVmZXJlbmNlIHBhdGggaXMgbm90IGNvcnJlY3QnKQogICAgICAgICBzZWxm LmFzc2VydEZhbHNlKCdyZWZzdXBwb3J0JyBpbiB0ZXN0X2luZm8ua2V5cygpLCAndGhlcmUgc2hv dWxkIGJlIG5vIHJlZnN1cHBvcnQgZmlsZXMgZm9yIHRoaXMgdGVzdCcpCiAgICAgICAgIHNlbGYu YXNzZXJ0RmFsc2UoJ2pzdGVzdCcgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ3Rlc3Qgc2hvdWxkIG5v dCBoYXZlIGJlZW4gYW5hbHl6ZWQgYXMgYSBqc3Rlc3QnKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoCiAgICAgICAgICAgICBjYXB0dXJlZC5yb290LmxvZy5nZXR2YWx1ZSgpLAotICAgICAg ICAgICAgJ011bHRpcGxlIHJlZmVyZW5jZXMgYXJlIG5vdCBzdXBwb3J0ZWQuIEltcG9ydGluZyB0 aGUgZmlyc3QgcmVmIGRlZmluZWQgaW4gc29tZWZpbGUuaHRtbFxuJywKKyAgICAgICAgICAgICdN dWx0aXBsZSByZWZlcmVuY2VzIG9mIHRoZSBzYW1lIHR5cGUgYXJlIG5vdCBzdXBwb3J0ZWQuIElt cG9ydGluZyB0aGUgZmlyc3QgcmVmIGRlZmluZWQgaW4gc29tZWZpbGUuaHRtbFxuJywKICAgICAg ICAgKQogCiAgICAgZGVmIHRlc3RfYW5hbHl6ZV90ZXN0X3JlZnRlc3Rfd2l0aF9yZWZfc3VwcG9y dF9GaWxlcyhzZWxmKToKQEAgLTE1MCwxMCArMTQ4LDEwIEBAIGNsYXNzIFRlc3RQYXJzZXJUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgICAgICBzZWxmLmFzc2VydE5vdEVxdWFsKHRlc3Rf aW5mbywgTm9uZSwgJ2RpZCBub3QgZmluZCBhIHRlc3QnKQogICAgICAgICBzZWxmLmFzc2VydFRy dWUoJ3Rlc3QnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSB0ZXN0IGZpbGUn KQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMo KSwgJ2RpZCBub3QgZmluZCBhIHJlZmVyZW5jZSBmaWxlJykKLSAgICAgICAgc2VsZi5hc3NlcnRU cnVlKHRlc3RfaW5mb1sncmVmZXJlbmNlJ10uc3RhcnRzd2l0aCh0ZXN0X3BhdGgpLCAncmVmZXJl bmNlIHBhdGggaXMgbm90IGNvcnJlY3QnKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JlZmVy ZW5jZV9zdXBwb3J0X2luZm8nIGluIHRlc3RfaW5mby5rZXlzKCksICd0aGVyZSBzaG91bGQgYmUg cmVmZXJlbmNlX3N1cHBvcnRfaW5mbyBmb3IgdGhpcyB0ZXN0JykKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsZW4odGVzdF9pbmZvWydyZWZlcmVuY2Vfc3VwcG9ydF9pbmZvJ11bJ2ZpbGVzJ10p LCA0LCAndGhlcmUgc2hvdWxkIGJlIDQgc3VwcG9ydCBmaWxlcyBpbiB0aGlzIHJlZmVyZW5jZScp CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnbWF0Y2hfcmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8u a2V5cygpLCAnZGlkIG5vdCBmaW5kIGEgcmVmZXJlbmNlIGZpbGUnKQorICAgICAgICBzZWxmLmFz c2VydFRydWUodGVzdF9pbmZvWydtYXRjaF9yZWZlcmVuY2UnXS5zdGFydHN3aXRoKHRlc3RfcGF0 aCksICdyZWZlcmVuY2UgcGF0aCBpcyBub3QgY29ycmVjdCcpCisgICAgICAgIHNlbGYuYXNzZXJ0 VHJ1ZSgnbWF0Y2hfcmVmZXJlbmNlX3N1cHBvcnRfaW5mbycgaW4gdGVzdF9pbmZvLmtleXMoKSwg J3RoZXJlIHNob3VsZCBiZSByZWZlcmVuY2Vfc3VwcG9ydF9pbmZvIGZvciB0aGlzIHRlc3QnKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbih0ZXN0X2luZm9bJ21hdGNoX3JlZmVyZW5jZV9z dXBwb3J0X2luZm8nXVsnZmlsZXMnXSksIDQsICd0aGVyZSBzaG91bGQgYmUgNCBzdXBwb3J0IGZp bGVzIGluIHRoaXMgcmVmZXJlbmNlJykKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSgnanN0ZXN0 JyBpbiB0ZXN0X2luZm8ua2V5cygpLCAndGVzdCBzaG91bGQgbm90IGhhdmUgYmVlbiBhbmFseXpl ZCBhcyBhIGpzdGVzdCcpCiAKICAgICBkZWYgdGVzdF9hbmFseXplX2pzdGVzdChzZWxmKToKQEAg LTE3MCw3ICsxNjgsOCBAQCBjbGFzcyBUZXN0UGFyc2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6 CiAKICAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbCh0ZXN0X2luZm8sIE5vbmUsICd0ZXN0X2lu Zm8gaXMgTm9uZScpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgndGVzdCcgaW4gdGVzdF9pbmZv LmtleXMoKSwgJ2RpZCBub3QgZmluZCBhIHRlc3QgZmlsZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0 RmFsc2UoJ3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ3Nob2xkIG5vdCBoYXZlIGZv dW5kIGEgcmVmZXJlbmNlIGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKCdtYXRjaF9y ZWZlcmVuY2UnIGluIHRlc3RfaW5mby5rZXlzKCksICdzaG9sZCBub3QgaGF2ZSBmb3VuZCBhIHJl ZmVyZW5jZSBmaWxlJykKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSgnbWlzbWF0Y2hfcmVmZXJl bmNlJyBpbiB0ZXN0X2luZm8ua2V5cygpLCAnc2hvbGQgbm90IGhhdmUgZm91bmQgYSByZWZlcmVu Y2UgZmlsZScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ3JlZnN1cHBvcnQnIGluIHRlc3Rf aW5mby5rZXlzKCksICd0aGVyZSBzaG91bGQgYmUgbm8gcmVmc3VwcG9ydCBmaWxlcyBmb3IgdGhp cyB0ZXN0JykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdqc3Rlc3QnIGluIHRlc3RfaW5mby5r ZXlzKCksICd0ZXN0IHNob3VsZCBiZSBhIGpzdGVzdCcpCiAKQEAgLTI3Miw3ICsyNzEsOCBAQCBD T05URU5UIE9GIFRFU1QKIAogICAgICAgICAgICAgc2VsZi5hc3NlcnROb3RFcXVhbCh0ZXN0X2lu Zm8sIE5vbmUsICd0ZXN0X2luZm8gaXMgTm9uZScpCiAgICAgICAgICAgICBzZWxmLmFzc2VydFRy dWUoJ3Rlc3QnIGluIHRlc3RfaW5mby5rZXlzKCksICdkaWQgbm90IGZpbmQgYSB0ZXN0IGZpbGUn KQotICAgICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZSgncmVmZXJlbmNlJyBpbiB0ZXN0X2luZm8u a2V5cygpLCAnc2hvbGQgbm90IGhhdmUgZm91bmQgYSByZWZlcmVuY2UgZmlsZScpCisgICAgICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKCdtYXRjaF9yZWZlcmVuY2UnIGluIHRlc3RfaW5mby5rZXlz KCksICdzaG9sZCBub3QgaGF2ZSBmb3VuZCBhIHJlZmVyZW5jZSBmaWxlJykKKyAgICAgICAgICAg IHNlbGYuYXNzZXJ0RmFsc2UoJ21pc21hdGNoX3JlZmVyZW5jZScgaW4gdGVzdF9pbmZvLmtleXMo KSwgJ3Nob2xkIG5vdCBoYXZlIGZvdW5kIGEgcmVmZXJlbmNlIGZpbGUnKQogICAgICAgICAgICAg c2VsZi5hc3NlcnRGYWxzZSgncmVmc3VwcG9ydCcgaW4gdGVzdF9pbmZvLmtleXMoKSwgJ3RoZXJl IHNob3VsZCBiZSBubyByZWZzdXBwb3J0IGZpbGVzIGZvciB0aGlzIHRlc3QnKQogICAgICAgICAg ICAgc2VsZi5hc3NlcnRGYWxzZSgnanN0ZXN0JyBpbiB0ZXN0X2luZm8ua2V5cygpLCAndGVzdCBz aG91bGQgbm90IGJlIGEganN0ZXN0JykKICAgICAgICAgZmluYWxseToK