205243 2019-12-14 19:44:24 -0800 python3: wpt exporter should parse a patch as bytes 2019-12-16 15:02:39 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184986 InRadar P2 Normal --- 1 emilio jbedard commit-queue ews-watchlist glenn jbedard slewis webkit-bug-importer oldest_to_newest 1598692 0 385706 emilio 2019-12-14 19:44:24 -0800 Created attachment 385706 Output of webkit-patch-upload -g HEAD When trying to attach a patch to bug 117769, it threw, see the attached patch. 1598693 1 emilio 2019-12-14 19:44:45 -0800 (In reply to Emilio Cobos Álvarez (:emilio) from comment #0) > When trying to attach a patch to bug 117769, it threw, see the attached > patch. The attached output, that is :) 1598884 2 jbedard 2019-12-16 07:48:25 -0800 (In reply to Emilio Cobos Álvarez (:emilio) from comment #0) > Created attachment 385706 [details] > Output of webkit-patch-upload -g HEAD > > When trying to attach a patch to bug 117769, it threw, see the attached > patch. webkit-patch-upload isn't a WebKit script. Do you mean 'webkit-patch upload -g HEAD'? 1598892 3 emilio 2019-12-16 07:58:27 -0800 Yes, sorry. 1598902 4 385770 jbedard 2019-12-16 08:20:31 -0800 Created attachment 385770 Patch 1598903 5 jbedard 2019-12-16 08:22:38 -0800 I don't actually have a git checkout, so I can't 100% replicate Emilio's configuration, but our unit tests were passing around patches as strings, which meant that we weren't correctly covering this case, so I'm pretty confident this is our fix. 1599141 6 385770 commit-queue 2019-12-16 15:01:14 -0800 Comment on attachment 385770 Patch Clearing flags on attachment: 385770 Committed r253587: <https://trac.webkit.org/changeset/253587> 1599142 7 commit-queue 2019-12-16 15:01:15 -0800 All reviewed patches have been landed. Closing bug. 1599144 8 webkit-bug-importer 2019-12-16 15:02:39 -0800 <rdar://problem/57986684> 385706 2019-12-14 19:44:24 -0800 2019-12-14 19:44:24 -0800 Output of webkit-patch-upload -g HEAD file_205243.txt text/plain 2727 emilio V2FzIHRoYXQgZGlmZiBjb3JyZWN0PyBbWS9uXTogDQpidWdzLndlYmtpdC5vcmcgbG9naW46IGVt aWxpb0BjcmlzYWwuaW8NCmJ1Z3Mud2Via2l0Lm9yZyBwYXNzd29yZCBmb3IgZW1pbGlvQGNyaXNh bC5pbzogDQpTdG9yZSBwYXNzd29yZCBpbiBzeXN0ZW0ga2V5cmluZz8gW3kvTl06IHkNCkxvZ2dp bmcgaW4gYXMgZW1pbGlvQGNyaXNhbC5pby4uLg0KRmV0Y2hpbmc6IGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc3NjkmY3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRh Y2htZW50ZGF0YQ0KRmV0Y2hpbmc6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMTc3NjkmY3R5cGU9eG1sJmV4Y2x1ZGVmaWVsZD1hdHRhY2htZW50ZGF0YQ0KQXNzaWdu aW5nIGJ1ZyAxMTc3NjkgdG8gZW1pbGlvQGNyaXNhbC5pbw0KQWRkaW5nIHBhdGNoICJQYXRjaCIg dG8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzc2OQ0KVHJhY2Vi YWNrIChtb3N0IHJlY2VudCBjYWxsIGxhc3QpOg0KICBGaWxlICIvaG9tZS9lbWlsaW8vc3JjL1dl YktpdC9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9tZW1vaXplZC5weSIsIGxpbmUgNDIs IGluIF9fY2FsbF9fDQogICAgcmV0dXJuIHNlbGYuX3Jlc3VsdHNfY2FjaGVbYXJnc10NCktleUVy cm9yOiAoPHdlYmtpdHB5LnczYy50ZXN0X2V4cG9ydGVyLldlYlBsYXRmb3JtVGVzdEV4cG9ydGVy IG9iamVjdCBhdCAweDdmOTU4NjUwNjM3MD4sKQ0KDQpEdXJpbmcgaGFuZGxpbmcgb2YgdGhlIGFi b3ZlIGV4Y2VwdGlvbiwgYW5vdGhlciBleGNlcHRpb24gb2NjdXJyZWQ6DQoNClRyYWNlYmFjayAo bW9zdCByZWNlbnQgY2FsbCBsYXN0KToNCiAgRmlsZSAiLi9Ub29scy9TY3JpcHRzL3dlYmtpdC1w YXRjaCIsIGxpbmUgODAsIGluIDxtb2R1bGU+DQogICAgbWFpbigpDQogIEZpbGUgIi4vVG9vbHMv U2NyaXB0cy93ZWJraXQtcGF0Y2giLCBsaW5lIDc1LCBpbiBtYWluDQogICAgV2ViS2l0UGF0Y2go b3MucGF0aC5hYnNwYXRoKF9fZmlsZV9fKSkubWFpbigpDQogIEZpbGUgIi9ob21lL2VtaWxpby9z cmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9tdWx0aWNvbW1hbmR0b29sLnB5 IiwgbGluZSAzMDUsIGluIG1haW4NCiAgICByZXN1bHQgPSBjb21tYW5kLmNoZWNrX2FyZ3VtZW50 c19hbmRfZXhlY3V0ZShvcHRpb25zLCBhcmdzLCBzZWxmKQ0KICBGaWxlICIvaG9tZS9lbWlsaW8v c3JjL1dlYktpdC9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvbXVsdGljb21tYW5kdG9vbC5w eSIsIGxpbmUgMTIzLCBpbiBjaGVja19hcmd1bWVudHNfYW5kX2V4ZWN1dGUNCiAgICByZXR1cm4g c2VsZi5leGVjdXRlKG9wdGlvbnMsIGFyZ3MsIHRvb2wpIG9yIDANCiAgRmlsZSAiL2hvbWUvZW1p bGlvL3NyYy9XZWJLaXQvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Fic3Ry YWN0c2VxdWVuY2VkY29tbWFuZC5weSIsIGxpbmUgNTUsIGluIGV4ZWN1dGUNCiAgICBzZWxmLl9z ZXF1ZW5jZS5ydW5fYW5kX2hhbmRsZV9lcnJvcnModG9vbCwgb3B0aW9ucywgc3RhdGUpDQogIEZp bGUgIi9ob21lL2VtaWxpby9zcmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9j b21tYW5kcy9zdGVwc2VxdWVuY2UucHkiLCBsaW5lIDczLCBpbiBydW5fYW5kX2hhbmRsZV9lcnJv cnMNCiAgICBzZWxmLl9ydW4odG9vbCwgb3B0aW9ucywgc3RhdGUpDQogIEZpbGUgIi9ob21lL2Vt aWxpby9zcmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9zdGVw c2VxdWVuY2UucHkiLCBsaW5lIDY3LCBpbiBfcnVuDQogICAgc3RlcCh0b29sLCBvcHRpb25zKS5y dW4oc3RhdGUpDQogIEZpbGUgIi9ob21lL2VtaWxpby9zcmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zdGVwcy93cHRjaGFuZ2VleHBvcnQucHkiLCBsaW5lIDUzLCBpbiBydW4N CiAgICBpZiB0ZXN0X2V4cG9ydGVyLmhhc193cHRfY2hhbmdlcygpIGFuZCBzZWxmLl90b29sLnVz ZXIuY29uZmlybShtZXNzYWdlKToNCiAgRmlsZSAiL2hvbWUvZW1pbGlvL3NyYy9XZWJLaXQvVG9v bHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSIsIGxpbmUgMTU2LCBpbiBo YXNfd3B0X2NoYW5nZXMNCiAgICByZXR1cm4gYm9vbChzZWxmLl93cHRfcGF0Y2gpDQogIEZpbGUg Ii9ob21lL2VtaWxpby9zcmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL21l bW9pemVkLnB5IiwgbGluZSA0NSwgaW4gX19jYWxsX18NCiAgICByZXN1bHQgPSBzZWxmLl9mdW5j dGlvbigqYXJncykNCiAgRmlsZSAiL2hvbWUvZW1pbGlvL3NyYy9XZWJLaXQvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS93M2MvdGVzdF9leHBvcnRlci5weSIsIGxpbmUgMTUwLCBpbiBfd3B0X3BhdGNo DQogICAgcGF0Y2hfZGF0YSA9IHNlbGYuX3N0cmlwX2lnbm9yZWRfZmlsZXNfZnJvbV9kaWZmKHBh dGNoX2RhdGEpDQogIEZpbGUgIi9ob21lL2VtaWxpby9zcmMvV2ViS2l0L1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkiLCBsaW5lIDE2OCwgaW4gX3N0cmlwX2lnbm9y ZWRfZmlsZXNfZnJvbV9kaWZmDQogICAgbGluZXMgPSBkaWZmLnNwbGl0KCdcbicpDQpUeXBlRXJy b3I6IGEgYnl0ZXMtbGlrZSBvYmplY3QgaXMgcmVxdWlyZWQsIG5vdCAnc3RyJw0K 385770 2019-12-16 08:20:31 -0800 2019-12-16 15:01:14 -0800 Patch bug-205243-20191216082030.patch text/plain 7130 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MzU1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE5LTEyLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBweXRob24zOiB3cHQgZXhwb3J0ZXIgc2hvdWxkIHBhcnNlIGEgcGF0Y2gg YXMgYnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwNTI0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2NrLnB5OgorICAg ICAgICAoTW9ja1NDTS5jcmVhdGVfcGF0Y2gpOiBQYXRjaGVzIGFyZSBieXRlIGFycmF5cy4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5OgorICAgICAgICAo V2ViUGxhdGZvcm1UZXN0RXhwb3J0ZXIuX3dwdF9wYXRjaCk6IERpZmYgc2hvdWxkIGJlIGJ5dGUg YXJyYXkuCisgICAgICAgIChXZWJQbGF0Zm9ybVRlc3RFeHBvcnRlci5fZmluZF9maWxlbmFtZSk6 IERpdHRvLgorICAgICAgICAoV2ViUGxhdGZvcm1UZXN0RXhwb3J0ZXIuX2lzX2lnbm9yZWRfZmls ZSk6IEZpbGVuYW1lcyB3aWxsIGJlIGVuY29kZWQgYnl0ZXMuCisgICAgICAgIChXZWJQbGF0Zm9y bVRlc3RFeHBvcnRlci5fc3RyaXBfaWdub3JlZF9maWxlc19mcm9tX2RpZmYpOiBEaWZmIHNob3Vs ZCBiZSBieXRlIGFycmF5LgorICAgICAgICAoV2ViUGxhdGZvcm1UZXN0RXhwb3J0ZXIud3JpdGVf Z2l0X3BhdGNoX2ZpbGUpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90 ZXN0X2V4cG9ydGVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEV4cG9ydGVyVGVzdC5Nb2Nr R2l0KTogRGlmZiBzaG91bGQgYmUgYnl0ZSBhcnJheS4KKyAgICAgICAgKFRlc3RFeHBvcnRlclRl c3QudGVzdF9pZ25vcmVfY2hhbmdlc190b19leHBlY3RlZF9maWxlKTogRGl0dG8uCisKIDIwMTkt MTItMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4gTWFyayAvd2Via2l0L1dlYktpdFdlYlZpZXcv cG9pbnRlci1sb2NrLXBlcm1pc3Npb24tcmVxdWVzdCBhcyB0aW1lb3V0CkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtX21vY2sucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbV9tb2Nr LnB5CShyZXZpc2lvbiAyNTM1NTApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9j aGVja291dC9zY20vc2NtX21vY2sucHkJKHdvcmtpbmcgY29weSkKQEAgLTk3LDcgKzk3LDcgQEAg Y2xhc3MgTW9ja1NDTShvYmplY3QpOgogICAgICAgICByZXR1cm4gJzIwMTMtMDItMDEgMDg6NDg6 MDUgKzAwMDAnCiAKICAgICBkZWYgY3JlYXRlX3BhdGNoKHNlbGYsIGdpdF9jb21taXQsIGNoYW5n ZWRfZmlsZXM9Tm9uZSk6Ci0gICAgICAgIHJldHVybiAiUGF0Y2gxIgorICAgICAgICByZXR1cm4g YiJQYXRjaDEiCiAKICAgICBkZWYgY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1bWVudHMo c2VsZiwgYXJncyk6CiAgICAgICAgIHJldHVybiBbIkNvbW1pdGlzaDEiLCAiQ29tbWl0aXNoMiJd CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0ZXIucHkJKHJl dmlzaW9uIDI1MzU1MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZXhwb3J0 ZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAgZnJvbSB3ZWJraXRweS53M2Mu d3B0X2dpdGh1YiBpbXBvcnQgV1BURwogZnJvbSB3ZWJraXRweS53M2Mud3B0X2xpbnRlciBpbXBv cnQgV1BUTGludGVyCiBmcm9tIHdlYmtpdHB5LnczYy5jb21tb24gaW1wb3J0IFdQVF9HSF9PUkcs IFdQVF9HSF9SRVBPX05BTUUsIFdQVF9HSF9VUkwsIFdQVFBhdGhzCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKK2Zyb20gd2Via2l0cHkuY29tbW9uLnVuaWNv ZGVfY29tcGF0aWJpbGl0eSBpbXBvcnQgZW5jb2RlX2lmX25lY2Vzc2FyeSwgZGVjb2RlX2Zvcgog CiBpZiBzeXMudmVyc2lvbl9pbmZvID4gKDMsIDApOgogICAgIGZyb20gdXJsbGliLmVycm9yIGlt cG9ydCBIVFRQRXJyb3IKQEAgLTE0Niw5ICsxNDcsOSBAQCBjbGFzcyBXZWJQbGF0Zm9ybVRlc3RF eHBvcnRlcihvYmplY3QpOgogICAgIEBwcm9wZXJ0eQogICAgIEBtZW1vaXplZAogICAgIGRlZiBf d3B0X3BhdGNoKHNlbGYpOgotICAgICAgICBwYXRjaF9kYXRhID0gc2VsZi5faG9zdC5zY20oKS5j cmVhdGVfcGF0Y2goc2VsZi5fb3B0aW9ucy5naXRfY29tbWl0LCBbV0VCS0lUX1dQVF9ESVJdKSBv ciAnJworICAgICAgICBwYXRjaF9kYXRhID0gc2VsZi5faG9zdC5zY20oKS5jcmVhdGVfcGF0Y2go c2VsZi5fb3B0aW9ucy5naXRfY29tbWl0LCBbV0VCS0lUX1dQVF9ESVJdKSBvciBiJycKICAgICAg ICAgcGF0Y2hfZGF0YSA9IHNlbGYuX3N0cmlwX2lnbm9yZWRfZmlsZXNfZnJvbV9kaWZmKHBhdGNo X2RhdGEpCi0gICAgICAgIGlmIG5vdCAnZGlmZicgaW4gcGF0Y2hfZGF0YToKKyAgICAgICAgaWYg YidkaWZmJyBub3QgaW4gcGF0Y2hfZGF0YToKICAgICAgICAgICAgIHJldHVybiAnJwogICAgICAg ICByZXR1cm4gcGF0Y2hfZGF0YQogCkBAIC0xNTYsMjAgKzE1NywyMSBAQCBjbGFzcyBXZWJQbGF0 Zm9ybVRlc3RFeHBvcnRlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gYm9vbChzZWxmLl93cHRf cGF0Y2gpCiAKICAgICBkZWYgX2ZpbmRfZmlsZW5hbWUoc2VsZiwgbGluZSk6Ci0gICAgICAgIHJl dHVybiBsaW5lLnNwbGl0KCcgJylbLTFdCisgICAgICAgIHJldHVybiBsaW5lLnNwbGl0KGInICcp Wy0xXQogCiAgICAgZGVmIF9pc19pZ25vcmVkX2ZpbGUoc2VsZiwgZmlsZW5hbWUpOgorICAgICAg ICBmaWxlbmFtZSA9IGRlY29kZV9mb3IoZmlsZW5hbWUsIHN0cikKICAgICAgICAgZm9yIHN1ZmZp eCBpbiBFWENMVURFRF9GSUxFX1NVRkZJWEVTOgogICAgICAgICAgICAgaWYgZmlsZW5hbWUuZW5k c3dpdGgoc3VmZml4KToKICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICByZXR1 cm4gRmFsc2UKIAogICAgIGRlZiBfc3RyaXBfaWdub3JlZF9maWxlc19mcm9tX2RpZmYoc2VsZiwg ZGlmZik6Ci0gICAgICAgIGxpbmVzID0gZGlmZi5zcGxpdCgnXG4nKQorICAgICAgICBsaW5lcyA9 IGRpZmYuc3BsaXQoYidcbicpCiAgICAgICAgIGluY2x1ZGVfZmlsZSA9IFRydWUKICAgICAgICAg bmV3X2xpbmVzID0gW10KICAgICAgICAgZm9yIGxpbmUgaW4gbGluZXM6Ci0gICAgICAgICAgICBp ZiBsaW5lLnN0YXJ0c3dpdGgoJ2RpZmYnKToKKyAgICAgICAgICAgIGlmIGxpbmUuc3RhcnRzd2l0 aChiJ2RpZmYnKToKICAgICAgICAgICAgICAgICBpbmNsdWRlX2ZpbGUgPSBUcnVlCiAgICAgICAg ICAgICAgICAgZmlsZW5hbWUgPSBzZWxmLl9maW5kX2ZpbGVuYW1lKGxpbmUpCiAgICAgICAgICAg ICAgICAgaWYgc2VsZi5faXNfaWdub3JlZF9maWxlKGZpbGVuYW1lKToKQEAgLTE3NywyNCArMTc5 LDI0IEBAIGNsYXNzIFdlYlBsYXRmb3JtVGVzdEV4cG9ydGVyKG9iamVjdCk6CiAgICAgICAgICAg ICBpZiBpbmNsdWRlX2ZpbGU6CiAgICAgICAgICAgICAgICAgbmV3X2xpbmVzLmFwcGVuZChsaW5l KQogCi0gICAgICAgIHJldHVybiAnXG4nLmpvaW4obmV3X2xpbmVzKQorICAgICAgICByZXR1cm4g Yidcbicuam9pbihuZXdfbGluZXMpCiAKICAgICBkZWYgd3JpdGVfZ2l0X3BhdGNoX2ZpbGUoc2Vs Zik6CiAgICAgICAgIF8sIHBhdGNoX2ZpbGUgPSBzZWxmLl9maWxlc3lzdGVtLm9wZW5fYmluYXJ5 X3RlbXBmaWxlKCd3cHRfZXhwb3J0X3BhdGNoJykKICAgICAgICAgcGF0Y2hfZGF0YSA9IHNlbGYu X3dwdF9wYXRjaAotICAgICAgICBpZiBub3QgJ2RpZmYnIGluIHBhdGNoX2RhdGE6Ci0gICAgICAg ICAgICBfbG9nLmluZm8oJ05vIGNoYW5nZXMgdG8gdXBzdHJlYW0sIHBhdGNoIGRhdGEgaXM6ICIl cyInICUgKHBhdGNoX2RhdGEpKQotICAgICAgICAgICAgcmV0dXJuICcnCisgICAgICAgIGlmIGIn ZGlmZicgbm90IGluIHBhdGNoX2RhdGE6CisgICAgICAgICAgICBfbG9nLmluZm8oJ05vIGNoYW5n ZXMgdG8gdXBzdHJlYW0sIHBhdGNoIGRhdGEgaXM6ICJ7fSInLmZvcm1hdChkZWNvZGVfZm9yKHBh dGNoX2RhdGEsIHN0cikpKQorICAgICAgICAgICAgcmV0dXJuIGInJwogICAgICAgICAjIEZJWE1F OiBXZSBjYW4gcHJvYmFibHkgdHJ5IHRvIHVzZSAtLXJlbGF0aXZlIGdpdCBwYXJhbWV0ZXIgdG8g bm90IGRvIHRoYXQgcmVwbGFjZW1lbnQuCi0gICAgICAgIHBhdGNoX2RhdGEgPSBwYXRjaF9kYXRh LnJlcGxhY2UoV0VCS0lUX1dQVF9ESVIgKyAnLycsICcnKQorICAgICAgICBwYXRjaF9kYXRhID0g cGF0Y2hfZGF0YS5yZXBsYWNlKGVuY29kZV9pZl9uZWNlc3NhcnkoV0VCS0lUX1dQVF9ESVIpICsg YicvJywgYicnKQogCiAgICAgICAgICMgRklYTUU6IFN1cHBvcnQgc3RyaXBwaW5nIG9mIDwhLS0g d2Via2l0LXRlc3QtcnVubmVyIC0tPiBjb21tZW50cy4KLSAgICAgICAgc2VsZi5oYXNfd2Via2l0 X3Rlc3RfcnVubmVyX3NwZWNpZmljX2NoYW5nZXMgPSAnd2Via2l0LXRlc3QtcnVubmVyJyBpbiBw YXRjaF9kYXRhCisgICAgICAgIHNlbGYuaGFzX3dlYmtpdF90ZXN0X3J1bm5lcl9zcGVjaWZpY19j aGFuZ2VzID0gYid3ZWJraXQtdGVzdC1ydW5uZXInIGluIHBhdGNoX2RhdGEKICAgICAgICAgaWYg c2VsZi5oYXNfd2Via2l0X3Rlc3RfcnVubmVyX3NwZWNpZmljX2NoYW5nZXM6CiAgICAgICAgICAg ICBfbG9nLndhcm5pbmcoIlBhdGNoIGNvbnRhaW5zIHdlYmtpdC10ZXN0LXJ1bm5lciBzcGVjaWZp YyBjaGFuZ2VzLCBwbGVhc2UgcmVtb3ZlIHRoZW0gYmVmb3JlIGNyZWF0aW5nIGEgUFIiKQotICAg ICAgICAgICAgcmV0dXJuICcnCisgICAgICAgICAgICByZXR1cm4gYicnCiAKLSAgICAgICAgc2Vs Zi5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocGF0Y2hfZmlsZSwgcGF0Y2hfZGF0YSkKKyAg ICAgICAgc2VsZi5fZmlsZXN5c3RlbS53cml0ZV9iaW5hcnlfZmlsZShwYXRjaF9maWxlLCBwYXRj aF9kYXRhKQogICAgICAgICByZXR1cm4gcGF0Y2hfZmlsZQogCiAgICAgZGVmIF9wcm9tcHRfZm9y X3Rva2VuKHNlbGYsIG9wdGlvbnMpOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2Mv dGVzdF9leHBvcnRlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNTM1NTApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2V4cG9ydGVyX3VuaXR0ZXN0LnB5CSh3 b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw3IEBAIGNsYXNzIFRlc3RFeHBvcnRlclRlc3QodW5p dHRlc3QuVGVzdENhc2UKICAgICAgICAgICAgIHJldHVybiBUcnVlCiAKICAgICBjbGFzcyBNb2Nr R2l0KG9iamVjdCk6Ci0gICAgICAgIG1vY2tfZm9ybWF0X3BhdGNoX3Jlc3VsdCA9ICdteSBwYXRj aCBjb250YWluaW5nIHNvbWUgZGlmZnMnCisgICAgICAgIG1vY2tfZm9ybWF0X3BhdGNoX3Jlc3Vs dCA9IGInbXkgcGF0Y2ggY29udGFpbmluZyBzb21lIGRpZmZzJwogCiAgICAgICAgIEBjbGFzc21l dGhvZAogICAgICAgICBkZWYgY2xvbmUoY2xzLCB1cmwsIGRpcmVjdG9yeSwgZXhlY3V0aXZlPU5v bmUpOgpAQCAtMjE3LDcgKzIxNyw3IEBAIGNsYXNzIFRlc3RFeHBvcnRlclRlc3QodW5pdHRlc3Qu VGVzdENhc2UKIAogICAgIGRlZiB0ZXN0X2lnbm9yZV9jaGFuZ2VzX3RvX2V4cGVjdGVkX2ZpbGUo c2VsZik6CiAgICAgICAgIGhvc3QgPSBUZXN0RXhwb3J0ZXJUZXN0Lk15TW9ja0hvc3QoKQotICAg ICAgICBob3N0Ll9tb2NrU0NNLm1vY2tfZm9ybWF0X3BhdGNoX3Jlc3VsdCA9ICIiIgorICAgICAg ICBob3N0Ll9tb2NrU0NNLm1vY2tfZm9ybWF0X3BhdGNoX3Jlc3VsdCA9IGIiIiIKIFN1YnZlcnNp b24gUmV2aXNpb246IDIzMTkyMAogZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvYXBpL2hlYWRlcnMvaGVhZGVyLXZhbHVlcy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Zl dGNoL2FwaS9oZWFkZXJzL2hlYWRlci12YWx1ZXMtZXhwZWN0ZWQudHh0CiAKQEAgLTIyOSw3ICsy MjksNyBAQCBkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlCiAKICAgICBk ZWYgdGVzdF9pZ25vcmVfY2hhbmdlc190b193M2NfaW1wb3J0X2xvZyhzZWxmKToKICAgICAgICAg aG9zdCA9IFRlc3RFeHBvcnRlclRlc3QuTXlNb2NrSG9zdCgpCi0gICAgICAgIGhvc3QuX21vY2tT Q00ubW9ja19mb3JtYXRfcGF0Y2hfcmVzdWx0ID0gIiIiCisgICAgICAgIGhvc3QuX21vY2tTQ00u bW9ja19mb3JtYXRfcGF0Y2hfcmVzdWx0ID0gYiIiIgogU3VidmVyc2lvbiBSZXZpc2lvbjogMjMx OTIwCiBkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9mZXRjaC9hcGkvaGVhZGVycy93M2MtaW1wb3J0LmxvZyBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvYXBpL2hlYWRlcnMvdzNjLWltcG9ydC5s b2cKIAo=