Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iVajE-000855-EU for pgadmin-hackers@arkaria.postgresql.org; Fri, 15 Nov 2019 12:29:33 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1iVajC-0007TJ-2V for pgadmin-hackers@arkaria.postgresql.org; Fri, 15 Nov 2019 12:29:30 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iVajB-0007T1-KH for pgadmin-hackers@lists.postgresql.org; Fri, 15 Nov 2019 12:29:29 +0000 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1iVaj7-0000Ov-JE for pgadmin-hackers@postgresql.org; Fri, 15 Nov 2019 12:29:28 +0000 Received: by mail-lf1-x134.google.com with SMTP id v8so7853564lfa.12 for ; Fri, 15 Nov 2019 04:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zPKdvFa2/f57huxDvYIz3yNDriSbEHDlrNkCMDzxuwU=; b=hCc4Bmm0VshDF0QFmXRj0yz+Hp0dI8CP5tW9YH9PFC+Eb6O1bhWdnoujFiTT1Kgnz4 drlGoFjZ1vtX9N+YbDPtdwzQmQvOnBWPrFd0YXKGS0xtQejBG5fKmZQVUr5/1vZR7Kd0 Zmfx/TJ8S38jtQqwDOi9yo6KWEH6/K9rhUr3OoKYSHNMeSyBwK+50zuTYGJVylxRsbP4 ZJghTlspGIlN4x1M7AMP9L2ONBfG7P1U075iCuO3cq26SrUGhlS1wdAucyGn+OfLnD3+ 7QfuPGlyevKEh6RuW9RgoopSRZ18sDqTMG0LHT/BTkUQyI9Xx85nxXQPqGcVzMgiQjUJ 6xXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=zPKdvFa2/f57huxDvYIz3yNDriSbEHDlrNkCMDzxuwU=; b=N2hgFo/+A/itaUA6xtcQvhfxaKu7ypM8or1lRZThaRTGsdV4u+jTWBfwFLvzzkKYB3 gbHoNnoyJyUfr9t+8A2sYIQNnT72Z5ekUY4Pz7QJc2MUVruuDM7eEGhdbIi6OlcGNhKJ hQrNC860F4CvzJJkaDRcVMQnnoSO00eTjgkafATtjYknMw8Sdq2ELECzKk3EA/63Oltu FE6OeQQrP3s0Erg7h20SuOE+t+yFFGyWw+o+Foi2rdc+F0FqAIHZxU+ht7BzDIP75C+V 2lDL8UiHGQaAvHWjb2+wkCT6BSo1nqYJoBFxQE1vMgpyQv/bZa6LDm+Bm1dMcHzJbGRW p8xw== X-Gm-Message-State: APjAAAWxASQnS7ZwRCDTN4v1bNd2H8SpifJGHtvK167vUwwt4vYCp7hL CyGKaa9pXQZiioCNDmyj6fn9xwYvATqRd9BocREI1N4n/0KmDDH92ujVjnwgEGweJYmUfd+NF6h Aw2XWbuoSDP2mHqACuc0O5GLo1NDTPLhSMRfPQqSCGiSC2fB17w8QGqVmdtUz8/cviKTwCNl34I 52fLKJwMHjnejARYsimtD3xqJgDM0ZZiue8KtUMhFMC/2aCojLLbA= X-Google-Smtp-Source: APXvYqzNANh+hGC0wVH3TW88ESz4GyqnyeTAGoZsnIbeixXUjAXiAZxXfmxys9AKT+cB//Y1mKe6GIl802ozUvOsZS4= X-Received: by 2002:ac2:4474:: with SMTP id y20mr10730069lfl.95.1573820964217; Fri, 15 Nov 2019 04:29:24 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Shubham Agarwal Date: Fri, 15 Nov 2019 17:59:12 +0530 Message-ID: Subject: Re: Fixes for pgAdmin feature tests To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000836523059761bf24" X-CLOUD-SEC-AV-Info: edb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000836523059761bf24 Content-Type: multipart/alternative; boundary="00000000000083651f059761bf22" --00000000000083651f059761bf22 Content-Type: text/plain; charset="UTF-8" Hi Team, PFA feature test fixture patch containing the following fixes: 1. Process watcher loading logs fix 2. Auto commit/rollback issue in query_tool_tests 3. Fixed the scrolling issue while verifying values in a table. 4. Modified some functions in pgadmin_page.py On Wed, Nov 13, 2019 at 11:19 AM Akshay Joshi wrote: > Thanks, patch applied. > > On Tue, Nov 12, 2019 at 6:27 PM Shubham Agarwal < > shubham.agarwal@enterprisedb.com> wrote: > >> Hi Team, >> PFA patch containing some more fixes for random feature test failures. >> >> Thanks and regards, >> Shubham Agarwal >> >> On Mon, Nov 11, 2019 at 10:55 AM Akshay Joshi < >> akshay.joshi@enterprisedb.com> wrote: >> >>> Thanks, patch applied with a minor change. Menu for 'Delete Drop' server >>> has been changed to 'Remove Server' which causes all the test cases failing >>> on my machine. >>> >>> On Mon, Nov 11, 2019 at 10:18 AM Shubham Agarwal < >>> shubham.agarwal@enterprisedb.com> wrote: >>> >>>> Hi Team, >>>> >>>> Attached is the patch containing fixes for the failed feature test >>>> cases. >>>> This patch contains- >>>> 1. Newly created function for traversing the browser tree. >>>> 2. Some synchronization issue fixes. >>>> 3. Modified locators. >>>> 4. Test cases fix for the recent commits. >>>> >>>> -- >>>> Thanks & Regards, >>>> Shubham Agarwal >>>> EnterpriseDB Corporation >>>> >>>> The Postgres Database Company >>>> >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> >>> *Sr. Software Architect* >>> *EnterpriseDB Software India Private Limited* >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Thanks & Regards, >> Shubham Agarwal >> EnterpriseDB Corporation >> >> The Postgres Database Company >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > > *Sr. Software Architect* > *EnterpriseDB Software India Private Limited* > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Shubham Agarwal EnterpriseDB Corporation The Postgres Database Company --00000000000083651f059761bf22 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Team,

PFA feature test fixture patch conta= ining the following fixes:
1. Process watcher loading logs fix
2. Auto commit/rollback issue in query_tool_tests
3. Fixe= d the scrolling issue while verifying values in a table.
4. Modif= ied some functions in pgadmin_page.py

On Wed, Nov 13, 2019 at 11= :19 AM Akshay Joshi <ak= shay.joshi@enterprisedb.com> wrote:
Thanks, patch applied.
On Tue, N= ov 12, 2019 at 6:27 PM Shubham Agarwal <shubham.agarwal@enterprisedb.com&= gt; wrote:
Hi Team,
PFA patch containing some more fixes for rando= m feature test failures.

Thanks and regards,
=
Shubham Agarwal

On Mon, Nov 11, 2019 at 10:55 AM Akshay Joshi <= ;akshay.= joshi@enterprisedb.com> wrote:
Thanks, patch applied with a minor c= hange. Menu for 'Delete Drop' server has been changed to 'Remov= e Server' which causes all the test cases failing on my machine.
<= br>
On Mon,= Nov 11, 2019 at 10:18 AM Shubham Agarwal <shubham.agarwal@enterprisedb.com> wrote:
Hi Team,

Attached is the patch containing fixes= for the failed feature test cases.
This patch contains-
1. Newly created function for traversing the browser tree.
2. S= ome synchronization issue fixes.
3. Modified locators.
= 4. Test cases fix for the recent commits.

--
<= div dir=3D"ltr">
Thanks & Regards,
Shubham Agarwal
EnterpriseDB Corporation

The Postgres Database Company
=


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks & Regards,
Shubham Agarwal
EnterpriseDB Corporation

=
The Postgres Database Company


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks & Regards,
Shubham = Agarwal
EnterpriseDB Corporation

The Postgres Database Company
<= /div>
--00000000000083651f059761bf22-- --000000000000836523059761bf24 Content-Type: application/octet-stream; name="feature_test_fix_v3.patch" Content-Disposition: attachment; filename="feature_test_fix_v3.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k304cgnp0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvZmlsZV9tYW5hZ2VyX3Rlc3Qu cHkgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL2ZpbGVfbWFuYWdlcl90ZXN0LnB5CmluZGV4 IGM3NmYyMDM4Ni4uNmU0ZjUyZTFkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rl c3RzL2ZpbGVfbWFuYWdlcl90ZXN0LnB5CisrKyBiL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMv ZmlsZV9tYW5hZ2VyX3Rlc3QucHkKQEAgLTE1LDYgKzE1LDcgQEAgaW1wb3J0IHRpbWUKIGZyb20g c2VsZW5pdW0ud2ViZHJpdmVyLmNvbW1vbi5rZXlzIGltcG9ydCBLZXlzCiBmcm9tIHNlbGVuaXVt LndlYmRyaXZlci5zdXBwb3J0LnVpIGltcG9ydCBXZWJEcml2ZXJXYWl0CiBmcm9tIHNlbGVuaXVt LndlYmRyaXZlci5jb21tb24uYnkgaW1wb3J0IEJ5Citmcm9tIHNlbGVuaXVtLndlYmRyaXZlci5z dXBwb3J0IGltcG9ydCBleHBlY3RlZF9jb25kaXRpb25zIGFzIEVDCiBmcm9tIHNlbGVuaXVtLmNv bW1vbi5leGNlcHRpb25zIGltcG9ydCBTdGFsZUVsZW1lbnRSZWZlcmVuY2VFeGNlcHRpb24sIFwK ICAgICBUaW1lb3V0RXhjZXB0aW9uCiBmcm9tIHJlZ3Jlc3Npb24uZmVhdHVyZV91dGlscy5iYXNl X2ZlYXR1cmVfdGVzdCBpbXBvcnQgQmFzZUZlYXR1cmVUZXN0CkBAIC04Myw3ICs4NCw3IEBAIGNs YXNzIENoZWNrRmlsZU1hbmFnZXJGZWF0dXJlVGVzdChCYXNlRmVhdHVyZVRlc3QpOgogICAgICAg ICBzZWxmLnBhZ2UuZmluZF9ieV9jc3Nfc2VsZWN0b3IoJy5jaGFuZ2VfZmlsZV90eXBlcycpCiAg ICAgICAgIHNlbGYucGFnZS5maWxsX2lucHV0X2J5X2Nzc19zZWxlY3RvcigKICAgICAgICAgICAg IFF1ZXJ5VG9vbExvY2F0b3JzLmlucHV0X2ZpbGVfcGF0aF9jc3MsCi0gICAgICAgICAgICAiL3Rt cC8iLCBrZXlfYWZ0ZXJfaW5wdXQ9S2V5cy5SRVRVUk4pCisgICAgICAgICAgICAiL3RtcCIsIGtl eV9hZnRlcl9pbnB1dD1LZXlzLlJFVFVSTikKIAogICAgICAgICBpZiBzZWxmLnBhZ2UuZHJpdmVy LmNhcGFiaWxpdGllc1snYnJvd3Nlck5hbWUnXSA9PSAnZmlyZWZveCc6CiAgICAgICAgICAgICB0 YWJsZSA9IHNlbGYucGFnZS53YWl0X2Zvcl9lbGVtZW50X3RvX3JlbG9hZCgKQEAgLTkxLDYgKzky LDEyIEBAIGNsYXNzIENoZWNrRmlsZU1hbmFnZXJGZWF0dXJlVGVzdChCYXNlRmVhdHVyZVRlc3Qp OgogICAgICAgICAgICAgICAgICAgICBRdWVyeVRvb2xMb2NhdG9ycy5zZWxlY3RfZmlsZV9jb250 ZW50X2NzcykKICAgICAgICAgICAgICkKICAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHNlbGYu d2FpdC51bnRpbChFQy52aXNpYmlsaXR5X29mX2VsZW1lbnRfbG9jYXRlZCgKKyAgICAgICAgICAg ICAgICAoQnkuQ1NTX1NFTEVDVE9SLCBRdWVyeVRvb2xMb2NhdG9ycy5zZWxlY3RfZmlsZV9jb250 ZW50X2NzcykpKQorICAgICAgICAgICAgc2VsZi53YWl0LnVudGlsKGxhbWJkYSBlbGVtZW50Ogor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYucGFnZS5kcml2ZXIuZmluZF9lbGVtZW50 X2J5X2Nzc19zZWxlY3RvcigKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1tuYW1l PWhvbWVdJykuaXNfZW5hYmxlZCgpKQorCiAgICAgICAgICAgICB0YWJsZSA9IHNlbGYucGFnZS5k cml2ZXIuZmluZF9lbGVtZW50X2J5X2Nzc19zZWxlY3RvcigKICAgICAgICAgICAgICAgICBRdWVy eVRvb2xMb2NhdG9ycy5zZWxlY3RfZmlsZV9jb250ZW50X2NzcykKICAgICAgICAgcmV0cnlfY291 bnQgPSAwCkBAIC0xMTMsNyArMTIwLDggQEAgY2xhc3MgQ2hlY2tGaWxlTWFuYWdlckZlYXR1cmVU ZXN0KEJhc2VGZWF0dXJlVGVzdCk6CiAgICAgICAgICMgRm9yIFhTUyB3ZSBuZWVkIHRvIHNlYXJj aCBhZ2FpbnN0IGVsZW1lbnQncyBodG1sIGNvZGUKICAgICAgICAgYXNzZXJ0IHNvdXJjZV9jb2Rl LmZpbmQoCiAgICAgICAgICAgICBzdHJpbmdfdG9fZmluZAotICAgICAgICApICE9IC0xLCAiezB9 IG1pZ2h0IGJlIHZ1bG5lcmFibGUgdG8gWFNTICIuZm9ybWF0KHNvdXJjZSkKKyAgICAgICAgKSAh PSAtMSwgInswfSBtaWdodCBiZSB2dWxuZXJhYmxlIHRvIFhTUywgc291cmNlIGNvZGUgaXM6IHsx fSIuZm9ybWF0KAorICAgICAgICAgICAgc291cmNlLCBzb3VyY2VfY29kZSkKIAogICAgIGRlZiBf Y2hlY2tfZmlsZV9zb3J0aW5nKHNlbGYpOgogICAgICAgICBsb2FkX2ZpbGUgPSBzZWxmLnBhZ2Uu ZmluZF9ieV9jc3Nfc2VsZWN0b3IoCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rl c3RzL3BnX3V0aWxpdGllc19iYWNrdXBfcmVzdG9yZV90ZXN0LnB5IGIvd2ViL3BnYWRtaW4vZmVh dHVyZV90ZXN0cy9wZ191dGlsaXRpZXNfYmFja3VwX3Jlc3RvcmVfdGVzdC5weQppbmRleCBjYzJl ODliNTkuLjVhZTg2NzM0YyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vZmVhdHVyZV90ZXN0cy9w Z191dGlsaXRpZXNfYmFja3VwX3Jlc3RvcmVfdGVzdC5weQorKysgYi93ZWIvcGdhZG1pbi9mZWF0 dXJlX3Rlc3RzL3BnX3V0aWxpdGllc19iYWNrdXBfcmVzdG9yZV90ZXN0LnB5CkBAIC0xMDgsMTYg KzEwOCwxNyBAQCBjbGFzcyBQR1V0aWxpdGllc0JhY2t1cEZlYXR1cmVUZXN0KEJhc2VGZWF0dXJl VGVzdCk6CiAKICAgICAgICAgc3RhdHVzID0gdGVzdF91dGlscy5nZXRfd2F0Y2hlcl9kaWFsb2d1 ZV9zdGF0dXMoc2VsZikKIAotICAgICAgICBpZiBzdGF0dXMgIT0gIlN1Y2Nlc3NmdWxseSBjb21w bGV0ZWQuIjoKLSAgICAgICAgICAgIHRlc3RfZ3VpX2hlbHBlci5jbG9zZV9iZ3Byb2Nlc3NfcG9w dXAoc2VsZikKLQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzdGF0dXMsICJTdWNjZXNzZnVs bHkgY29tcGxldGVkLiIpCi0KICAgICAgICAgc2VsZi5wYWdlLnJldHJ5X2NsaWNrKAogICAgICAg ICAgICAgKEJ5LkNTU19TRUxFQ1RPUiwKICAgICAgICAgICAgICBOYXZNZW51TG9jYXRvcnMuc3Rh dHVzX2FsZXJ0aWZpZXJfbW9yZV9idG5fY3NzKSwKICAgICAgICAgICAgIChCeS5YUEFUSCwKICAg ICAgICAgICAgICBOYXZNZW51TG9jYXRvcnMucHJvY2Vzc193YXRjaGVyX2FsZXJ0ZmllcikpCisg ICAgICAgIHNlbGYucGFnZS53YWl0X2Zvcl9lbGVtZW50X3RvX2Rpc2FwcGVhcigKKyAgICAgICAg ICAgIGxhbWJkYSBkcml2ZXI6IGRyaXZlci5maW5kX2VsZW1lbnRfYnlfY3NzX3NlbGVjdG9yKCIu bG9hZGluZy1sb2dzIikKKyAgICAgICAgKQorCisgICAgICAgIGlmIHN0YXR1cyAhPSAiU3VjY2Vz c2Z1bGx5IGNvbXBsZXRlZC4iOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3RhdHVz LCAiU3VjY2Vzc2Z1bGx5IGNvbXBsZXRlZC4iKQogCiAgICAgICAgIGJhY2t1cF9maWxlID0gTm9u ZQogICAgICAgICAjIENoZWNrIGZvciBYU1MgaW4gQmFja3VwIGRldGFpbHMKQEAgLTE3NywxNiAr MTc4LDE3IEBAIGNsYXNzIFBHVXRpbGl0aWVzQmFja3VwRmVhdHVyZVRlc3QoQmFzZUZlYXR1cmVU ZXN0KToKIAogICAgICAgICBzdGF0dXMgPSB0ZXN0X3V0aWxzLmdldF93YXRjaGVyX2RpYWxvZ3Vl X3N0YXR1cyhzZWxmKQogCi0gICAgICAgIGlmIHN0YXR1cyAhPSAiU3VjY2Vzc2Z1bGx5IGNvbXBs ZXRlZC4iOgotICAgICAgICAgICAgdGVzdF9ndWlfaGVscGVyLmNsb3NlX2JncHJvY2Vzc19wb3B1 cChzZWxmKQotCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHN0YXR1cywgIlN1Y2Nlc3NmdWxs eSBjb21wbGV0ZWQuIikKLQogICAgICAgICBzZWxmLnBhZ2UucmV0cnlfY2xpY2soCiAgICAgICAg ICAgICAoQnkuQ1NTX1NFTEVDVE9SLAogICAgICAgICAgICAgIE5hdk1lbnVMb2NhdG9ycy5zdGF0 dXNfYWxlcnRpZmllcl9tb3JlX2J0bl9jc3MpLAogICAgICAgICAgICAgKEJ5LlhQQVRILAogICAg ICAgICAgICAgIE5hdk1lbnVMb2NhdG9ycy5wcm9jZXNzX3dhdGNoZXJfYWxlcnRmaWVyKSkKKyAg ICAgICAgc2VsZi5wYWdlLndhaXRfZm9yX2VsZW1lbnRfdG9fZGlzYXBwZWFyKAorICAgICAgICAg ICAgbGFtYmRhIGRyaXZlcjogZHJpdmVyLmZpbmRfZWxlbWVudF9ieV9jc3Nfc2VsZWN0b3IoIi5s b2FkaW5nLWxvZ3MiKQorICAgICAgICApCisKKyAgICAgICAgaWYgc3RhdHVzICE9ICJTdWNjZXNz ZnVsbHkgY29tcGxldGVkLiI6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzdGF0dXMs ICJTdWNjZXNzZnVsbHkgY29tcGxldGVkLiIpCiAKICAgICAgICAgIyBDaGVjayBmb3IgWFNTIGlu IFJlc3RvcmUgZGV0YWlscwogICAgICAgICBpZiBzZWxmLmlzX3hzc19jaGVjazoKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvcGdfdXRpbGl0aWVzX21haW50ZW5hbmNlX3Rl c3QucHkgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3BnX3V0aWxpdGllc19tYWludGVuYW5j ZV90ZXN0LnB5CmluZGV4IDcyODMyM2I0OS4uMGU2NTg2ZDBlIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi9mZWF0dXJlX3Rlc3RzL3BnX3V0aWxpdGllc19tYWludGVuYW5jZV90ZXN0LnB5CisrKyBi L3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvcGdfdXRpbGl0aWVzX21haW50ZW5hbmNlX3Rlc3Qu cHkKQEAgLTI2LDE5ICsyNiwxOSBAQCBjbGFzcyBQR1V0aWxpdGllc01haW50ZW5hbmNlRmVhdHVy ZVRlc3QoQmFzZUZlYXR1cmVUZXN0KToKIAogICAgIHNjZW5hcmlvcyA9IFsKICAgICAgICAgKCJU ZXN0IGZvciBQRyBtYWludGVuYW5jZTogZGF0YWJhc2UiLCBkaWN0KAotICAgICAgICAgICAgZGF0 YWJhc2VfbmFtZT0ncGdfbWFpbnRlbmFuY2UnLAotICAgICAgICAgICAgdGFibGVfbmFtZT0ncGdf bWFpbnRlbmFuY2VfdGFibGUnLAorICAgICAgICAgICAgZGF0YWJhc2VfbmFtZT0ncGdfbWFpbnRl bmFuY2VfJywKKyAgICAgICAgICAgIHRhYmxlX25hbWU9J3RhYmxlXycsCiAgICAgICAgICAgICB0 ZXN0X2xldmVsPSdkYXRhYmFzZScsCiAgICAgICAgICAgICBpc194c3NfY2hlY2s9RmFsc2UsCiAg ICAgICAgICkpLAogICAgICAgICAoIlRlc3QgZm9yIFBHIG1haW50ZW5hbmNlOiB0YWJsZSIsIGRp Y3QoCi0gICAgICAgICAgICBkYXRhYmFzZV9uYW1lPSdwZ19tYWludGVuYW5jZScsCi0gICAgICAg ICAgICB0YWJsZV9uYW1lPSdwZ19tYWludGVuYW5jZV90YWJsZScsCisgICAgICAgICAgICBkYXRh YmFzZV9uYW1lPSdwZ19tYWludGVuYW5jZV8nLAorICAgICAgICAgICAgdGFibGVfbmFtZT0ndGFi bGVfJywKICAgICAgICAgICAgIHRlc3RfbGV2ZWw9J3RhYmxlJywKICAgICAgICAgICAgIGlzX3hz c19jaGVjaz1GYWxzZSwKICAgICAgICAgKSksCiAgICAgICAgICgiVGVzdCBmb3IgWFNTIGluIG1h aW50ZW5hbmNlIGRpYWxvZyIsIGRpY3QoCi0gICAgICAgICAgICBkYXRhYmFzZV9uYW1lPSdwZ19t YWludGVuYW5jZScsCisgICAgICAgICAgICBkYXRhYmFzZV9uYW1lPSdwZ19tYWludGVuYW5jZV8n LAogICAgICAgICAgICAgdGFibGVfbmFtZT0nPGgxPnRlc3RfbWU8L2gxPicsCiAgICAgICAgICAg ICB0ZXN0X2xldmVsPSd0YWJsZScsCiAgICAgICAgICAgICBpc194c3NfY2hlY2s9VHJ1ZSwKQEAg LTY3LDcgKzY3LDkgQEAgY2xhc3MgUEdVdGlsaXRpZXNNYWludGVuYW5jZUZlYXR1cmVUZXN0KEJh c2VGZWF0dXJlVGVzdCk6CiAgICAgICAgICAgICBzZWxmLnNlcnZlclsnc3NsbW9kZSddCiAgICAg ICAgICkKIAotICAgICAgICBzZWxmLnRhYmxlX25hbWUgPSBzZWxmLnRhYmxlX25hbWUgKyBzdHIo cmFuZG9tLnJhbmRpbnQoMTAwMCwgMzAwMCkpCisgICAgICAgIHNlbGYudGFibGVfbmFtZSA9IHNl bGYudGFibGVfbmFtZSArIHN0cihyYW5kb20ucmFuZGludCgxMDAsIDEwMDApKQorICAgICAgICBz ZWxmLmRhdGFiYXNlX25hbWUgPSBcCisgICAgICAgICAgICBzZWxmLmRhdGFiYXNlX25hbWUgKyBz dHIocmFuZG9tLnJhbmRpbnQoMTAwLCAxMDAwKSkKICAgICAgICAgdGVzdF91dGlscy5kcm9wX2Rh dGFiYXNlKGNvbm5lY3Rpb24sIHNlbGYuZGF0YWJhc2VfbmFtZSkKICAgICAgICAgdGVzdF91dGls cy5jcmVhdGVfZGF0YWJhc2Uoc2VsZi5zZXJ2ZXIsIHNlbGYuZGF0YWJhc2VfbmFtZSkKICAgICAg ICAgdGVzdF91dGlscy5jcmVhdGVfdGFibGUoc2VsZi5zZXJ2ZXIsIHNlbGYuZGF0YWJhc2VfbmFt ZSwKQEAgLTg3LDcgKzg5LDYgQEAgY2xhc3MgUEdVdGlsaXRpZXNNYWludGVuYW5jZUZlYXR1cmVU ZXN0KEJhc2VGZWF0dXJlVGVzdCk6CiAgICAgICAgIHNlbGYud2FpdC51bnRpbChFQy52aXNpYmls aXR5X29mX2VsZW1lbnRfbG9jYXRlZCgKICAgICAgICAgICAgIChCeS5DU1NfU0VMRUNUT1IsCiAg ICAgICAgICAgICAgTmF2TWVudUxvY2F0b3JzLmJjZ19wcm9jZXNzX3N0YXR1c19hbGVydGlmaWVy X2NzcykpKQotCiAgICAgICAgIHNlbGYudmVyaWZ5X2NvbW1hbmQoKQogCiAgICAgZGVmIF9vcGVu X21haW50ZW5hbmNlX2RpYWxvZ3VlKHNlbGYpOgpAQCAtMTAxLDkgKzEwMiwxOCBAQCBjbGFzcyBQ R1V0aWxpdGllc01haW50ZW5hbmNlRmVhdHVyZVRlc3QoQmFzZUZlYXR1cmVUZXN0KToKICAgICAg ICAgICAgIHNlbGYucGFnZS50b2dnbGVfb3Blbl90YWJsZXNfbm9kZShzZWxmLnNlcnZlclsnbmFt ZSddLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYu c2VydmVyWydkYl9wYXNzd29yZCddLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuZGF0YWJhc2VfbmFtZSwgJ3B1YmxpYycpCi0gICAgICAgICAgICBz ZWxmLnBhZ2UuY2xpY2tfYV90cmVlX25vZGUoCi0gICAgICAgICAgICAgICAgc2VsZi50YWJsZV9u YW1lLAotICAgICAgICAgICAgICAgIFRyZWVBcmVhTG9jYXRvcnMuc3ViX25vZGVzX29mX3RhYmxl c19ub2RlKQorICAgICAgICAgICAgcmV0cnkgPSA1CisgICAgICAgICAgICBzdGF0dXMgPSBGYWxz ZQorICAgICAgICAgICAgd2hpbGUgcmV0cnkgPiAwOgorICAgICAgICAgICAgICAgIHN0YXR1cyA9 IHNlbGYucGFnZS5jbGlja19hX3RyZWVfbm9kZSgKKyAgICAgICAgICAgICAgICAgICAgc2VsZi50 YWJsZV9uYW1lLAorICAgICAgICAgICAgICAgICAgICBUcmVlQXJlYUxvY2F0b3JzLnN1Yl9ub2Rl c19vZl90YWJsZXNfbm9kZSkKKyAgICAgICAgICAgICAgICBpZiBzdGF0dXM6CisgICAgICAgICAg ICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAg ICAgcmV0cnkgLT0gMQorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHN0YXR1cywgIlRhYmxl IG5hbWUge30gaXMgbm90IHNlbGVjdGVkIi5mb3JtYXQoCisgICAgICAgICAgICAgICAgc2VsZi50 YWJsZV9uYW1lKSkKIAogICAgICAgICBzZWxmLnBhZ2UucmV0cnlfY2xpY2soCiAgICAgICAgICAg ICAoQnkuTElOS19URVhULApAQCAtMTE4LDE3ICsxMjgsMTcgQEAgY2xhc3MgUEdVdGlsaXRpZXNN YWludGVuYW5jZUZlYXR1cmVUZXN0KEJhc2VGZWF0dXJlVGVzdCk6CiAKICAgICBkZWYgdmVyaWZ5 X2NvbW1hbmQoc2VsZik6CiAgICAgICAgIHN0YXR1cyA9IHRlc3RfdXRpbHMuZ2V0X3dhdGNoZXJf ZGlhbG9ndWVfc3RhdHVzKHNlbGYpCi0gICAgICAgIGlmIHN0YXR1cyAhPSAiU3VjY2Vzc2Z1bGx5 IGNvbXBsZXRlZC4iOgotCi0gICAgICAgICAgICB0ZXN0X2d1aV9oZWxwZXIuY2xvc2VfYmdwcm9j ZXNzX3BvcHVwKHNlbGYpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc3RhdHVzLCAiU3Vj Y2Vzc2Z1bGx5IGNvbXBsZXRlZC4iKQotCiAgICAgICAgIHNlbGYucGFnZS5yZXRyeV9jbGljaygK ICAgICAgICAgICAgIChCeS5DU1NfU0VMRUNUT1IsCiAgICAgICAgICAgICAgTmF2TWVudUxvY2F0 b3JzLnN0YXR1c19hbGVydGlmaWVyX21vcmVfYnRuX2NzcyksCiAgICAgICAgICAgICAoQnkuWFBB VEgsCiAgICAgICAgICAgICAgTmF2TWVudUxvY2F0b3JzLnByb2Nlc3Nfd2F0Y2hlcl9hbGVydGZp ZXIpKQorICAgICAgICBzZWxmLnBhZ2Uud2FpdF9mb3JfZWxlbWVudF90b19kaXNhcHBlYXIoCisg ICAgICAgICAgICBsYW1iZGEgZHJpdmVyOiBkcml2ZXIuZmluZF9lbGVtZW50X2J5X2Nzc19zZWxl Y3RvcigiLmxvYWRpbmctbG9ncyIpCisgICAgICAgICkKKworICAgICAgICBpZiBzdGF0dXMgIT0g IlN1Y2Nlc3NmdWxseSBjb21wbGV0ZWQuIjoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KHN0YXR1cywgIlN1Y2Nlc3NmdWxseSBjb21wbGV0ZWQuIikKIAogICAgICAgICBjb21tYW5kID0g c2VsZi5wYWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAogICAgICAgICAgICAgTmF2TWVudUxvY2F0 b3JzLgpAQCAtMTU4LDkgKzE2OCw5IEBAIGNsYXNzIFBHVXRpbGl0aWVzTWFpbnRlbmFuY2VGZWF0 dXJlVGVzdChCYXNlRmVhdHVyZVRlc3QpOgogCiAgICAgZGVmIGFmdGVyKHNlbGYpOgogICAgICAg ICB0ZXN0X2d1aV9oZWxwZXIuY2xvc2VfYmdwcm9jZXNzX3BvcHVwKHNlbGYpCi0gICAgICAgIHNl bGYucGFnZS5yZW1vdmVfc2VydmVyKHNlbGYuc2VydmVyKQogICAgICAgICB0ZXN0X3V0aWxzLmRl bGV0ZV90YWJsZShzZWxmLnNlcnZlciwgc2VsZi5kYXRhYmFzZV9uYW1lLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZWxmLnRhYmxlX25hbWUpCisgICAgICAgIHNlbGYucGFnZS5y ZW1vdmVfc2VydmVyKHNlbGYuc2VydmVyKQogICAgICAgICBjb25uZWN0aW9uID0gdGVzdF91dGls cy5nZXRfZGJfY29ubmVjdGlvbigKICAgICAgICAgICAgIHNlbGYuc2VydmVyWydkYiddLAogICAg ICAgICAgICAgc2VsZi5zZXJ2ZXJbJ3VzZXJuYW1lJ10sCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi9mZWF0dXJlX3Rlc3RzL3F1ZXJ5X3Rvb2xfdGVzdHMucHkgYi93ZWIvcGdhZG1pbi9mZWF0dXJl X3Rlc3RzL3F1ZXJ5X3Rvb2xfdGVzdHMucHkKaW5kZXggM2JjYzVlOGU0Li5hMGYzNTAzMjAgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvcXVlcnlfdG9vbF90ZXN0cy5weQor KysgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3F1ZXJ5X3Rvb2xfdGVzdHMucHkKQEAgLTEz NSwxOCArMTM1LDEwIEBAIGNsYXNzIFF1ZXJ5VG9vbEZlYXR1cmVUZXN0KEJhc2VGZWF0dXJlVGVz dCk6CiAgICAgICAgIHF1ZXJ5X29wLmNsaWNrKCkKIAogICAgICAgICAjIGRpc2FibGUgYXV0byBy b2xsYmFjayBvbmx5IGlmIHRoZXkgYXJlIGVuYWJsZWQKLSAgICAgICAgYnRuID0gc2VsZi5wYWdl LmZpbmRfYnlfY3NzX3NlbGVjdG9yKAotICAgICAgICAgICAgUXVlcnlUb29sTG9jYXRvcnMuYnRu X2F1dG9fcm9sbGJhY2spCi0gICAgICAgIGNoZWNrID0gYnRuLmZpbmRfZWxlbWVudF9ieV90YWdf bmFtZSgnaScpCi0gICAgICAgIGlmICd2aXNpYmlsaXR5LWhpZGRlbicgbm90IGluIGNoZWNrLmdl dF9hdHRyaWJ1dGUoJ2NsYXNzJyk6Ci0gICAgICAgICAgICBidG4uY2xpY2soKQorICAgICAgICBz ZWxmLnVuY2hlY2tfZXhlY3V0ZV9vcHRpb24oJ2F1dG9fcm9sbGJhY2snKQogCiAgICAgICAgICMg ZW5hYmxlIGF1dG9jb21taXQgb25seSBpZiBpdCdzIGRpc2FibGVkCi0gICAgICAgIGJ0biA9IHNl bGYucGFnZS5maW5kX2J5X2Nzc19zZWxlY3RvcigKLSAgICAgICAgICAgIFF1ZXJ5VG9vbExvY2F0 b3JzLmJ0bl9hdXRvX2NvbW1pdCkKLSAgICAgICAgY2hlY2sgPSBidG4uZmluZF9lbGVtZW50X2J5 X3RhZ19uYW1lKCdpJykKLSAgICAgICAgaWYgJ3Zpc2liaWxpdHktaGlkZGVuJyBpbiBjaGVjay5n ZXRfYXR0cmlidXRlKCdjbGFzcycpOgotICAgICAgICAgICAgYnRuLmNsaWNrKCkKKyAgICAgICAg c2VsZi5jaGVja19leGVjdXRlX29wdGlvbignYXV0b19jb21taXQnKQogCiAgICAgICAgICMgY2xv c2UgbWVudQogICAgICAgICBxdWVyeV9vcC5jbGljaygpCkBAIC0xODEsOCArMTczLDcgQEAgU0VM RUNUIGdlbmVyYXRlX3NlcmllcygxLCB7fSkgYXMgaWQxLCAnZHVtbXknIGFzIGlkMiIiIi5mb3Jt YXQoCiAKICAgICAgICAgcHJpbnQoIk9uIGRlbWFuZCByZXN1bHQgc2V0IG9uIGdyaWQgc2VsZWN0 IGFsbC4uLiAiLAogICAgICAgICAgICAgICBmaWxlPXN5cy5zdGRlcnIsIGVuZD0iIikKLSAgICAg ICAgc2VsZi5wYWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAotICAgICAgICAgICAgUXVlcnlUb29s TG9jYXRvcnMuYnRuX2V4ZWN1dGVfcXVlcnlfY3NzKS5jbGljaygpCisgICAgICAgIHNlbGYucGFn ZS5jbGlja19leGVjdXRlX3F1ZXJ5X2J1dHRvbigpCiAKICAgICAgICAgIyB3YWl0IGZvciBoZWFk ZXIgb2YgdGhlIHRhYmxlIHRvIGJlIHZpc2libGUKICAgICAgICAgY2FudmFzID0gc2VsZi5wYWdl LmZpbmRfYnlfY3NzX3NlbGVjdG9yKApAQCAtMjEzLDggKzIwNCw3IEBAIFNFTEVDVCBnZW5lcmF0 ZV9zZXJpZXMoMSwge30pIGFzIGlkMSwgJ2R1bW15JyBhcyBpZDIiIiIuZm9ybWF0KAogCiAgICAg ICAgIHByaW50KCJPbiBkZW1hbmQgcmVzdWx0IHNldCBvbiBjb2x1bW4gc2VsZWN0IGFsbC4uLiAi LAogICAgICAgICAgICAgICBmaWxlPXN5cy5zdGRlcnIsIGVuZD0iIikKLSAgICAgICAgc2VsZi5w YWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAotICAgICAgICAgICAgUXVlcnlUb29sTG9jYXRvcnMu YnRuX2V4ZWN1dGVfcXVlcnlfY3NzKS5jbGljaygpCisgICAgICAgIHNlbGYucGFnZS5jbGlja19l eGVjdXRlX3F1ZXJ5X2J1dHRvbigpCiAKICAgICAgICAgc2VsZi5wYWdlLndhaXRfZm9yX3F1ZXJ5 X3Rvb2xfbG9hZGluZ19pbmRpY2F0b3JfdG9fZGlzYXBwZWFyKCkKIApAQCAtMzQ5LDE4ICszMzks MTYgQEAgQ1JFQVRFIFRBQkxFIHB1YmxpYy57fSgpOyIiIi5mb3JtYXQodGFibGVfbmFtZSkKIAog ICAgICAgICBzZWxmLnBhZ2UuZmlsbF9jb2RlbWlycm9yX2FyZWFfd2l0aChxdWVyeSkKIAotICAg ICAgICAjIG9wZW4gYXV0byBjb21taXQgb3B0aW9uIGFuZCBkaXNhYmxlIGl0CisgICAgICAgICMg ZGlzYWJsZSBhdXRvIGNvbW1pdCBvcHRpb24KICAgICAgICAgcXVlcnlfb3AgPSBzZWxmLnBhZ2Uu ZmluZF9ieV9jc3Nfc2VsZWN0b3IoCiAgICAgICAgICAgICBRdWVyeVRvb2xMb2NhdG9ycy5idG5f cXVlcnlfZHJvcGRvd24pCiAgICAgICAgIHF1ZXJ5X29wLmNsaWNrKCkKLSAgICAgICAgc2VsZi5w YWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAotICAgICAgICAgICAgUXVlcnlUb29sTG9jYXRvcnMu YnRuX2F1dG9fY29tbWl0KS5jbGljaygpCisgICAgICAgIHNlbGYudW5jaGVja19leGVjdXRlX29w dGlvbignYXV0b19jb21taXQnKQogICAgICAgICAjIGNsb3NlIG9wdGlvbgogICAgICAgICBxdWVy eV9vcC5jbGljaygpCiAKICAgICAgICAgIyBleGVjdXRlIHF1ZXJ5Ci0gICAgICAgIHNlbGYucGFn ZS5maW5kX2J5X2Nzc19zZWxlY3RvcigKLSAgICAgICAgICAgIFF1ZXJ5VG9vbExvY2F0b3JzLmJ0 bl9leGVjdXRlX3F1ZXJ5X2NzcykuY2xpY2soKQorICAgICAgICBzZWxmLnBhZ2UuY2xpY2tfZXhl Y3V0ZV9xdWVyeV9idXR0b24oKQogCiAgICAgICAgIHNlbGYucGFnZS53YWl0X2Zvcl9xdWVyeV90 b29sX2xvYWRpbmdfaW5kaWNhdG9yX3RvX2Rpc2FwcGVhcigpCiAgICAgICAgIHNlbGYucGFnZS5j bGlja190YWIoJ01lc3NhZ2VzJykKQEAgLTQyNCwxMyArNDEyLDEyIEBAIEVORDsiIiIKICAgICAg ICAgICAgIFF1ZXJ5VG9vbExvY2F0b3JzLmJ0bl9xdWVyeV9kcm9wZG93bikKICAgICAgICAgcXVl cnlfb3AuY2xpY2soKQogCi0gICAgICAgIHNlbGYucGFnZS5maW5kX2J5X2Nzc19zZWxlY3RvcigK LSAgICAgICAgICAgIFF1ZXJ5VG9vbExvY2F0b3JzLmJ0bl9hdXRvX2NvbW1pdCkuY2xpY2soKQor ICAgICAgICAjIEVuYWJsZSBhdXRvX2NvbW1pdCBpZiBpdCBpcyBkaXNhYmxlZAorICAgICAgICBz ZWxmLmNoZWNrX2V4ZWN1dGVfb3B0aW9uKCdhdXRvX2NvbW1pdCcpCiAKICAgICAgICAgcXVlcnlf b3AuY2xpY2soKQogCi0gICAgICAgIHNlbGYucGFnZS5maW5kX2J5X2Nzc19zZWxlY3RvcigKLSAg ICAgICAgICAgIFF1ZXJ5VG9vbExvY2F0b3JzLmJ0bl9leGVjdXRlX3F1ZXJ5X2NzcykuY2xpY2so KQorICAgICAgICBzZWxmLnBhZ2UuY2xpY2tfZXhlY3V0ZV9xdWVyeV9idXR0b24oKQogCiAgICAg ICAgIHNlbGYucGFnZS53YWl0X2Zvcl9xdWVyeV90b29sX2xvYWRpbmdfaW5kaWNhdG9yX3RvX2Rp c2FwcGVhcigpCiAKQEAgLTUwNCwxNCArNDkxLDEzIEBAIEVORDsiIiIKICAgICAgICAgICAgIFF1 ZXJ5VG9vbExvY2F0b3JzLmJ0bl9xdWVyeV9kcm9wZG93bikKICAgICAgICAgcXVlcnlfb3AuY2xp Y2soKQogCi0gICAgICAgICMgdW5jaGVja3QgYXV0byBjb21taXQgYW5kIGNoZWNrIGF1dG8tcm9s bGJhY2sKKyAgICAgICAgIyB1bmNoZWNrIGF1dG8gY29tbWl0IGFuZCBjaGVjayBhdXRvLXJvbGxi YWNrCiAgICAgICAgIHNlbGYudW5jaGVja19leGVjdXRlX29wdGlvbignYXV0b19jb21taXQnKQog ICAgICAgICBzZWxmLmNoZWNrX2V4ZWN1dGVfb3B0aW9uKCdhdXRvX3JvbGxiYWNrJykKIAogICAg ICAgICBxdWVyeV9vcC5jbGljaygpCiAKLSAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfY3NzX3Nl bGVjdG9yKAotICAgICAgICAgICAgUXVlcnlUb29sTG9jYXRvcnMuYnRuX2V4ZWN1dGVfcXVlcnlf Y3NzKS5jbGljaygpCisgICAgICAgIHNlbGYucGFnZS5jbGlja19leGVjdXRlX3F1ZXJ5X2J1dHRv bigpCiAKICAgICAgICAgc2VsZi5wYWdlLndhaXRfZm9yX3F1ZXJ5X3Rvb2xfbG9hZGluZ19pbmRp Y2F0b3JfdG9fZGlzYXBwZWFyKCkKICAgICAgICAgc2VsZi5wYWdlLmNsZWFyX3F1ZXJ5X3Rvb2wo KQpAQCAtNjA2LDExICs1OTIsMjAgQEAgU0VMRUNUIDEsIHBnX3NsZWVwKDMwMCkiIiIKICAgICAg ICAgc2VsZi51bmNoZWNrX2V4ZWN1dGVfb3B0aW9uKCdhdXRvX3JvbGxiYWNrJykKICAgICAgICAg IyBjbG9zZSBkcm9wIGRvd24KICAgICAgICAgcXVlcnlfb3AuY2xpY2soKQorICAgICAgICAjIEV4 ZWN1dGUgcXVlcnkKKyAgICAgICAgcmV0cnkgPSA1CisgICAgICAgIGV4ZWN1dGVfYnV0dG9uID0g c2VsZi5wYWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAorICAgICAgICAgICAgUXVlcnlUb29sTG9j YXRvcnMuYnRuX2V4ZWN1dGVfcXVlcnlfY3NzKQorICAgICAgICB3aGlsZSByZXRyeSA+IDA6Cisg ICAgICAgICAgICBleGVjdXRlX2J1dHRvbi5jbGljaygpCisgICAgICAgICAgICBpZiBzZWxmLnBh Z2Uud2FpdF9mb3JfcXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19hcHBlYXIoKToKKyAg ICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBy ZXRyeSAtPSAxCisgICAgICAgICMgUHJvdmlkaW5nIGEgc2Vjb25kIG9mIHNsZWVwIHNpbmNlIGNs aWNrcyBvbiB0aGUgZXhlY3V0ZSBhbmQgc3RvcAorICAgICAgICAjIHF1ZXJ5IGJ1dHRvbiBpcyB0 b28gcXVpY2sgdGhhdCB0aGUgcXVlcnkgaXMgbm90IGFibGUgcnVuIHByb3Blcmx5CisgICAgICAg IHRpbWUuc2xlZXAoMSkKIAotICAgICAgICBzZWxmLnBhZ2UuZmluZF9ieV9jc3Nfc2VsZWN0b3Io Ci0gICAgICAgICAgICBRdWVyeVRvb2xMb2NhdG9ycy5idG5fZXhlY3V0ZV9xdWVyeV9jc3MpLmNs aWNrKCkKLQotICAgICAgICBzZWxmLnBhZ2UuZmluZF9ieV94cGF0aCgiLy8qW0BpZD0nZmV0Y2hp bmdfZGF0YSddIikKICAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAogICAg ICAgICAgICAgUXVlcnlUb29sTG9jYXRvcnMuYnRuX2NhbmNlbF9xdWVyeSkuY2xpY2soKQogICAg ICAgICBzZWxmLnBhZ2Uud2FpdF9mb3JfcXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19k aXNhcHBlYXIoKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vZmVhdHVyZV90ZXN0cy92aWV3X2Rh dGFfZG1sX3F1ZXJpZXMucHkgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3ZpZXdfZGF0YV9k bWxfcXVlcmllcy5weQppbmRleCAwMmE0NDk5NzEuLjE0NTkxY2RhZSAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vZmVhdHVyZV90ZXN0cy92aWV3X2RhdGFfZG1sX3F1ZXJpZXMucHkKKysrIGIvd2Vi L3BnYWRtaW4vZmVhdHVyZV90ZXN0cy92aWV3X2RhdGFfZG1sX3F1ZXJpZXMucHkKQEAgLTMwOCw3 ICszMDgsMTEgQEAgQ1JFQVRFIFRBQkxFIHB1YmxpYy5ub25pbnRwa2V5CiAgICAgICAgIHNlbGYu X3ZlcmlmeV9yb3dfZGF0YShGYWxzZSwgdXBkYXRlZF9yb3dfZGF0YSkKIAogICAgIGRlZiBfYWRk X3VwZGF0ZV9zYXZlX3JvdyhzZWxmLCBkYXRhLCByb3c9MSk6Ci0gICAgICAgIGZvciBpZHggaW4g ZGF0YS5rZXlzKCk6CisgICAgICAgIGl0ZW1zID0gbGlzdChkYXRhLmtleXMoKSkKKyAgICAgICAg Zm9yIGl0ZW0gaW4gcmFuZ2UoMCwgbGVuKGl0ZW1zKSk6CisgICAgICAgICAgICBpdGVtc1tpdGVt XSA9IGludChpdGVtc1tpdGVtXSkKKyAgICAgICAgaXRlbXMuc29ydChyZXZlcnNlPUZhbHNlKQor ICAgICAgICBmb3IgaWR4IGluIGl0ZW1zOgogICAgICAgICAgICAgY2VsbF94cGF0aCA9IENoZWNr Rm9yVmlld0RhdGFUZXN0Ll9nZXRfY2VsbF94cGF0aCgKICAgICAgICAgICAgICAgICAncicgKyBz dHIoaWR4KSwgcm93CiAgICAgICAgICAgICApCkBAIC0zNDcsOSArMzUxLDIxIEBAIENSRUFURSBU QUJMRSBwdWJsaWMubm9uaW50cGtleQogCiAgICAgICAgIHJlc3VsdF9yb3cgPSBzZWxmLnBhZ2Uu ZmluZF9ieV94cGF0aCh4cGF0aCkKIAotICAgICAgICAjIExpc3Qgb2Ygcm93IHZhbHVlcyBpbiBh biBhcnJheQotICAgICAgICBmb3IgaWR4IGluIGNvbmZpZ19jaGVja19kYXRhLmtleXMoKToKLSAg ICAgICAgICAgIGVsZW1lbnQgPSByZXN1bHRfcm93LmZpbmRfZWxlbWVudF9ieV9jbGFzc19uYW1l KCJyIiArIHN0cihpZHgpKQorICAgICAgICAjIFZlcmlmeSB0aGUgTGlzdCBvZiBhY3R1YWwgdmFs dWVzIHdpdGggdGhlIGV4cGVjdGVkIGxpc3QKKyAgICAgICAgYWN0dWFsX2xpc3QgPSBsaXN0KGNv bmZpZ19jaGVja19kYXRhLmtleXMoKSkKKyAgICAgICAgZm9yIHZhbHVlIGluIHJhbmdlKDAsIGxl bihhY3R1YWxfbGlzdCkpOgorICAgICAgICAgICAgYWN0dWFsX2xpc3RbdmFsdWVdID0gaW50KGFj dHVhbF9saXN0W3ZhbHVlXSkKKyAgICAgICAgYWN0dWFsX2xpc3Quc29ydChyZXZlcnNlPUZhbHNl KQorICAgICAgICByZXRyeSA9IDUKKyAgICAgICAgZm9yIGlkeCBpbiBhY3R1YWxfbGlzdDoKKyAg ICAgICAgICAgIHdoaWxlIHJldHJ5ID4gMDoKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAg ICAgICAgICAgICAgIGVsZW1lbnQgPSBcCisgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRf cm93LmZpbmRfZWxlbWVudF9ieV9jbGFzc19uYW1lKCJyIiArIHN0cihpZHgpKQorICAgICAgICAg ICAgICAgICAgICBicmVhaworICAgICAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb246CisgICAg ICAgICAgICAgICAgICAgIHByaW50KCJzdGFsZSByZWZlcmVuY2UgZXhjZXB0aW9uIGF0IGlkOiIs IGlkeCkKKyAgICAgICAgICAgICAgICAgICAgcmV0cnkgLT0gMQogICAgICAgICAgICAgc2VsZi5w YWdlLmRyaXZlci5leGVjdXRlX3NjcmlwdCgKICAgICAgICAgICAgICAgICAiYXJndW1lbnRzWzBd LnNjcm9sbEludG9WaWV3KGZhbHNlKSIsIGVsZW1lbnQpCiAgICAgICAgICAgICB0aW1lLnNsZWVw KDAuNCkKZGlmZiAtLWdpdCBhL3dlYi9yZWdyZXNzaW9uL2ZlYXR1cmVfdXRpbHMvcGdhZG1pbl9w YWdlLnB5IGIvd2ViL3JlZ3Jlc3Npb24vZmVhdHVyZV91dGlscy9wZ2FkbWluX3BhZ2UucHkKaW5k ZXggYTE3MzViMTUyLi42MWFhNGNmNWEgMTAwNjQ0Ci0tLSBhL3dlYi9yZWdyZXNzaW9uL2ZlYXR1 cmVfdXRpbHMvcGdhZG1pbl9wYWdlLnB5CisrKyBiL3dlYi9yZWdyZXNzaW9uL2ZlYXR1cmVfdXRp bHMvcGdhZG1pbl9wYWdlLnB5CkBAIC0xNzYsNiArMTc2LDE4IEBAIGNsYXNzIFBnYWRtaW5QYWdl OgogICAgICAgICBleGVjdXRlX2J1dHRvbi5jbGljaygpCiAgICAgICAgIHNlbGYud2FpdF9mb3Jf cXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19kaXNhcHBlYXIoKQogCisgICAgZGVmIGNs aWNrX2V4ZWN1dGVfcXVlcnlfYnV0dG9uKHNlbGYpOgorICAgICAgICByZXRyeSA9IDUKKyAgICAg ICAgZXhlY3V0ZV9idXR0b24gPSBzZWxmLmZpbmRfYnlfY3NzX3NlbGVjdG9yKAorICAgICAgICAg ICAgUXVlcnlUb29sTG9jYXRvcnMuYnRuX2V4ZWN1dGVfcXVlcnlfY3NzKQorICAgICAgICB3aGls ZSByZXRyeSA+IDA6CisgICAgICAgICAgICBleGVjdXRlX2J1dHRvbi5jbGljaygpCisgICAgICAg ICAgICBpZiBzZWxmLndhaXRfZm9yX3F1ZXJ5X3Rvb2xfbG9hZGluZ19pbmRpY2F0b3JfdG9fYXBw ZWFyKCk6CisgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAg ICAgICAgICAgcmV0cnkgLT0gMQorICAgICAgICBzZWxmLndhaXRfZm9yX3F1ZXJ5X3Rvb2xfbG9h ZGluZ19pbmRpY2F0b3JfdG9fZGlzYXBwZWFyKCkKKwogICAgIGRlZiBjaGVja19leGVjdXRlX29w dGlvbihzZWxmLCBvcHRpb24pOgogICAgICAgICAiIiIiVGhpcyBmdW5jdGlvbiB3aWxsIGNoZWNr IGF1dG8gY29tbWl0IG9yIGF1dG8gcm9sbCBiYWNrIGJhc2VkIG9uCiAgICAgICAgIHVzZXIgaW5w dXQuIElmIGJ1dHRvbiBpcyBhbHJlYWR5IGNoZWNrZWQsIG5vIGFjdGlvbiB3aWxsIGJlIHRha2Vu IiIiCkBAIC0zOTQsNiArNDA2LDcgQEAgY2xhc3MgUGdhZG1pblBhZ2U6CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5hbWVfb2ZfZGF0YWJhc2UpOgogICAgICAgICAiIiJ3aWxsIGV4cGFu ZCBkYXRhYmFzZSBub2RlIHVuZGVyIGRhdGFiYXNlcyBub2RlIiIiCiAgICAgICAgIGRiX25vZGVf ZXhwYW5kZWRfc3RhdHVzID0gRmFsc2UKKyAgICAgICAgcmV0cnkgPSA1CiAgICAgICAgIGlmIHNl bGYuZXhwYW5kX2RhdGFiYXNlc19ub2RlKHNlcnZlcl9uYW1lLCBzZXJ2ZXJfcGFzc3dvcmQpOgog ICAgICAgICAgICAgc3ViX25vZGVzX29mX2RhdGFiYXNlc19ub2RlID0gc2VsZi5maW5kX2J5X3hw YXRoX2xpc3QoCiAgICAgICAgICAgICAgICAgVHJlZUFyZWFMb2NhdG9ycy5zdWJfbm9kZXNfb2Zf ZGF0YWJhc2VzX25vZGUoc2VydmVyX25hbWUpKQpAQCAtNDEwLDkgKzQyMywxNyBAQCBjbGFzcyBQ Z2FkbWluUGFnZToKICAgICAgICAgICAgICAgICBzZWxmLmRyaXZlci5leGVjdXRlX3NjcmlwdCgi YXJndW1lbnRzWzBdLnNjcm9sbEludG9WaWV3KCkiLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN1Yl9ub2Rlc19vZl9kYXRhYmFzZXNfbm9kZVsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXhfb2ZfcmVxdWlyZWRf ZGJfbm9kZV0pCi0gICAgICAgICAgICAgICAgd2ViZHJpdmVyLkFjdGlvbkNoYWlucyhzZWxmLmRy aXZlcikuZG91YmxlX2NsaWNrKAotICAgICAgICAgICAgICAgICAgICBzdWJfbm9kZXNfb2ZfZGF0 YWJhc2VzX25vZGVbCi0gICAgICAgICAgICAgICAgICAgICAgICBpbmRleF9vZl9yZXF1aXJlZF9k Yl9ub2RlXSkucGVyZm9ybSgpCisgICAgICAgICAgICAgICAgd2hpbGUgcmV0cnkgPiAwOgorICAg ICAgICAgICAgICAgICAgICB3ZWJkcml2ZXIuQWN0aW9uQ2hhaW5zKHNlbGYuZHJpdmVyKS5kb3Vi bGVfY2xpY2soCisgICAgICAgICAgICAgICAgICAgICAgICBzdWJfbm9kZXNfb2ZfZGF0YWJhc2Vz X25vZGVbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXhfb2ZfcmVxdWlyZWRfZGJf bm9kZV0pLnBlcmZvcm0oKQorICAgICAgICAgICAgICAgICAgICBpZiBzZWxmLmNoZWNrX2lmX2Vs ZW1lbnRfZXhpc3RfYnlfeHBhdGgoCisgICAgICAgICAgICAgICAgICAgICAgICAiLy9kaXZbQGNs YXNzPSdhanMtaGVhZGVyJ2FuZCB0ZXh0KCk9J0lOVEVSTkFMIFNFUlZFUiAiCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIkVSUk9SJ10iLCAxKToKKyAgICAgICAgICAgICAgICAgICAgICAg IHNlbGYuY2xpY2tfbW9kYWwoJ09LJykKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHJ5IC09 IDEKKyAgICAgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrCiAgICAgICAgICAgICAgICAgaWYgc2VsZi53YWl0X2Zvcl9lbGVtZW50c190b19hcHBlYXIo CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuZHJpdmVyLCBUcmVlQXJlYUxvY2F0b3JzLgogICAg ICAgICAgICAgICAgICAgICAgICAgc3ViX25vZGVzX29mX2RhdGFiYXNlX25vZGUoCkBAIC05MzUs NyArOTU2LDcgQEAgY2xhc3MgUGdhZG1pblBhZ2U6CiAgICAgICAgICAgICAgICAgICAgIHJldHVy biBGYWxzZQogCiAgICAgICAgICAgICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgICAgIGV4Y2Vw dCBOb1N1Y2hFbGVtZW50RXhjZXB0aW9uOgorICAgICAgICAgICAgZXhjZXB0IChOb1N1Y2hFbGVt ZW50RXhjZXB0aW9uLCBTdGFsZUVsZW1lbnRSZWZlcmVuY2VFeGNlcHRpb24pOgogICAgICAgICAg ICAgICAgIHJldHVybiBUcnVlCiAKICAgICAgICAgcmV0dXJuIHNlbGYuX3dhaXRfZm9yKCJlbGVt ZW50IHRvIGRpc2FwcGVhciIsIGVsZW1lbnRfaWZfaXRfZGlzYXBwZWFycykKQEAgLTk3Niw5ICs5 OTcsMTAgQEAgY2xhc3MgUGdhZG1pblBhZ2U6CiAgICAgICAgIHNlbGYuX3dhaXRfZm9yKCJzcGlu bmVyIHRvIGRpc2FwcGVhciIsIHNwaW5uZXJfaGFzX2Rpc2FwcGVhcmVkLCAyMCkKIAogICAgIGRl ZiB3YWl0X2Zvcl9xdWVyeV90b29sX2xvYWRpbmdfaW5kaWNhdG9yX3RvX2FwcGVhcihzZWxmKToK LSAgICAgICAgc2VsZi5jaGVja19pZl9lbGVtZW50X2V4aXN0X2J5X3hwYXRoKAorICAgICAgICBz dGF0dXMgPSBzZWxmLmNoZWNrX2lmX2VsZW1lbnRfZXhpc3RfYnlfeHBhdGgoCiAgICAgICAgICAg ICAiLy9kaXZbQGlkPSdlZGl0b3ItcGFuZWwnXS8vIgotICAgICAgICAgICAgImRpdltAY2xhc3M9 J3BnLXNwLWNvbnRhaW5lciBzcWwtZWRpdG9yLWJ1c3ktZmV0Y2hpbmcnXSIpCisgICAgICAgICAg ICAiZGl2W0BjbGFzcz0ncGctc3AtY29udGFpbmVyIHNxbC1lZGl0b3ItYnVzeS1mZXRjaGluZydd IiwgMSkKKyAgICAgICAgcmV0dXJuIHN0YXR1cwogCiAgICAgZGVmIHdhaXRfZm9yX2FwcChzZWxm KToKICAgICAgICAgZGVmIHBhZ2Vfc2hvd3NfYXBwKGRyaXZlcik6CmRpZmYgLS1naXQgYS93ZWIv cmVncmVzc2lvbi9ydW50ZXN0cy5weSBiL3dlYi9yZWdyZXNzaW9uL3J1bnRlc3RzLnB5CmluZGV4 IDU0MGVhZTY1ZS4uOGM1Mjc1M2YzIDEwMDY0NAotLS0gYS93ZWIvcmVncmVzc2lvbi9ydW50ZXN0 cy5weQorKysgYi93ZWIvcmVncmVzc2lvbi9ydW50ZXN0cy5weQpAQCAtMjM0LDYgKzIzNCw4IEBA IGRlZiBnZXRfdGVzdF9tb2R1bGVzKGFyZ3VtZW50cyk6CiAgICAgICAgICAgICAgICAgaWYgJ2hl YWRsZXNzX2Nocm9tZScgaW4gdGVzdF9zZXR1cC5jb25maWdfZGF0YToKICAgICAgICAgICAgICAg ICAgICAgaWYgdGVzdF9zZXR1cC5jb25maWdfZGF0YVsnaGVhZGxlc3NfY2hyb21lJ106CiAgICAg ICAgICAgICAgICAgICAgICAgICBvcHRpb25zLmFkZF9hcmd1bWVudCgiLS1oZWFkbGVzcyIpCisg ICAgICAgICAgICBvcHRpb25zLmFkZF9hcmd1bWVudCgiLS1uby1zYW5kYm94IikKKyAgICAgICAg ICAgIG9wdGlvbnMuYWRkX2FyZ3VtZW50KCItLWRpc2FibGUtc2V0dWlkLXNhbmRib3giKQogICAg ICAgICAgICAgb3B0aW9ucy5hZGRfYXJndW1lbnQoIi0td2luZG93LXNpemU9MTI4MCwxMDI0IikK ICAgICAgICAgICAgIG9wdGlvbnMuYWRkX2FyZ3VtZW50KCItLWRpc2FibGUtaW5mb2JhcnMiKQog ICAgICAgICAgICAgb3B0aW9ucy5hZGRfZXhwZXJpbWVudGFsX29wdGlvbigndzNjJywgRmFsc2Up Cg== --000000000000836523059761bf24--