MIME-Version: 1.0
From: Khushboo Vashi <khushboo.vashi@enterprisedb.com>
Date: Fri, 12 Jul 2019 15:16:09 +0530
Message-ID: 
 <CAFOhELcvULp8TPxOGw_C7eQ6dmq6ddo=HGifCSW0EpHqD+d64g@mail.gmail.com>
Subject: [pgAdmin4][Patch] : RE-SQL tests for Collation node
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000004be41c058d78c8b7"
Precedence: bulk

--0000000000004be41c058d78c8b7
Content-Type: multipart/alternative; boundary="0000000000004be41a058d78c8b5"

--0000000000004be41a058d78c8b5
Content-Type: text/plain; charset="UTF-8"

Hi,

Please find the attached patch for the RE-SQL tests for collation node.
This patch also includes the *modified SQL tests* as well as fixes for the
RE-SQL in the collation node which I found while implementing this.

To add the modified SQL tests, 2 optional parameters are introduced in the
JSON file, i.e.
*msql_endpoint* and *expected_msql_file.*
These parameters need to be included in the Alter scenarios.

I have modified the RE-SQL framework to support modified SQL.

Thanks,
Khushboo

--0000000000004be41a058d78c8b5
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi,<div><br></div><div>Please find the attached patch for =
the RE-SQL tests for collation node.</div><div>This patch also includes the=
 <i>modified SQL tests</i> as well as fixes for the RE-SQL in the collation=
 node which I found while implementing this.</div><div><br></div><div>To ad=
d the modified SQL tests, 2 optional parameters are introduced in the JSON =
file, i.e.</div><div><i><b>msql_endpoint</b></i> and <i><b>expected_msql_fi=
le.</b></i></div><div>These parameters need to be included in the Alter sce=
narios.</div><div><br></div><div>I have modified the RE-SQL framework to su=
pport modified SQL.</div><div><br></div><div>Thanks,</div><div>Khushboo</di=
v><div><br></div></div>

--0000000000004be41a058d78c8b5--

--0000000000004be41c058d78c8b7
Content-Type: application/octet-stream; name="resql_collation.patch"
Content-Disposition: attachment; filename="resql_collation.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_jxzwy1aq0>
X-Attachment-Id: f_jxzwy1aq0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93
c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL19f
aW5pdF9fLnB5CmluZGV4IDJhZWYyOGI3Li5kZDYwNjQ1NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt
aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0
aW9ucy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv
c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL19faW5pdF9fLnB5CkBAIC01MTEs
MjQgKzUxMSwyMiBAQCBjbGFzcyBDb2xsYXRpb25WaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAg
ICAgICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRlbXBsYXRl
X3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn
Z2V0X25hbWUuc3FsJ10pLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz
Y2lkPXNjaWQsIGNvaWQ9Y29pZCkKLSAgICAgICAgICAgICAgICBzdGF0dXMsIG5hbWUgPSBzZWxm
LmNvbm4uZXhlY3V0ZV9zY2FsYXIoU1FMKQorICAgICAgICAgICAgICAgIHN0YXR1cywgcmVzID0g
c2VsZi5jb25uLmV4ZWN1dGVfZGljdChTUUwpCiAgICAgICAgICAgICAgICAgaWYgbm90IHN0YXR1
czoKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJv
cm1zZz1uYW1lKQotCi0gICAgICAgICAgICAgICAgaWYgbmFtZSBpcyBOb25lOgotICAgICAgICAg
ICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKAotICAgICAgICAgICAgICAgICAg
ICAgICAgc3VjY2Vzcz0wLAotICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4
dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnRXJyb3I6IE9iamVjdCBub3QgZm91bmQu
JwotICAgICAgICAgICAgICAgICAgICAgICAgKSwKLSAgICAgICAgICAgICAgICAgICAgICAgIGlu
Zm89Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAnVGhlIHNwZWNpZmllZCBj
b2xsYXRpb24gY291bGQgbm90IGJlIGZvdW5kLlxuJwotICAgICAgICAgICAgICAgICAgICAgICAg
KQotICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBpbnRl
cm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQorCisgICAgICAgICAgICAgICAgaWYgbGVu
KHJlc1sncm93cyddKSA9PSAwOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gZ29uZShnZXR0
ZXh0KAorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSBjb2xsYXRp
b24gb2JqZWN0IGluIHRoZSBkYXRhYmFzZS4iCisgICAgICAgICAgICAgICAgICAgICkpCisKKyAg
ICAgICAgICAgICAgICBkYXRhID0gcmVzWydyb3dzJ11bMF0KIAogICAgICAgICAgICAgICAgIFNR
TCA9IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLAogICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2RlbGV0ZS5zcWwnXSks
Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU9bmFtZSwgY2FzY2Fk
ZT1jYXNjYWRlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuYW1lPWRh
dGFbJ25hbWUnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnNwbmFt
ZT1kYXRhWydzY2hlbWEnXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
Y2FzY2FkZT1jYXNjYWRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj
b25uPXNlbGYuY29ubikKICAgICAgICAgICAgICAgICBzdGF0dXMsIHJlcyA9IHNlbGYuY29ubi5l
eGVjdXRlX3NjYWxhcihTUUwpCiAgICAgICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKQEAgLTcw
MCw3ICs2OTgsOCBAQCBjbGFzcyBDb2xsYXRpb25WaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAKICAg
ICAgICAgc3FsX2hlYWRlciArPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYudGVtcGxh
dGVfcGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICdkZWxldGUuc3FsJ10pLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBu
YW1lPWRhdGFbJ25hbWUnXSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
bmFtZT1kYXRhWyduYW1lJ10sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IG5zcG5hbWU9ZGF0YVsnc2NoZW1hJ10pCiAgICAgICAgIFNRTCA9IHNxbF9oZWFkZXIgKyAnXG5c
bicgKyBTUUwuc3RyaXAoJ1xuJykKIAogICAgICAgICByZXR1cm4gYWpheF9yZXNwb25zZShyZXNw
b25zZT1TUUwpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv
c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL3RlbXBsYXRlcy9jb2xsYXRpb25z
L3NxbC9kZWZhdWx0L2RlbGV0ZS5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91
cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL3RlbXBsYXRlcy9jb2xsYXRp
b25zL3NxbC9kZWZhdWx0L2RlbGV0ZS5zcWwKaW5kZXggNWIxZjhjZTAuLmJiY2E0NDlmIDEwMDY0
NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz
ZXMvc2NoZW1hcy9jb2xsYXRpb25zL3RlbXBsYXRlcy9jb2xsYXRpb25zL3NxbC9kZWZhdWx0L2Rl
bGV0ZS5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv
ZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZW1wbGF0ZXMvY29sbGF0aW9ucy9zcWwvZGVm
YXVsdC9kZWxldGUuc3FsCkBAIC0xICsxIEBACi1EUk9QIENPTExBVElPTiB7e25hbWV9fXslIGlm
IGNhc2NhZGUlfSBDQVNDQURFeyUgZW5kaWYgJX07CitEUk9QIENPTExBVElPTiB7eyBjb25ufHF0
SWRlbnQobnNwbmFtZSwgbmFtZSkgfX17JSBpZiBjYXNjYWRlJX0gQ0FTQ0FERXslIGVuZGlmICV9
OwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv
ZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZW1wbGF0ZXMvY29sbGF0aW9ucy9zcWwvZGVm
YXVsdC9nZXRfbmFtZS5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy
dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL3RlbXBsYXRlcy9jb2xsYXRpb25zL3Nx
bC9kZWZhdWx0L2dldF9uYW1lLnNxbAppbmRleCBmNWRkYTAwNS4uYjBkOTVlZDkgMTAwNjQ0Ci0t
LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z
Y2hlbWFzL2NvbGxhdGlvbnMvdGVtcGxhdGVzL2NvbGxhdGlvbnMvc3FsL2RlZmF1bHQvZ2V0X25h
bWUuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvdGVtcGxhdGVzL2NvbGxhdGlvbnMvc3FsL2RlZmF1
bHQvZ2V0X25hbWUuc3FsCkBAIC0xLDQgKzEsNCBAQAotU0VMRUNUIGNvbmNhdChxdW90ZV9pZGVu
dChuc3BuYW1lKSwgJy4nLCBxdW90ZV9pZGVudChjb2xsbmFtZSkpICBBUyBuYW1lCitTRUxFQ1Qg
bnNwbmFtZSBBUyBzY2hlbWEsIGNvbGxuYW1lIEFTIG5hbWUKIEZST00gcGdfY29sbGF0aW9uIGMs
IHBnX25hbWVzcGFjZSBuCiBXSEVSRSBjLmNvbGxuYW1lc3BhY2UgPSBuLm9pZCBBTkQKICAgICBu
Lm9pZCA9IHt7IHNjaWQgfX06Om9pZCBBTkQKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dz
ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvdGVz
dHMvZGVmYXVsdC9hbHRlcl9jb2xsYXRpb24uc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2
ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZh
dWx0L2FsdGVyX2NvbGxhdGlvbi5zcWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw
MDAuLjNmZDdkZjFjCi0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2
ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZh
dWx0L2FsdGVyX2NvbGxhdGlvbi5zcWwKQEAgLTAsMCArMSwxMiBAQAorLS0gQ29sbGF0aW9uOiBD
bDFfJCV7fVtdKCkmKl4hQCInYFwvI2E7CisKKy0tIERST1AgQ09MTEFUSU9OIHRlc3RzY2hlbWEu
IkNsMV8kJXt9W10oKSYqXiFAIiInYFwvI2EiOworCitDUkVBVEUgQ09MTEFUSU9OIHRlc3RzY2hl
bWEuIkNsMV8kJXt9W10oKSYqXiFAIiInYFwvI2EiCisgICAgKExDX0NPTExBVEUgPSAnQycsIExD
X0NUWVBFID0gJ0MnKTsKKworQUxURVIgQ09MTEFUSU9OIHRlc3RzY2hlbWEuIkNsMV8kJXt9W10o
KSYqXiFAIiInYFwvI2EiCisgICAgT1dORVIgVE8gcG9zdGdyZXM7CisKK0NPTU1FTlQgT04gQ09M
TEFUSU9OIHRlc3RzY2hlbWEuIkNsMV8kJXt9W10oKSYqXiFAIiInYFwvI2EiCisgICAgSVMgJ0Rl
c2NyaXB0aW9uIGZvciBhbHRlcic7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl
cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL3Rlc3RzL2Rl
ZmF1bHQvY3JlYXRlX2NvbGxhdGlvbi5zcWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n
cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9jb2xsYXRpb25zL3Rlc3RzL2RlZmF1bHQv
Y3JlYXRlX2NvbGxhdGlvbi5zcWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAu
LmU0NjIwZjM4Ci0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf
Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZhdWx0
L2NyZWF0ZV9jb2xsYXRpb24uc3FsCkBAIC0wLDAgKzEsMTIgQEAKKy0tIENvbGxhdGlvbjogQ2wx
XyQle31bXSgpJipeIUAiJ2BcLyM7CisKKy0tIERST1AgQ09MTEFUSU9OIHRlc3RzY2hlbWEuIkNs
MV8kJXt9W10oKSYqXiFAIiInYFwvIyI7CisKK0NSRUFURSBDT0xMQVRJT04gdGVzdHNjaGVtYS4i
Q2wxXyQle31bXSgpJipeIUAiIidgXC8jIgorICAgIChMQ19DT0xMQVRFID0gJ0MnLCBMQ19DVFlQ
RSA9ICdDJyk7CisKK0FMVEVSIENPTExBVElPTiB0ZXN0c2NoZW1hLiJDbDFfJCV7fVtdKCkmKl4h
QCIiJ2BcLyMiCisgICAgT1dORVIgVE8gcG9zdGdyZXM7CisKK0NPTU1FTlQgT04gQ09MTEFUSU9O
IHRlc3RzY2hlbWEuIkNsMV8kJXt9W10oKSYqXiFAIiInYFwvIyIKKyAgICBJUyAnRGVzY3JpcHRp
b24nOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl
cnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZhdWx0L21zcWxfY29sbGF0
aW9uLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi
YXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvdGVzdHMvZGVmYXVsdC9tc3FsX2NvbGxhdGlvbi5zcWwK
bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAuLmY1ODYxNmRjCi0tLSAvZGV2L251
bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh
c2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZhdWx0L21zcWxfY29sbGF0aW9uLnNxbApA
QCAtMCwwICsxLDUgQEAKK0NPTU1FTlQgT04gQ09MTEFUSU9OIHRlc3RzY2hlbWEuIkNsMV8kJXt9
W10oKSYqXiFAIiInYFwvIyIKKyAgICBJUyAnRGVzY3JpcHRpb24gZm9yIGFsdGVyJzsKKworQUxU
RVIgQ09MTEFUSU9OIHRlc3RzY2hlbWEuIkNsMV8kJXt9W10oKSYqXiFAIiInYFwvIyIKKyAgICBS
RU5BTUUgVE8gIkNsMV8kJXt9W10oKSYqXiFAIiInYFwvI2EiOwpkaWZmIC0tZ2l0IGEvd2ViL3Bn
YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29s
bGF0aW9ucy90ZXN0cy9kZWZhdWx0L3Rlc3QuanNvbiBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy
dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxhdGlvbnMvdGVzdHMvZGVm
YXVsdC90ZXN0Lmpzb24KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAuLmNjMWIw
N2NhCi0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz
L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy90ZXN0cy9kZWZhdWx0L3Rlc3Qu
anNvbgpAQCAtMCwwICsxLDM4IEBACit7CisgICJzY2VuYXJpb3MiOiBbCisgICAgeworICAgICAg
InR5cGUiOiAiY3JlYXRlIiwKKyAgICAgICJuYW1lIjogIkNyZWF0ZSBDb2xsYXRpb24iLAorICAg
ICAgImVuZHBvaW50IjogIk5PREUtY29sbGF0aW9uLm9iaiIsCisgICAgICAic3FsX2VuZHBvaW50
IjogIk5PREUtY29sbGF0aW9uLnNxbF9pZCIsCisgICAgICAiZGF0YSI6IHsKKyAgICAgICAgIm5h
bWUiOiAiQ2wxXyQle31bXSgpJipeIUBcIidgXFwvIyIsCisgICAgICAgICJvd25lciI6ICJwb3N0
Z3JlcyIsCisgICAgICAgICJzY2hlbWEiOiAidGVzdHNjaGVtYSIsCisgICAgICAgICJjb3B5X2Nv
bGxhdGlvbiI6ICJwZ19jYXRhbG9nLlwiQ1wiIiwKKyAgICAgICAgImRlc2NyaXB0aW9uIjogIkRl
c2NyaXB0aW9uIgorICAgICAgfSwKKyAgICAgICJleHBlY3RlZF9zcWxfZmlsZSI6ICJjcmVhdGVf
Y29sbGF0aW9uLnNxbCIKKyAgICB9LCB7CisgICAgICAidHlwZSI6ICJhbHRlciIsCisgICAgICAi
bmFtZSI6ICJBbHRlciBDb2xsYXRpb24iLAorICAgICAgImVuZHBvaW50IjogIk5PREUtY29sbGF0
aW9uLm9ial9pZCIsCisgICAgICAic3FsX2VuZHBvaW50IjogIk5PREUtY29sbGF0aW9uLnNxbF9p
ZCIsCisgICAgICAibXNxbF9lbmRwb2ludCI6ICJOT0RFLWNvbGxhdGlvbi5tc3FsX2lkIiwKKyAg
ICAgICJkYXRhIjogeworICAgICAgICAibmFtZSI6ICJDbDFfJCV7fVtdKCkmKl4hQFwiJ2BcXC8j
YSIsCisgICAgICAgICJzY2hlbWEiOiAidGVzdHNjaGVtYSIsCisgICAgICAgICJkZXNjcmlwdGlv
biI6ICJEZXNjcmlwdGlvbiBmb3IgYWx0ZXIiCisgICAgICB9LAorICAgICAgImV4cGVjdGVkX3Nx
bF9maWxlIjogImFsdGVyX2NvbGxhdGlvbi5zcWwiLAorICAgICAgImV4cGVjdGVkX21zcWxfZmls
ZSI6ICJtc3FsX2NvbGxhdGlvbi5zcWwiCisgICAgfSwgeworICAgICAgInR5cGUiOiAiZGVsZXRl
IiwKKyAgICAgICJuYW1lIjogIkRyb3AgQ29sbGF0aW9uIiwKKyAgICAgICJlbmRwb2ludCI6ICJO
T0RFLWNvbGxhdGlvbi5kZWxldGVfaWQiLAorICAgICAgImRhdGEiOiB7CisgICAgICAgICJuYW1l
IjogIkNsMV8kJXt9W10oKSYqXiFAXCInYFxcLyNhIgorICAgICAgfQorICAgIH0KKyAgXQorfQpk
aWZmIC0tZ2l0IGEvd2ViL3JlZ3Jlc3Npb24vcmVfc3FsL3Rlc3RzL3Rlc3RfcmVzcWwucHkgYi93
ZWIvcmVncmVzc2lvbi9yZV9zcWwvdGVzdHMvdGVzdF9yZXNxbC5weQppbmRleCA3ZDYyNmM0NS4u
ODkzYTU3Y2EgMTAwNjQ0Ci0tLSBhL3dlYi9yZWdyZXNzaW9uL3JlX3NxbC90ZXN0cy90ZXN0X3Jl
c3FsLnB5CisrKyBiL3dlYi9yZWdyZXNzaW9uL3JlX3NxbC90ZXN0cy90ZXN0X3Jlc3FsLnB5CkBA
IC05LDYgKzksNyBAQAogZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbgogaW1w
b3J0IGpzb24KIGltcG9ydCBvcworaW1wb3J0IHVybGxpYgogaW1wb3J0IHRyYWNlYmFjawogZnJv
bSBmbGFzayBpbXBvcnQgdXJsX2ZvcgogaW1wb3J0IHJlZ3Jlc3Npb24KQEAgLTIyMyw2ICsyMjQs
MTkgQEAgY2xhc3MgUmV2ZXJzZUVuZ2luZWVyZWRTUUxUZXN0Q2FzZXMoQmFzZVRlc3RHZW5lcmF0
b3IpOgogICAgICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgZWxpZiAndHlw
ZScgaW4gc2NlbmFyaW8gYW5kIHNjZW5hcmlvWyd0eXBlJ10gPT0gJ2FsdGVyJzoKICAgICAgICAg
ICAgICAgICAjIEdldCB0aGUgdXJsIGFuZCBjcmVhdGUgdGhlIHNwZWNpZmljIG5vZGUuCisKKyAg
ICAgICAgICAgICAgICAjIElmIG1zcWxfZW5kcG9pbnQgZXhpc3RzIHRoZW4gdmFsaWRhdGUgdGhl
IG1vZGlmaWVkIHNxbAorICAgICAgICAgICAgICAgIGlmICdtc3FsX2VuZHBvaW50JyBpbiBzY2Vu
YXJpb1wKKyAgICAgICAgICAgICAgICAgICAgICAgIGFuZCBzY2VuYXJpb1snbXNxbF9lbmRwb2lu
dCddOgorICAgICAgICAgICAgICAgICAgICBpZiBub3Qgc2VsZi5jaGVja19tc3FsKHNjZW5hcmlv
LCBvYmplY3RfaWQpOgorICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRfbXNnID0gc2NlbmFy
aW9bJ25hbWUnXQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgJ2V4cGVjdGVkX21zcWxfZmls
ZScgaW4gc2NlbmFyaW86CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRfbXNnICs9
ICIgIEV4cGVjdGVkIE1TUUwgRmlsZToiICsgc2NlbmFyaW9bCisgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICdleHBlY3RlZF9tc3FsX2ZpbGUnXQorICAgICAgICAgICAgICAgICAgICAg
ICAgcHJpbnRfbXNnID0gcHJpbnRfbXNnICsgIi4uLiBGQUlMIgorICAgICAgICAgICAgICAgICAg
ICAgICAgcHJpbnQocHJpbnRfbXNnKQorICAgICAgICAgICAgICAgICAgICAgICAgY29udGludWUK
KwogICAgICAgICAgICAgICAgIGFsdGVyX3VybCA9IHNlbGYuZ2V0X3VybChzY2VuYXJpb1snZW5k
cG9pbnQnXSwgb2JqZWN0X2lkKQogICAgICAgICAgICAgICAgIHJlc3BvbnNlID0gc2VsZi50ZXN0
ZXIucHV0KGFsdGVyX3VybCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBkYXRhPWpzb24uZHVtcHMoc2NlbmFyaW9bJ2RhdGEnXSksCkBAIC0yNDcsNiArMjYxLDE2
IEBAIGNsYXNzIFJldmVyc2VFbmdpbmVlcmVkU1FMVGVzdENhc2VzKEJhc2VUZXN0R2VuZXJhdG9y
KToKICAgICAgICAgICAgICAgICAgICAgcHJpbnRfbXNnID0gcHJpbnRfbXNnICsgIi4uLiBGQUlM
IgogICAgICAgICAgICAgICAgICAgICBwcmludChwcmludF9tc2cpCiAgICAgICAgICAgICAgICAg
ICAgIGNvbnRpbnVlCisgICAgICAgICAgICBlbGlmICd0eXBlJyBpbiBzY2VuYXJpbyBhbmQgc2Nl
bmFyaW9bJ3R5cGUnXSA9PSAnbXNxbCc6CisgICAgICAgICAgICAgICAgIyBDb21wYXJlIHRoZSBy
ZXZlcnNlIGVuZ2luZWVyaW5nIFNRTAorICAgICAgICAgICAgICAgIGlmIG5vdCBzZWxmLmNoZWNr
X3JlX3NxbChzY2VuYXJpbywgb2JqZWN0X2lkKToKKyAgICAgICAgICAgICAgICAgICAgcHJpbnRf
bXNnID0gc2NlbmFyaW9bJ25hbWUnXQorICAgICAgICAgICAgICAgICAgICBpZiAnZXhwZWN0ZWRf
c3FsX2ZpbGUnIGluIHNjZW5hcmlvOgorICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRfbXNn
ID0gcHJpbnRfbXNnICsgIiAgRXhwZWN0ZWQgU1FMIEZpbGU6IiArIFwKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNjZW5hcmlvWydleHBlY3RlZF9zcWxf
ZmlsZSddCisgICAgICAgICAgICAgICAgICAgIHByaW50X21zZyA9IHByaW50X21zZyArICIgLi4u
Li4uLi4uLi4uLi5GQUlMIgorICAgICAgICAgICAgICAgICAgICBwcmludChwcmludF9tc2cpCisg
ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICBlbGlmICd0eXBlJyBpbiBz
Y2VuYXJpbyBhbmQgc2NlbmFyaW9bJ3R5cGUnXSA9PSAnZGVsZXRlJzoKICAgICAgICAgICAgICAg
ICAjIEdldCB0aGUgZGVsZXRlIHVybCBhbmQgZGVsZXRlIHRoZSBvYmplY3QgY3JlYXRlZCBhYm92
ZS4KICAgICAgICAgICAgICAgICBkZWxldGVfdXJsID0gc2VsZi5nZXRfdXJsKHNjZW5hcmlvWydl
bmRwb2ludCddLCBvYmplY3RfaWQpCkBAIC0yOTUsNiArMzE5LDY2IEBAIGNsYXNzIFJldmVyc2VF
bmdpbmVlcmVkU1FMVGVzdENhc2VzKEJhc2VUZXN0R2VuZXJhdG9yKToKIAogICAgICAgICByZXR1
cm4gRmFsc2UsIE5vbmUKIAorICAgIGRlZiBjaGVja19tc3FsKHNlbGYsIHNjZW5hcmlvLCBvYmpl
Y3RfaWQpOgorICAgICAgICAiIiIKKyAgICAgICAgVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRvIGNo
ZWNrIHRoZSBtb2RpZmllZCBTUUwuCisgICAgICAgIDpwYXJhbSBzY2VuYXJpbzoKKyAgICAgICAg
OnBhcmFtIG9iamVjdF9pZDoKKyAgICAgICAgOnJldHVybjoKKyAgICAgICAgIiIiCisKKyAgICAg
ICAgbXNxbF91cmwgPSBzZWxmLmdldF91cmwoc2NlbmFyaW9bJ21zcWxfZW5kcG9pbnQnXSwKKyAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0X2lkKQorCisgICAgICAgIHBhcmFt
cyA9IHVybGxpYi5wYXJzZS51cmxlbmNvZGUoc2NlbmFyaW9bJ2RhdGEnXSkKKyAgICAgICAgdXJs
ID0gbXNxbF91cmwgKyAiPyVzIiAlIHBhcmFtcworICAgICAgICByZXNwb25zZSA9IHNlbGYudGVz
dGVyLmdldCh1cmwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvbGxvd19y
ZWRpcmVjdHM9VHJ1ZSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh
bHMocmVzcG9uc2Uuc3RhdHVzX2NvZGUsIDIwMCkKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBh
cyBlOgorICAgICAgICAgICAgc2VsZi5maW5hbF90ZXN0X3N0YXR1cyA9IEZhbHNlCisgICAgICAg
ICAgICBwcmludChzY2VuYXJpb1snbmFtZSddICsgIi4uLiBGQUlMIikKKyAgICAgICAgICAgIHRy
YWNlYmFjay5wcmludF9leGMoKQorCisgICAgICAgIHJlc3AgPSBqc29uLmxvYWRzKHJlc3BvbnNl
LmRhdGEpCisgICAgICAgIHJlc3Bfc3FsID0gcmVzcFsnZGF0YSddCisKKyAgICAgICAgIyBSZW1v
dmUgZmlyc3QgYW5kIGxhc3QgZG91YmxlIHF1b3RlcworICAgICAgICBpZiByZXNwX3NxbC5zdGFy
dHN3aXRoKCciJykgYW5kIHJlc3Bfc3FsLmVuZHN3aXRoKCciJyk6CisgICAgICAgICAgICByZXNw
X3NxbCA9IHJlc3Bfc3FsWzE6LTFdCisgICAgICAgICAgICByZXNwX3NxbCA9IHJlc3Bfc3FsLnJz
dHJpcCgpCisKKyAgICAgICAgIyBDaGVjayBpZiBleHBlY3RlZCBzcWwgaXMgZ2l2ZW4gaW4gSlNP
TiBmaWxlIG9yIHBhdGggb2YgdGhlIG91dHB1dAorICAgICAgICAjIGZpbGUgaXMgZ2l2ZW4KKyAg
ICAgICAgaWYgJ2V4cGVjdGVkX21zcWxfZmlsZScgaW4gc2NlbmFyaW86CisgICAgICAgICAgICBv
dXRwdXRfZmlsZSA9IG9zLnBhdGguam9pbihzZWxmLnRlc3RfZm9sZGVyLAorICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2NlbmFyaW9bJ2V4cGVjdGVkX21zcWxfZmlsZSdd
KQorCisgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvdXRwdXRfZmlsZSk6CisgICAgICAg
ICAgICAgICAgZnAgPSBvcGVuKG91dHB1dF9maWxlLCAiciIpCisgICAgICAgICAgICAgICAgIyBV
c2VkIHJzdHJpcCB0byByZW1vdmUgdHJhaWxpbmcgXG4KKyAgICAgICAgICAgICAgICBzcWwgPSBm
cC5yZWFkKCkucnN0cmlwKCkKKyAgICAgICAgICAgICAgICAjIFJlcGxhY2UgcGxhY2UgaG9sZGVy
IDxvd25lcj4gd2l0aCB0aGUgY3VycmVudCB1c2VybmFtZQorICAgICAgICAgICAgICAgICMgdXNl
ZCB0byBjb25uZWN0IHRvIHRoZSBkYXRhYmFzZQorICAgICAgICAgICAgICAgIGlmICd1c2VybmFt
ZScgaW4gc2VsZi5zZXJ2ZXI6CisgICAgICAgICAgICAgICAgICAgIHNxbCA9IHNxbC5yZXBsYWNl
KHNlbGYuSlNPTl9QTEFDRUhPTERFUlNbJ293bmVyJ10sCisgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIHNlbGYuc2VydmVyWyd1c2VybmFtZSddKQorICAgICAgICAgICAgICAg
IHRyeToKKyAgICAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3FsLCByZXNwX3Nx
bCkKKyAgICAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAgICAg
ICAgICAgIHNlbGYuZmluYWxfdGVzdF9zdGF0dXMgPSBGYWxzZQorICAgICAgICAgICAgICAgICAg
ICB0cmFjZWJhY2sucHJpbnRfZXhjKCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNl
CisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAg
ICAgICAgc2VsZi5hc3NlcnRGYWxzZSgiRXhwZWN0ZWQgU1FMIEZpbGUgbm90IGZvdW5kIikKKyAg
ICAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CisgICAgICAgICAgICAgICAgICAg
IHNlbGYuZmluYWxfdGVzdF9zdGF0dXMgPSBGYWxzZQorICAgICAgICAgICAgICAgICAgICB0cmFj
ZWJhY2sucHJpbnRfZXhjKCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisgICAg
ICAgIHJldHVybiBUcnVlCisKICAgICBkZWYgY2hlY2tfcmVfc3FsKHNlbGYsIHNjZW5hcmlvLCBv
YmplY3RfaWQpOgogICAgICAgICAiIiIKICAgICAgICAgVGhpcyBmdW5jdGlvbiBpcyB1c2VkIHRv
IGdldCB0aGUgcmV2ZXJzZSBlbmdpbmVlcmluZyBTUUwuCkBAIC0zMDIsMTEgKzM4NiwxNCBAQCBj
bGFzcyBSZXZlcnNlRW5naW5lZXJlZFNRTFRlc3RDYXNlcyhCYXNlVGVzdEdlbmVyYXRvcik6CiAg
ICAgICAgIDpwYXJhbSBvYmplY3RfaWQ6CiAgICAgICAgIDpyZXR1cm46CiAgICAgICAgICIiIgor
CiAgICAgICAgIHNxbF91cmwgPSBzZWxmLmdldF91cmwoc2NlbmFyaW9bJ3NxbF9lbmRwb2ludCdd
LCBvYmplY3RfaWQpCiAgICAgICAgIHJlc3BvbnNlID0gc2VsZi50ZXN0ZXIuZ2V0KHNxbF91cmwp
CisKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMocmVzcG9uc2Uu
c3RhdHVzX2NvZGUsIDIwMCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorCiAgICAg
ICAgICAgICBzZWxmLmZpbmFsX3Rlc3Rfc3RhdHVzID0gRmFsc2UKICAgICAgICAgICAgIHRyYWNl
YmFjay5wcmludF9leGMoKQogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCg==
--0000000000004be41c058d78c8b7--