<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>229620</bug_id>
          
          <creation_ts>2021-08-27 11:44:24 -0700</creation_ts>
          <short_desc>[GTK] Simplify run-gtk-tests handling of the a11y service</short_desc>
          <delta_ts>2021-08-27 23:53:27 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKitGTK</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Patrick Griffis">pgriffis</reporter>
          <assigned_to name="Patrick Griffis">pgriffis</assigned_to>
          <cc>bugs-noreply</cc>
    
    <cc>cgarcia</cc>
    
    <cc>mcatanzaro</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1788091</commentid>
    <comment_count>0</comment_count>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 11:44:24 -0700</bug_when>
    <thetext>[GTK] Simplify run-gtk-tests handling of the a11y service</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788093</commentid>
    <comment_count>1</comment_count>
      <attachid>436648</attachid>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 11:44:36 -0700</bug_when>
    <thetext>Created attachment 436648
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788097</commentid>
    <comment_count>2</comment_count>
      <attachid>436650</attachid>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 11:46:45 -0700</bug_when>
    <thetext>Created attachment 436650
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788104</commentid>
    <comment_count>3</comment_count>
      <attachid>436653</attachid>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 12:01:17 -0700</bug_when>
    <thetext>Created attachment 436653
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788121</commentid>
    <comment_count>4</comment_count>
      <attachid>436653</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2021-08-27 12:39:13 -0700</bug_when>
    <thetext>Comment on attachment 436653
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=436653&amp;action=review

&gt; Tools/Scripts/run-gtk-tests:56
&gt; +            sys.stderr.write(&quot;Failed to talk to the accessibility service {}\n&quot;.format(e))

Let&apos;s add a colon: &quot;Failed to talk to the accessibility service: {}\n&quot;

Also, can you check to ensure passing the error directly works? It will really print a nice error string and not some object ID? There is no e.message property that needs to be used instead?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788127</commentid>
    <comment_count>5</comment_count>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 12:54:03 -0700</bug_when>
    <thetext>(In reply to Michael Catanzaro from comment #4)
&gt; Also, can you check to ensure passing the error directly works? It will
&gt; really print a nice error string and not some object ID? There is no
&gt; e.message property that needs to be used instead?

It&apos;s verbose but I think thats mostly helpful:

    g-dbus-error-quark: GDBus.Error:org.freedesktop.DBus.Error.UnknownMethod: No such interface “org.foo.bar” on object at path /org/foo/bar (19)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788129</commentid>
    <comment_count>6</comment_count>
      <attachid>436660</attachid>
    <who name="Patrick Griffis">pgriffis</who>
    <bug_when>2021-08-27 13:02:06 -0700</bug_when>
    <thetext>Created attachment 436660
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788285</commentid>
    <comment_count>7</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2021-08-27 23:40:29 -0700</bug_when>
    <thetext>Failed to talk to the accessibility service: Cannot autolaunch D-Bus without X11 $DISPLAY

That&apos;s what we are getting in EWS now.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1788286</commentid>
    <comment_count>8</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-08-27 23:53:25 -0700</bug_when>
    <thetext>Committed r281733 (241075@main): &lt;https://commits.webkit.org/241075@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 436660.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436648</attachid>
            <date>2021-08-27 11:44:36 -0700</date>
            <delta_ts>2021-08-27 11:46:44 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229620-20210827134436.patch</filename>
            <type>text/plain</type>
            <size>5911</size>
            <attacher name="Patrick Griffis">pgriffis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTZmOWU3NWE5YTAzNTk3YjI5M2MzYWE0OTM4M2RiZWZl
ODljZGZkYy4uMzc2ZTJlNzg3ZTI4YzY1OTQyNmIxY2VlZTZmYzNlZjcwMDA2YzMzMyAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGEx
MXkgc2VydmljZQorICAgICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAg
UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNlcnZpY2UgaXMgREJ1
c0FjdGl2YXRhYmxlIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5zZSB0byBtYW51YWxseQorICAgICAg
ICBmaW5kIGFuZCBzdGFydCBldmVyeSBiaW5hcnkgb3Vyc2VsdmVzIGFuZCB0aGVuIHdhaXQgZm9y
IHRoZQorICAgICAgICBzZXJ2aWNlIHRvIGFwcGVhci4gV2UgY2FuIHNpbXBseSBjYWxsIGl0IGFu
ZCBsZXQgdGhlIHN5c3RlbQorICAgICAgICBtYW5hZ2UgdGhlIHNlcnZpY2UgYXMgaXQgbm9ybWFs
bHkgd291bGQgaXQgdGhlIGVudmlyb25tZW50IGl0CisgICAgICAgIG5vcm1hbGx5IHdvdWxkLgor
CisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoR3RrVGVzdFJ1bm5l
ci5fX2luaXRfXyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyKToKKyAgICAgICAgKEd0a1Rlc3RS
dW5uZXIuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2VfaXNfcnVubmluZyk6CisgICAgICAg
IChHdGtUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KToKKwogMjAyMS0wOC0y
MyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBQQ006IFN1
cHBvcnQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IHdpdGggbm9uLXBlcnNpc3RlbnQgV2ViQ29yZTo6
UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0
ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCAxOWFiODYxYWVlM2Nj
N2UxZjM1NzY2MDk2ZTBiNWE2NTA2YTEzMDUzLi4zOWU2MDU3MTgxMzNkMDk2OTY5ZGMwNzk0NmJh
NDY0ZjY4YTM0NmUyIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysr
IGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0zOSw2NiArMzksMjIgQEAgY2xhc3Mg
R3RrVGVzdFJ1bm5lcihUZXN0UnVubmVyKToKICAgICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9u
cywgdGVzdHM9W10pOgogICAgICAgICBzdXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fX2luaXRf
XygiZ3RrIiwgb3B0aW9ucywgdGVzdHMpCiAKLSAgICAgICAgIyBUaGVzZSBTUEkgZGFlbW9ucyBu
ZWVkIHRvIGJlIGFjdGl2ZSBmb3IgdGhlIGFjY2Vzc2liaWxpdHkgdGVzdHMgdG8gd29yay4KLSAg
ICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IE5vbmUKLSAgICAgICAgc2VsZi5fc3BpX2J1c19s
YXVuY2hlciA9IE5vbmUKLQotICAgIGRlZiBfbG9va3VwX2F0c3BpMl9iaW5hcnkoc2VsZiwgZmls
ZW5hbWUpOgotICAgICAgICBwcmVmaXggPSBjb21tb24ucGtnX2NvbmZpZ19maWxlX3ZhcmlhYmxl
KCdhdHNwaS0yJywgJ3ByZWZpeCcpCi0gICAgICAgIGlmIG5vdCBwcmVmaXg6Ci0gICAgICAgICAg
ICByZXR1cm4gTm9uZQotICAgICAgICBmb3IgcGF0aCBpbiBbJ2xpYmV4ZWMnLCAnbGliL2F0LXNw
aTItY29yZScsICdsaWIzMi9hdC1zcGkyLWNvcmUnLCAnbGliNjQvYXQtc3BpMi1jb3JlJ106Ci0g
ICAgICAgICAgICBmaWxlcGF0aCA9IG9zLnBhdGguam9pbihwcmVmaXgsIHBhdGgsIGZpbGVuYW1l
KQotICAgICAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUoZmlsZXBhdGgpOgotICAgICAgICAgICAg
ICAgIHJldHVybiBmaWxlcGF0aAotCi0gICAgICAgIHJldHVybiBOb25lCi0KLSAgICBkZWYgX3dh
aXRfZm9yX2FjY2Vzc2liaWxpdHlfYnVzKHNlbGYpOgotICAgICAgICBkZWYgdGltZW91dF9hY2Nl
c3NpYmlsaXR5X2J1cygpOgotICAgICAgICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91
bmQgPSBGYWxzZQotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiVGltZW91dCB3YWl0aW5n
IGZvciB0aGUgYWNjZXNpYmlsaXR5IGJ1cy5cbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLmZs
dXNoKCkKLSAgICAgICAgICAgIGxvb3AucXVpdCgpCi0gICAgICAgICMgQmFja3VwIGN1cnJlbnQg
ZW52aXJvbm1lbnQsIGFuZCB0ZW1wb3JhbGx5IHNldCB0aGUgdGVzdCBvbmUuCi0gICAgICAgIG9s
ZGVudiA9IGRpY3Qob3MuZW52aXJvbikKLSAgICAgICAgb3MuZW52aXJvbi5jbGVhcigpCi0gICAg
ICAgIG9zLmVudmlyb24udXBkYXRlKHNlbGYuX3Rlc3RfZW52KQotICAgICAgICAjIFdlIHNwaW4g
YSBtYWluIGxvb3AgdW50aWwgdGhlIGJ1cyBuYW1lIGFwcGVhcnMgb24gREJ1cy4KLSAgICAgICAg
c2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBUcnVlCi0gICAgICAgIGxvb3AgPSBHTGli
Lk1haW5Mb29wKCkKLSAgICAgICAgR2lvLmJ1c193YXRjaF9uYW1lKEdpby5CdXNUeXBlLlNFU1NJ
T04sICdvcmcuYTExeS5CdXMnLCBHaW8uQnVzTmFtZVdhdGNoZXJGbGFncy5OT05FLAotICAgICAg
ICAgICAgICAgICAgICAgICAgICAgbGFtYmRhICphcmdzOiBsb29wLnF1aXQoKSwgTm9uZSkKLSAg
ICAgICAgR0xpYi50aW1lb3V0X2FkZF9zZWNvbmRzKDUsIHRpbWVvdXRfYWNjZXNzaWJpbGl0eV9i
dXMpCi0gICAgICAgIGxvb3AucnVuKCkKLSAgICAgICAgIyBSZXN0b3JlIHByZXZpb3VzIGVudmly
b25tZW50LgotICAgICAgICBvcy5lbnZpcm9uLmNsZWFyKCkKLSAgICAgICAgb3MuZW52aXJvbi51
cGRhdGUob2xkZW52KQotICAgICAgICByZXR1cm4gc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91
bmQKLQotICAgIGRlZiBfc3RhcnRfYWNjZXNzaWJpbGl0eV9kYWVtb25zKHNlbGYpOgotICAgICAg
ICBzcGlfYnVzX2xhdW5jaGVyX3BhdGggPSBzZWxmLl9sb29rdXBfYXRzcGkyX2JpbmFyeSgnYXQt
c3BpLWJ1cy1sYXVuY2hlcicpCi0gICAgICAgIHNwaV9yZWdpc3RyeWRfcGF0aCA9IHNlbGYuX2xv
b2t1cF9hdHNwaTJfYmluYXJ5KCdhdC1zcGkyLXJlZ2lzdHJ5ZCcpCi0gICAgICAgIGlmIG5vdCBz
cGlfYnVzX2xhdW5jaGVyX3BhdGggb3Igbm90IHNwaV9yZWdpc3RyeWRfcGF0aDoKLSAgICAgICAg
ICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuX3NwaV9i
dXNfbGF1bmNoZXIgPSBzdWJwcm9jZXNzLlBvcGVuKFtzcGlfYnVzX2xhdW5jaGVyX3BhdGhdLCBl
bnY9c2VsZi5fdGVzdF9lbnYpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHN5cy5zdGRl
cnIud3JpdGUoIkZhaWxlZCB0byBsYXVuY2ggdGhlIGFjY2Vzc2liaWxpdHkgYnVzXG4iKQotICAg
ICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLQot
ICAgICAgICAjIFdlIG5lZWQgdG8gd2FpdCB1bnRpbCB0aGUgU1BJIGJ1cyBpcyBsYXVuY2hlZCBi
ZWZvcmUgdHJ5aW5nIHRvIHN0YXJ0IHRoZSBTUEkgcmVnaXN0cnkuCi0gICAgICAgIGlmIG5vdCBz
ZWxmLl93YWl0X2Zvcl9hY2Nlc3NpYmlsaXR5X2J1cygpOgotICAgICAgICAgICAgc3lzLnN0ZGVy
ci53cml0ZSgiRmFpbGVkIGNoZWNraW5nIHRoZSBhY2Nlc3NpYmlsaXR5IGJ1cyB3aXRoaW4gRC1C
dXNcbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIHJldHVy
biBGYWxzZQotCisgICAgZGVmIF9lbnN1cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5p
bmcoc2VsZik6CisgICAgICAgICMgVGhlIGExMXkgc2VydmljZSBpcyBEQnVzIGFjdGl2YXRhYmxl
IHNvIHdlIHNpbXBseSBuZWVkIHRvIGNhbGwgaXQgdG8gZW5zdXJlIGl0CisgICAgICAgICMgaGFz
IGJlZW4gc3RhcnRlZC4KICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5fc3BpX3JlZ2lz
dHJ5ZCA9IHN1YnByb2Nlc3MuUG9wZW4oW3NwaV9yZWdpc3RyeWRfcGF0aF0sIGVudj1zZWxmLl90
ZXN0X2VudikKLSAgICAgICAgZXhjZXB0OgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgi
RmFpbGVkIHRvIGxhdW5jaCB0aGUgYWNjZXNzaWJpbGl0eSByZWdpc3RyeVxuIikKKyAgICAgICAg
ICAgIHByb3h5ID0gR2lvLkRCdXNQcm94eS5uZXdfZm9yX2J1c19zeW5jKEdpby5CdXNUeXBlLlNF
U1NJT04sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBHaW8uREJ1c1Byb3h5RmxhZ3MuTk9ORSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIE5vbmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAnb3JnLmExMXkuQnVzJywKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcvb3JnL2ExMXkvYnVzJywKKyAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdvcmcuYTExeS5C
dXMnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
Tm9uZSkKKworICAgICAgICAgICAgIyBBZnRlciB0aGlzIHdlIGtub3cgdGhlIGJ1cyBpcyBzZXR1
cC4KKyAgICAgICAgICAgIGFkZHJlc3MgPSBwcm94eS5HZXRBZGRyZXNzKCkKKyAgICAgICAgZXhj
ZXB0IEdMaWIuRXJyb3IgYXMgZToKKyAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxl
ZCB0byB0YWxrIHRvIHRoZSBhY2Nlc3NpYmlsaXR5IHNlcnZpY2Uge31cbiIuZm9ybWF0KGUpKQog
ICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCiAgICAgICAgICAgICByZXR1cm4gRmFsc2UK
IApAQCAtMTA4LDE1ICs2NCwxMSBAQCBjbGFzcyBHdGtUZXN0UnVubmVyKFRlc3RSdW5uZXIpOgog
ICAgICAgICBzdXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fc2V0dXBfdGVzdGluZ19lbnZpcm9u
bWVudCgpCiAKICAgICAgICAgIyBJZiB3ZSBjYW5ub3Qgc3RhcnQgdGhlIGFjY2Vzc2liaWxpdHkg
ZGFlbW9ucywgd2UgY2FuIGp1c3Qgc2tpcCB0aGUgYWNjZXNzaWJpbGl0eSB0ZXN0cy4KLSAgICAg
ICAgaWYgbm90IHNlbGYuX3N0YXJ0X2FjY2Vzc2liaWxpdHlfZGFlbW9ucygpOgorICAgICAgICBp
ZiBub3Qgc2VsZi5fZW5zdXJlX2FjY2Vzc2liaWxpdHlfc2VydmljZV9pc19ydW5uaW5nKCk6CiAg
ICAgICAgICAgICBwcmludCgiQ291bGQgbm90IHN0YXJ0IGFjY2Vzc2liaWxpdHkgYnVzLCBzbyBk
aXNhYmxpbmcgVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiKQogICAgICAgICAgICAgc2VsZi5fZGlz
YWJsZWRfdGVzdHMuYXBwZW5kKCJXZWJLaXQyR3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5IikK
IAogICAgIGRlZiBfdGVhcl9kb3duX3Rlc3RpbmdfZW52aXJvbm1lbnQoc2VsZik6Ci0gICAgICAg
IGlmIHNlbGYuX3NwaV9yZWdpc3RyeWQ6Ci0gICAgICAgICAgICBzZWxmLl9zcGlfcmVnaXN0cnlk
LnRlcm1pbmF0ZSgpCi0gICAgICAgIGlmIHNlbGYuX3NwaV9idXNfbGF1bmNoZXI6Ci0gICAgICAg
ICAgICBzZWxmLl9zcGlfYnVzX2xhdW5jaGVyLnRlcm1pbmF0ZSgpCiAgICAgICAgIHN1cGVyKEd0
a1Rlc3RSdW5uZXIsIHNlbGYpLl90ZWFyX2Rvd25fdGVzdGluZ19lbnZpcm9ubWVudCgpCiAKICAg
ICBkZWYgaXNfZ2xpYl90ZXN0KHNlbGYsIHRlc3RfcHJvZ3JhbSk6Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436650</attachid>
            <date>2021-08-27 11:46:45 -0700</date>
            <delta_ts>2021-08-27 12:01:15 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229620-20210827134645.patch</filename>
            <type>text/plain</type>
            <size>5932</size>
            <attacher name="Patrick Griffis">pgriffis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTZmOWU3NWE5YTAzNTk3YjI5M2MzYWE0OTM4M2RiZWZl
ODljZGZkYy4uZmNkYzMwYzE2OGQ3ZDA1NmIxZDQwOGY4MDAxM2M0YzhjMDkxOTg1ZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGEx
MXkgc2VydmljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI5NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVGhlIHNlcnZpY2UgaXMgREJ1c0FjdGl2YXRhYmxlIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5z
ZSB0byBtYW51YWxseQorICAgICAgICBmaW5kIGFuZCBzdGFydCBldmVyeSBiaW5hcnkgb3Vyc2Vs
dmVzIGFuZCB0aGVuIHdhaXQgZm9yIHRoZQorICAgICAgICBzZXJ2aWNlIHRvIGFwcGVhci4gV2Ug
Y2FuIHNpbXBseSBjYWxsIGl0IGFuZCBsZXQgdGhlIHN5c3RlbQorICAgICAgICBtYW5hZ2UgdGhl
IHNlcnZpY2UgYXMgaXQgbm9ybWFsbHkgd291bGQgaW4gdGhlIGVudmlyb25tZW50IGl0CisgICAg
ICAgIG5vcm1hbGx5IHdvdWxkLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgor
ICAgICAgICAoR3RrVGVzdFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChHdGtUZXN0UnVubmVy
KToKKyAgICAgICAgKEd0a1Rlc3RSdW5uZXIuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2Vf
aXNfcnVubmluZyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmly
b25tZW50KToKKwogMjAyMS0wOC0yMyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNv
bT4KIAogICAgICAgICBQQ006IFN1cHBvcnQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IHdpdGggbm9u
LXBlcnNpc3RlbnQgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQKZGlmZiAtLWdpdCBh
L1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0
cwppbmRleCAxOWFiODYxYWVlM2NjN2UxZjM1NzY2MDk2ZTBiNWE2NTA2YTEzMDUzLi4zOWU2MDU3
MTgxMzNkMDk2OTY5ZGMwNzk0NmJhNDY0ZjY4YTM0NmUyIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp
cHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0z
OSw2NiArMzksMjIgQEAgY2xhc3MgR3RrVGVzdFJ1bm5lcihUZXN0UnVubmVyKToKICAgICBkZWYg
X19pbml0X18oc2VsZiwgb3B0aW9ucywgdGVzdHM9W10pOgogICAgICAgICBzdXBlcihHdGtUZXN0
UnVubmVyLCBzZWxmKS5fX2luaXRfXygiZ3RrIiwgb3B0aW9ucywgdGVzdHMpCiAKLSAgICAgICAg
IyBUaGVzZSBTUEkgZGFlbW9ucyBuZWVkIHRvIGJlIGFjdGl2ZSBmb3IgdGhlIGFjY2Vzc2liaWxp
dHkgdGVzdHMgdG8gd29yay4KLSAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IE5vbmUKLSAg
ICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlciA9IE5vbmUKLQotICAgIGRlZiBfbG9va3VwX2F0
c3BpMl9iaW5hcnkoc2VsZiwgZmlsZW5hbWUpOgotICAgICAgICBwcmVmaXggPSBjb21tb24ucGtn
X2NvbmZpZ19maWxlX3ZhcmlhYmxlKCdhdHNwaS0yJywgJ3ByZWZpeCcpCi0gICAgICAgIGlmIG5v
dCBwcmVmaXg6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBmb3IgcGF0aCBpbiBb
J2xpYmV4ZWMnLCAnbGliL2F0LXNwaTItY29yZScsICdsaWIzMi9hdC1zcGkyLWNvcmUnLCAnbGli
NjQvYXQtc3BpMi1jb3JlJ106Ci0gICAgICAgICAgICBmaWxlcGF0aCA9IG9zLnBhdGguam9pbihw
cmVmaXgsIHBhdGgsIGZpbGVuYW1lKQotICAgICAgICAgICAgaWYgb3MucGF0aC5pc2ZpbGUoZmls
ZXBhdGgpOgotICAgICAgICAgICAgICAgIHJldHVybiBmaWxlcGF0aAotCi0gICAgICAgIHJldHVy
biBOb25lCi0KLSAgICBkZWYgX3dhaXRfZm9yX2FjY2Vzc2liaWxpdHlfYnVzKHNlbGYpOgotICAg
ICAgICBkZWYgdGltZW91dF9hY2Nlc3NpYmlsaXR5X2J1cygpOgotICAgICAgICAgICAgc2VsZi5f
YWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBGYWxzZQotICAgICAgICAgICAgc3lzLnN0ZGVyci53
cml0ZSgiVGltZW91dCB3YWl0aW5nIGZvciB0aGUgYWNjZXNpYmlsaXR5IGJ1cy5cbiIpCi0gICAg
ICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIGxvb3AucXVpdCgpCi0gICAg
ICAgICMgQmFja3VwIGN1cnJlbnQgZW52aXJvbm1lbnQsIGFuZCB0ZW1wb3JhbGx5IHNldCB0aGUg
dGVzdCBvbmUuCi0gICAgICAgIG9sZGVudiA9IGRpY3Qob3MuZW52aXJvbikKLSAgICAgICAgb3Mu
ZW52aXJvbi5jbGVhcigpCi0gICAgICAgIG9zLmVudmlyb24udXBkYXRlKHNlbGYuX3Rlc3RfZW52
KQotICAgICAgICAjIFdlIHNwaW4gYSBtYWluIGxvb3AgdW50aWwgdGhlIGJ1cyBuYW1lIGFwcGVh
cnMgb24gREJ1cy4KLSAgICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBUcnVl
Ci0gICAgICAgIGxvb3AgPSBHTGliLk1haW5Mb29wKCkKLSAgICAgICAgR2lvLmJ1c193YXRjaF9u
YW1lKEdpby5CdXNUeXBlLlNFU1NJT04sICdvcmcuYTExeS5CdXMnLCBHaW8uQnVzTmFtZVdhdGNo
ZXJGbGFncy5OT05FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFtYmRhICphcmdzOiBs
b29wLnF1aXQoKSwgTm9uZSkKLSAgICAgICAgR0xpYi50aW1lb3V0X2FkZF9zZWNvbmRzKDUsIHRp
bWVvdXRfYWNjZXNzaWJpbGl0eV9idXMpCi0gICAgICAgIGxvb3AucnVuKCkKLSAgICAgICAgIyBS
ZXN0b3JlIHByZXZpb3VzIGVudmlyb25tZW50LgotICAgICAgICBvcy5lbnZpcm9uLmNsZWFyKCkK
LSAgICAgICAgb3MuZW52aXJvbi51cGRhdGUob2xkZW52KQotICAgICAgICByZXR1cm4gc2VsZi5f
YWNjZXNzaWJpbGl0eV9idXNfZm91bmQKLQotICAgIGRlZiBfc3RhcnRfYWNjZXNzaWJpbGl0eV9k
YWVtb25zKHNlbGYpOgotICAgICAgICBzcGlfYnVzX2xhdW5jaGVyX3BhdGggPSBzZWxmLl9sb29r
dXBfYXRzcGkyX2JpbmFyeSgnYXQtc3BpLWJ1cy1sYXVuY2hlcicpCi0gICAgICAgIHNwaV9yZWdp
c3RyeWRfcGF0aCA9IHNlbGYuX2xvb2t1cF9hdHNwaTJfYmluYXJ5KCdhdC1zcGkyLXJlZ2lzdHJ5
ZCcpCi0gICAgICAgIGlmIG5vdCBzcGlfYnVzX2xhdW5jaGVyX3BhdGggb3Igbm90IHNwaV9yZWdp
c3RyeWRfcGF0aDoKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIHRyeToKLSAg
ICAgICAgICAgIHNlbGYuX3NwaV9idXNfbGF1bmNoZXIgPSBzdWJwcm9jZXNzLlBvcGVuKFtzcGlf
YnVzX2xhdW5jaGVyX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCi0gICAgICAgIGV4Y2VwdDoK
LSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBsYXVuY2ggdGhlIGFjY2Vz
c2liaWxpdHkgYnVzXG4iKQotICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCi0gICAgICAg
ICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICAjIFdlIG5lZWQgdG8gd2FpdCB1bnRpbCB0aGUg
U1BJIGJ1cyBpcyBsYXVuY2hlZCBiZWZvcmUgdHJ5aW5nIHRvIHN0YXJ0IHRoZSBTUEkgcmVnaXN0
cnkuCi0gICAgICAgIGlmIG5vdCBzZWxmLl93YWl0X2Zvcl9hY2Nlc3NpYmlsaXR5X2J1cygpOgot
ICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIGNoZWNraW5nIHRoZSBhY2Nlc3Np
YmlsaXR5IGJ1cyB3aXRoaW4gRC1CdXNcbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNo
KCkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCisgICAgZGVmIF9lbnN1cmVfYWNjZXNzaWJp
bGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcoc2VsZik6CisgICAgICAgICMgVGhlIGExMXkgc2Vydmlj
ZSBpcyBEQnVzIGFjdGl2YXRhYmxlIHNvIHdlIHNpbXBseSBuZWVkIHRvIGNhbGwgaXQgdG8gZW5z
dXJlIGl0CisgICAgICAgICMgaGFzIGJlZW4gc3RhcnRlZC4KICAgICAgICAgdHJ5OgotICAgICAg
ICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IHN1YnByb2Nlc3MuUG9wZW4oW3NwaV9yZWdpc3Ry
eWRfcGF0aF0sIGVudj1zZWxmLl90ZXN0X2VudikKLSAgICAgICAgZXhjZXB0OgotICAgICAgICAg
ICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIGxhdW5jaCB0aGUgYWNjZXNzaWJpbGl0eSBy
ZWdpc3RyeVxuIikKKyAgICAgICAgICAgIHByb3h5ID0gR2lvLkRCdXNQcm94eS5uZXdfZm9yX2J1
c19zeW5jKEdpby5CdXNUeXBlLlNFU1NJT04sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBHaW8uREJ1c1Byb3h5RmxhZ3MuTk9ORSwKKyAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vbmUsCisgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnb3JnLmExMXkuQnVz
JywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcv
b3JnL2ExMXkvYnVzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICdvcmcuYTExeS5CdXMnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgTm9uZSkKKworICAgICAgICAgICAgIyBBZnRlciB0aGlzIHdl
IGtub3cgdGhlIGJ1cyBpcyBzZXR1cC4KKyAgICAgICAgICAgIGFkZHJlc3MgPSBwcm94eS5HZXRB
ZGRyZXNzKCkKKyAgICAgICAgZXhjZXB0IEdMaWIuRXJyb3IgYXMgZToKKyAgICAgICAgICAgIHN5
cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byB0YWxrIHRvIHRoZSBhY2Nlc3NpYmlsaXR5IHNlcnZp
Y2Uge31cbiIuZm9ybWF0KGUpKQogICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCiAgICAg
ICAgICAgICByZXR1cm4gRmFsc2UKIApAQCAtMTA4LDE1ICs2NCwxMSBAQCBjbGFzcyBHdGtUZXN0
UnVubmVyKFRlc3RSdW5uZXIpOgogICAgICAgICBzdXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5f
c2V0dXBfdGVzdGluZ19lbnZpcm9ubWVudCgpCiAKICAgICAgICAgIyBJZiB3ZSBjYW5ub3Qgc3Rh
cnQgdGhlIGFjY2Vzc2liaWxpdHkgZGFlbW9ucywgd2UgY2FuIGp1c3Qgc2tpcCB0aGUgYWNjZXNz
aWJpbGl0eSB0ZXN0cy4KLSAgICAgICAgaWYgbm90IHNlbGYuX3N0YXJ0X2FjY2Vzc2liaWxpdHlf
ZGFlbW9ucygpOgorICAgICAgICBpZiBub3Qgc2VsZi5fZW5zdXJlX2FjY2Vzc2liaWxpdHlfc2Vy
dmljZV9pc19ydW5uaW5nKCk6CiAgICAgICAgICAgICBwcmludCgiQ291bGQgbm90IHN0YXJ0IGFj
Y2Vzc2liaWxpdHkgYnVzLCBzbyBkaXNhYmxpbmcgVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiKQog
ICAgICAgICAgICAgc2VsZi5fZGlzYWJsZWRfdGVzdHMuYXBwZW5kKCJXZWJLaXQyR3RrL1Rlc3RX
ZWJLaXRBY2Nlc3NpYmlsaXR5IikKIAogICAgIGRlZiBfdGVhcl9kb3duX3Rlc3RpbmdfZW52aXJv
bm1lbnQoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYuX3NwaV9yZWdpc3RyeWQ6Ci0gICAgICAgICAg
ICBzZWxmLl9zcGlfcmVnaXN0cnlkLnRlcm1pbmF0ZSgpCi0gICAgICAgIGlmIHNlbGYuX3NwaV9i
dXNfbGF1bmNoZXI6Ci0gICAgICAgICAgICBzZWxmLl9zcGlfYnVzX2xhdW5jaGVyLnRlcm1pbmF0
ZSgpCiAgICAgICAgIHN1cGVyKEd0a1Rlc3RSdW5uZXIsIHNlbGYpLl90ZWFyX2Rvd25fdGVzdGlu
Z19lbnZpcm9ubWVudCgpCiAKICAgICBkZWYgaXNfZ2xpYl90ZXN0KHNlbGYsIHRlc3RfcHJvZ3Jh
bSk6Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436653</attachid>
            <date>2021-08-27 12:01:17 -0700</date>
            <delta_ts>2021-08-27 13:02:04 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229620-20210827140116.patch</filename>
            <type>text/plain</type>
            <size>6089</size>
            <attacher name="Patrick Griffis">pgriffis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTZmOWU3NWE5YTAzNTk3YjI5M2MzYWE0OTM4M2RiZWZl
ODljZGZkYy4uZmNkYzMwYzE2OGQ3ZDA1NmIxZDQwOGY4MDAxM2M0YzhjMDkxOTg1ZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGEx
MXkgc2VydmljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI5NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVGhlIHNlcnZpY2UgaXMgREJ1c0FjdGl2YXRhYmxlIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5z
ZSB0byBtYW51YWxseQorICAgICAgICBmaW5kIGFuZCBzdGFydCBldmVyeSBiaW5hcnkgb3Vyc2Vs
dmVzIGFuZCB0aGVuIHdhaXQgZm9yIHRoZQorICAgICAgICBzZXJ2aWNlIHRvIGFwcGVhci4gV2Ug
Y2FuIHNpbXBseSBjYWxsIGl0IGFuZCBsZXQgdGhlIHN5c3RlbQorICAgICAgICBtYW5hZ2UgdGhl
IHNlcnZpY2UgYXMgaXQgbm9ybWFsbHkgd291bGQgaW4gdGhlIGVudmlyb25tZW50IGl0CisgICAg
ICAgIG5vcm1hbGx5IHdvdWxkLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgor
ICAgICAgICAoR3RrVGVzdFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChHdGtUZXN0UnVubmVy
KToKKyAgICAgICAgKEd0a1Rlc3RSdW5uZXIuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2Vf
aXNfcnVubmluZyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmly
b25tZW50KToKKwogMjAyMS0wOC0yMyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNv
bT4KIAogICAgICAgICBQQ006IFN1cHBvcnQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IHdpdGggbm9u
LXBlcnNpc3RlbnQgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQKZGlmZiAtLWdpdCBh
L1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0
cwppbmRleCAxOWFiODYxYWVlM2NjN2UxZjM1NzY2MDk2ZTBiNWE2NTA2YTEzMDUzLi43ZTQwMzZj
NDdkOWQxZWMyMzE3NjdkMGMwZTc4ZTYwYTk1NGY4Mjc3IDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp
cHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0x
OCw3ICsxOCw2IEBACiAjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogCiBpbXBvcnQgbG9n
Z2luZwotaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBvcwogaW1wb3J0IHN5cwogaW1wb3J0IG9w
dHBhcnNlCkBAIC0zOSw2NiArMzgsMjIgQEAgY2xhc3MgR3RrVGVzdFJ1bm5lcihUZXN0UnVubmVy
KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9ucywgdGVzdHM9W10pOgogICAgICAgICBz
dXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fX2luaXRfXygiZ3RrIiwgb3B0aW9ucywgdGVzdHMp
CiAKLSAgICAgICAgIyBUaGVzZSBTUEkgZGFlbW9ucyBuZWVkIHRvIGJlIGFjdGl2ZSBmb3IgdGhl
IGFjY2Vzc2liaWxpdHkgdGVzdHMgdG8gd29yay4KLSAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5
ZCA9IE5vbmUKLSAgICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlciA9IE5vbmUKLQotICAgIGRl
ZiBfbG9va3VwX2F0c3BpMl9iaW5hcnkoc2VsZiwgZmlsZW5hbWUpOgotICAgICAgICBwcmVmaXgg
PSBjb21tb24ucGtnX2NvbmZpZ19maWxlX3ZhcmlhYmxlKCdhdHNwaS0yJywgJ3ByZWZpeCcpCi0g
ICAgICAgIGlmIG5vdCBwcmVmaXg6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBm
b3IgcGF0aCBpbiBbJ2xpYmV4ZWMnLCAnbGliL2F0LXNwaTItY29yZScsICdsaWIzMi9hdC1zcGky
LWNvcmUnLCAnbGliNjQvYXQtc3BpMi1jb3JlJ106Ci0gICAgICAgICAgICBmaWxlcGF0aCA9IG9z
LnBhdGguam9pbihwcmVmaXgsIHBhdGgsIGZpbGVuYW1lKQotICAgICAgICAgICAgaWYgb3MucGF0
aC5pc2ZpbGUoZmlsZXBhdGgpOgotICAgICAgICAgICAgICAgIHJldHVybiBmaWxlcGF0aAotCi0g
ICAgICAgIHJldHVybiBOb25lCi0KLSAgICBkZWYgX3dhaXRfZm9yX2FjY2Vzc2liaWxpdHlfYnVz
KHNlbGYpOgotICAgICAgICBkZWYgdGltZW91dF9hY2Nlc3NpYmlsaXR5X2J1cygpOgotICAgICAg
ICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBGYWxzZQotICAgICAgICAgICAg
c3lzLnN0ZGVyci53cml0ZSgiVGltZW91dCB3YWl0aW5nIGZvciB0aGUgYWNjZXNpYmlsaXR5IGJ1
cy5cbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIGxvb3Au
cXVpdCgpCi0gICAgICAgICMgQmFja3VwIGN1cnJlbnQgZW52aXJvbm1lbnQsIGFuZCB0ZW1wb3Jh
bGx5IHNldCB0aGUgdGVzdCBvbmUuCi0gICAgICAgIG9sZGVudiA9IGRpY3Qob3MuZW52aXJvbikK
LSAgICAgICAgb3MuZW52aXJvbi5jbGVhcigpCi0gICAgICAgIG9zLmVudmlyb24udXBkYXRlKHNl
bGYuX3Rlc3RfZW52KQotICAgICAgICAjIFdlIHNwaW4gYSBtYWluIGxvb3AgdW50aWwgdGhlIGJ1
cyBuYW1lIGFwcGVhcnMgb24gREJ1cy4KLSAgICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNf
Zm91bmQgPSBUcnVlCi0gICAgICAgIGxvb3AgPSBHTGliLk1haW5Mb29wKCkKLSAgICAgICAgR2lv
LmJ1c193YXRjaF9uYW1lKEdpby5CdXNUeXBlLlNFU1NJT04sICdvcmcuYTExeS5CdXMnLCBHaW8u
QnVzTmFtZVdhdGNoZXJGbGFncy5OT05FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFt
YmRhICphcmdzOiBsb29wLnF1aXQoKSwgTm9uZSkKLSAgICAgICAgR0xpYi50aW1lb3V0X2FkZF9z
ZWNvbmRzKDUsIHRpbWVvdXRfYWNjZXNzaWJpbGl0eV9idXMpCi0gICAgICAgIGxvb3AucnVuKCkK
LSAgICAgICAgIyBSZXN0b3JlIHByZXZpb3VzIGVudmlyb25tZW50LgotICAgICAgICBvcy5lbnZp
cm9uLmNsZWFyKCkKLSAgICAgICAgb3MuZW52aXJvbi51cGRhdGUob2xkZW52KQotICAgICAgICBy
ZXR1cm4gc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQKLQotICAgIGRlZiBfc3RhcnRfYWNj
ZXNzaWJpbGl0eV9kYWVtb25zKHNlbGYpOgotICAgICAgICBzcGlfYnVzX2xhdW5jaGVyX3BhdGgg
PSBzZWxmLl9sb29rdXBfYXRzcGkyX2JpbmFyeSgnYXQtc3BpLWJ1cy1sYXVuY2hlcicpCi0gICAg
ICAgIHNwaV9yZWdpc3RyeWRfcGF0aCA9IHNlbGYuX2xvb2t1cF9hdHNwaTJfYmluYXJ5KCdhdC1z
cGkyLXJlZ2lzdHJ5ZCcpCi0gICAgICAgIGlmIG5vdCBzcGlfYnVzX2xhdW5jaGVyX3BhdGggb3Ig
bm90IHNwaV9yZWdpc3RyeWRfcGF0aDoKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAg
ICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuX3NwaV9idXNfbGF1bmNoZXIgPSBzdWJwcm9jZXNz
LlBvcGVuKFtzcGlfYnVzX2xhdW5jaGVyX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCi0gICAg
ICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBsYXVu
Y2ggdGhlIGFjY2Vzc2liaWxpdHkgYnVzXG4iKQotICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVz
aCgpCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICAjIFdlIG5lZWQgdG8gd2Fp
dCB1bnRpbCB0aGUgU1BJIGJ1cyBpcyBsYXVuY2hlZCBiZWZvcmUgdHJ5aW5nIHRvIHN0YXJ0IHRo
ZSBTUEkgcmVnaXN0cnkuCi0gICAgICAgIGlmIG5vdCBzZWxmLl93YWl0X2Zvcl9hY2Nlc3NpYmls
aXR5X2J1cygpOgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIGNoZWNraW5n
IHRoZSBhY2Nlc3NpYmlsaXR5IGJ1cyB3aXRoaW4gRC1CdXNcbiIpCi0gICAgICAgICAgICBzeXMu
c3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCisgICAgZGVmIF9lbnN1
cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcoc2VsZik6CisgICAgICAgICMgVGhl
IGExMXkgc2VydmljZSBpcyBEQnVzIGFjdGl2YXRhYmxlIHNvIHdlIHNpbXBseSBuZWVkIHRvIGNh
bGwgaXQgdG8gZW5zdXJlIGl0CisgICAgICAgICMgaGFzIGJlZW4gc3RhcnRlZC4KICAgICAgICAg
dHJ5OgotICAgICAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IHN1YnByb2Nlc3MuUG9wZW4o
W3NwaV9yZWdpc3RyeWRfcGF0aF0sIGVudj1zZWxmLl90ZXN0X2VudikKLSAgICAgICAgZXhjZXB0
OgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIGxhdW5jaCB0aGUgYWNj
ZXNzaWJpbGl0eSByZWdpc3RyeVxuIikKKyAgICAgICAgICAgIHByb3h5ID0gR2lvLkRCdXNQcm94
eS5uZXdfZm9yX2J1c19zeW5jKEdpby5CdXNUeXBlLlNFU1NJT04sCisgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHaW8uREJ1c1Byb3h5RmxhZ3MuTk9O
RSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5v
bmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn
b3JnLmExMXkuQnVzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICcvb3JnL2ExMXkvYnVzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICdvcmcuYTExeS5CdXMnLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9uZSkKKworICAgICAgICAgICAgIyBB
ZnRlciB0aGlzIHJldHVybnMgd2Uga25vdyB0aGUgYnVzIGlzIHNldHVwLCB0aGUgcmV0dXJuIHZh
bHVlIGRvZXNuJ3QgbWF0dGVyLgorICAgICAgICAgICAgcHJveHkuR2V0QWRkcmVzcygpCisgICAg
ICAgIGV4Y2VwdCBHTGliLkVycm9yIGFzIGU6CisgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRl
KCJGYWlsZWQgdG8gdGFsayB0byB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlIHt9XG4iLmZvcm1h
dChlKSkKICAgICAgICAgICAgIHN5cy5zdGRlcnIuZmx1c2goKQogICAgICAgICAgICAgcmV0dXJu
IEZhbHNlCiAKQEAgLTEwOCwxNSArNjMsMTEgQEAgY2xhc3MgR3RrVGVzdFJ1bm5lcihUZXN0UnVu
bmVyKToKICAgICAgICAgc3VwZXIoR3RrVGVzdFJ1bm5lciwgc2VsZikuX3NldHVwX3Rlc3Rpbmdf
ZW52aXJvbm1lbnQoKQogCiAgICAgICAgICMgSWYgd2UgY2Fubm90IHN0YXJ0IHRoZSBhY2Nlc3Np
YmlsaXR5IGRhZW1vbnMsIHdlIGNhbiBqdXN0IHNraXAgdGhlIGFjY2Vzc2liaWxpdHkgdGVzdHMu
Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9zdGFydF9hY2Nlc3NpYmlsaXR5X2RhZW1vbnMoKToKKyAg
ICAgICAgaWYgbm90IHNlbGYuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2VfaXNfcnVubmlu
ZygpOgogICAgICAgICAgICAgcHJpbnQoIkNvdWxkIG5vdCBzdGFydCBhY2Nlc3NpYmlsaXR5IGJ1
cywgc28gZGlzYWJsaW5nIFRlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5IikKICAgICAgICAgICAgIHNl
bGYuX2Rpc2FibGVkX3Rlc3RzLmFwcGVuZCgiV2ViS2l0Mkd0ay9UZXN0V2ViS2l0QWNjZXNzaWJp
bGl0eSIpCiAKICAgICBkZWYgX3RlYXJfZG93bl90ZXN0aW5nX2Vudmlyb25tZW50KHNlbGYpOgot
ICAgICAgICBpZiBzZWxmLl9zcGlfcmVnaXN0cnlkOgotICAgICAgICAgICAgc2VsZi5fc3BpX3Jl
Z2lzdHJ5ZC50ZXJtaW5hdGUoKQotICAgICAgICBpZiBzZWxmLl9zcGlfYnVzX2xhdW5jaGVyOgot
ICAgICAgICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlci50ZXJtaW5hdGUoKQogICAgICAgICBz
dXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fdGVhcl9kb3duX3Rlc3RpbmdfZW52aXJvbm1lbnQo
KQogCiAgICAgZGVmIGlzX2dsaWJfdGVzdChzZWxmLCB0ZXN0X3Byb2dyYW0pOgo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>436660</attachid>
            <date>2021-08-27 13:02:06 -0700</date>
            <delta_ts>2021-08-27 23:53:26 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-229620-20210827150206.patch</filename>
            <type>text/plain</type>
            <size>6098</size>
            <attacher name="Patrick Griffis">pgriffis</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTZmOWU3NWE5YTAzNTk3YjI5M2MzYWE0OTM4M2RiZWZl
ODljZGZkYy4uZmNkYzMwYzE2OGQ3ZDA1NmIxZDQwOGY4MDAxM2M0YzhjMDkxOTg1ZiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy
IEBACisyMDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor
CisgICAgICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGEx
MXkgc2VydmljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/
aWQ9MjI5NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg
ICAgVGhlIHNlcnZpY2UgaXMgREJ1c0FjdGl2YXRhYmxlIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5z
ZSB0byBtYW51YWxseQorICAgICAgICBmaW5kIGFuZCBzdGFydCBldmVyeSBiaW5hcnkgb3Vyc2Vs
dmVzIGFuZCB0aGVuIHdhaXQgZm9yIHRoZQorICAgICAgICBzZXJ2aWNlIHRvIGFwcGVhci4gV2Ug
Y2FuIHNpbXBseSBjYWxsIGl0IGFuZCBsZXQgdGhlIHN5c3RlbQorICAgICAgICBtYW5hZ2UgdGhl
IHNlcnZpY2UgYXMgaXQgbm9ybWFsbHkgd291bGQgaW4gdGhlIGVudmlyb25tZW50IGl0CisgICAg
ICAgIG5vcm1hbGx5IHdvdWxkLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgor
ICAgICAgICAoR3RrVGVzdFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChHdGtUZXN0UnVubmVy
KToKKyAgICAgICAgKEd0a1Rlc3RSdW5uZXIuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2Vf
aXNfcnVubmluZyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmly
b25tZW50KToKKwogMjAyMS0wOC0yMyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNv
bT4KIAogICAgICAgICBQQ006IFN1cHBvcnQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IHdpdGggbm9u
LXBlcnNpc3RlbnQgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQKZGlmZiAtLWdpdCBh
L1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0
cwppbmRleCAxOWFiODYxYWVlM2NjN2UxZjM1NzY2MDk2ZTBiNWE2NTA2YTEzMDUzLi42ODhmZTIz
ZWY1ZGJlN2Y2ODhhNjlmYjgyYWVhZjQ3YTg4ZjdjYTZjIDEwMDc1NQotLS0gYS9Ub29scy9TY3Jp
cHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0x
OCw3ICsxOCw2IEBACiAjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogCiBpbXBvcnQgbG9n
Z2luZwotaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBvcwogaW1wb3J0IHN5cwogaW1wb3J0IG9w
dHBhcnNlCkBAIC0zOSw2NiArMzgsMjIgQEAgY2xhc3MgR3RrVGVzdFJ1bm5lcihUZXN0UnVubmVy
KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9ucywgdGVzdHM9W10pOgogICAgICAgICBz
dXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fX2luaXRfXygiZ3RrIiwgb3B0aW9ucywgdGVzdHMp
CiAKLSAgICAgICAgIyBUaGVzZSBTUEkgZGFlbW9ucyBuZWVkIHRvIGJlIGFjdGl2ZSBmb3IgdGhl
IGFjY2Vzc2liaWxpdHkgdGVzdHMgdG8gd29yay4KLSAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5
ZCA9IE5vbmUKLSAgICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlciA9IE5vbmUKLQotICAgIGRl
ZiBfbG9va3VwX2F0c3BpMl9iaW5hcnkoc2VsZiwgZmlsZW5hbWUpOgotICAgICAgICBwcmVmaXgg
PSBjb21tb24ucGtnX2NvbmZpZ19maWxlX3ZhcmlhYmxlKCdhdHNwaS0yJywgJ3ByZWZpeCcpCi0g
ICAgICAgIGlmIG5vdCBwcmVmaXg6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBm
b3IgcGF0aCBpbiBbJ2xpYmV4ZWMnLCAnbGliL2F0LXNwaTItY29yZScsICdsaWIzMi9hdC1zcGky
LWNvcmUnLCAnbGliNjQvYXQtc3BpMi1jb3JlJ106Ci0gICAgICAgICAgICBmaWxlcGF0aCA9IG9z
LnBhdGguam9pbihwcmVmaXgsIHBhdGgsIGZpbGVuYW1lKQotICAgICAgICAgICAgaWYgb3MucGF0
aC5pc2ZpbGUoZmlsZXBhdGgpOgotICAgICAgICAgICAgICAgIHJldHVybiBmaWxlcGF0aAotCi0g
ICAgICAgIHJldHVybiBOb25lCi0KLSAgICBkZWYgX3dhaXRfZm9yX2FjY2Vzc2liaWxpdHlfYnVz
KHNlbGYpOgotICAgICAgICBkZWYgdGltZW91dF9hY2Nlc3NpYmlsaXR5X2J1cygpOgotICAgICAg
ICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBGYWxzZQotICAgICAgICAgICAg
c3lzLnN0ZGVyci53cml0ZSgiVGltZW91dCB3YWl0aW5nIGZvciB0aGUgYWNjZXNpYmlsaXR5IGJ1
cy5cbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIGxvb3Au
cXVpdCgpCi0gICAgICAgICMgQmFja3VwIGN1cnJlbnQgZW52aXJvbm1lbnQsIGFuZCB0ZW1wb3Jh
bGx5IHNldCB0aGUgdGVzdCBvbmUuCi0gICAgICAgIG9sZGVudiA9IGRpY3Qob3MuZW52aXJvbikK
LSAgICAgICAgb3MuZW52aXJvbi5jbGVhcigpCi0gICAgICAgIG9zLmVudmlyb24udXBkYXRlKHNl
bGYuX3Rlc3RfZW52KQotICAgICAgICAjIFdlIHNwaW4gYSBtYWluIGxvb3AgdW50aWwgdGhlIGJ1
cyBuYW1lIGFwcGVhcnMgb24gREJ1cy4KLSAgICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNf
Zm91bmQgPSBUcnVlCi0gICAgICAgIGxvb3AgPSBHTGliLk1haW5Mb29wKCkKLSAgICAgICAgR2lv
LmJ1c193YXRjaF9uYW1lKEdpby5CdXNUeXBlLlNFU1NJT04sICdvcmcuYTExeS5CdXMnLCBHaW8u
QnVzTmFtZVdhdGNoZXJGbGFncy5OT05FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFt
YmRhICphcmdzOiBsb29wLnF1aXQoKSwgTm9uZSkKLSAgICAgICAgR0xpYi50aW1lb3V0X2FkZF9z
ZWNvbmRzKDUsIHRpbWVvdXRfYWNjZXNzaWJpbGl0eV9idXMpCi0gICAgICAgIGxvb3AucnVuKCkK
LSAgICAgICAgIyBSZXN0b3JlIHByZXZpb3VzIGVudmlyb25tZW50LgotICAgICAgICBvcy5lbnZp
cm9uLmNsZWFyKCkKLSAgICAgICAgb3MuZW52aXJvbi51cGRhdGUob2xkZW52KQotICAgICAgICBy
ZXR1cm4gc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQKLQotICAgIGRlZiBfc3RhcnRfYWNj
ZXNzaWJpbGl0eV9kYWVtb25zKHNlbGYpOgotICAgICAgICBzcGlfYnVzX2xhdW5jaGVyX3BhdGgg
PSBzZWxmLl9sb29rdXBfYXRzcGkyX2JpbmFyeSgnYXQtc3BpLWJ1cy1sYXVuY2hlcicpCi0gICAg
ICAgIHNwaV9yZWdpc3RyeWRfcGF0aCA9IHNlbGYuX2xvb2t1cF9hdHNwaTJfYmluYXJ5KCdhdC1z
cGkyLXJlZ2lzdHJ5ZCcpCi0gICAgICAgIGlmIG5vdCBzcGlfYnVzX2xhdW5jaGVyX3BhdGggb3Ig
bm90IHNwaV9yZWdpc3RyeWRfcGF0aDoKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAg
ICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuX3NwaV9idXNfbGF1bmNoZXIgPSBzdWJwcm9jZXNz
LlBvcGVuKFtzcGlfYnVzX2xhdW5jaGVyX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCi0gICAg
ICAgIGV4Y2VwdDoKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBsYXVu
Y2ggdGhlIGFjY2Vzc2liaWxpdHkgYnVzXG4iKQotICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVz
aCgpCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICAjIFdlIG5lZWQgdG8gd2Fp
dCB1bnRpbCB0aGUgU1BJIGJ1cyBpcyBsYXVuY2hlZCBiZWZvcmUgdHJ5aW5nIHRvIHN0YXJ0IHRo
ZSBTUEkgcmVnaXN0cnkuCi0gICAgICAgIGlmIG5vdCBzZWxmLl93YWl0X2Zvcl9hY2Nlc3NpYmls
aXR5X2J1cygpOgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIGNoZWNraW5n
IHRoZSBhY2Nlc3NpYmlsaXR5IGJ1cyB3aXRoaW4gRC1CdXNcbiIpCi0gICAgICAgICAgICBzeXMu
c3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCisgICAgZGVmIF9lbnN1
cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcoc2VsZik6CisgICAgICAgICMgVGhl
IGExMXkgc2VydmljZSBpcyBEQnVzIGFjdGl2YXRhYmxlIHNvIHdlIHNpbXBseSBuZWVkIHRvIGNh
bGwgaXQgdG8gZW5zdXJlIGl0CisgICAgICAgICMgaGFzIGJlZW4gc3RhcnRlZC4KICAgICAgICAg
dHJ5OgotICAgICAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IHN1YnByb2Nlc3MuUG9wZW4o
W3NwaV9yZWdpc3RyeWRfcGF0aF0sIGVudj1zZWxmLl90ZXN0X2VudikKLSAgICAgICAgZXhjZXB0
OgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIGxhdW5jaCB0aGUgYWNj
ZXNzaWJpbGl0eSByZWdpc3RyeVxuIikKKyAgICAgICAgICAgIHByb3h5ID0gR2lvLkRCdXNQcm94
eS5uZXdfZm9yX2J1c19zeW5jKEdpby5CdXNUeXBlLlNFU1NJT04sCisgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHaW8uREJ1c1Byb3h5RmxhZ3MuTk9O
RSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5v
bmUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn
b3JnLmExMXkuQnVzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICcvb3JnL2ExMXkvYnVzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICdvcmcuYTExeS5CdXMnLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9uZSkKKworICAgICAgICAgICAgIyBB
ZnRlciB0aGlzIHJldHVybnMgd2Uga25vdyB0aGUgYnVzIGlzIHNldHVwLCB0aGUgcmV0dXJuIHZh
bHVlIGRvZXNuJ3QgbWF0dGVyLgorICAgICAgICAgICAgcHJveHkuR2V0QWRkcmVzcygpCisgICAg
ICAgIGV4Y2VwdCBHTGliLkVycm9yIGFzIGU6CisgICAgICAgICAgICBzeXMuc3RkZXJyLndyaXRl
KCJGYWlsZWQgdG8gdGFsayB0byB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlOiB7fVxuIi5mb3Jt
YXQoZS5tZXNzYWdlKSkKICAgICAgICAgICAgIHN5cy5zdGRlcnIuZmx1c2goKQogICAgICAgICAg
ICAgcmV0dXJuIEZhbHNlCiAKQEAgLTEwOCwxNSArNjMsMTEgQEAgY2xhc3MgR3RrVGVzdFJ1bm5l
cihUZXN0UnVubmVyKToKICAgICAgICAgc3VwZXIoR3RrVGVzdFJ1bm5lciwgc2VsZikuX3NldHVw
X3Rlc3RpbmdfZW52aXJvbm1lbnQoKQogCiAgICAgICAgICMgSWYgd2UgY2Fubm90IHN0YXJ0IHRo
ZSBhY2Nlc3NpYmlsaXR5IGRhZW1vbnMsIHdlIGNhbiBqdXN0IHNraXAgdGhlIGFjY2Vzc2liaWxp
dHkgdGVzdHMuCi0gICAgICAgIGlmIG5vdCBzZWxmLl9zdGFydF9hY2Nlc3NpYmlsaXR5X2RhZW1v
bnMoKToKKyAgICAgICAgaWYgbm90IHNlbGYuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2Vf
aXNfcnVubmluZygpOgogICAgICAgICAgICAgcHJpbnQoIkNvdWxkIG5vdCBzdGFydCBhY2Nlc3Np
YmlsaXR5IGJ1cywgc28gZGlzYWJsaW5nIFRlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5IikKICAgICAg
ICAgICAgIHNlbGYuX2Rpc2FibGVkX3Rlc3RzLmFwcGVuZCgiV2ViS2l0Mkd0ay9UZXN0V2ViS2l0
QWNjZXNzaWJpbGl0eSIpCiAKICAgICBkZWYgX3RlYXJfZG93bl90ZXN0aW5nX2Vudmlyb25tZW50
KHNlbGYpOgotICAgICAgICBpZiBzZWxmLl9zcGlfcmVnaXN0cnlkOgotICAgICAgICAgICAgc2Vs
Zi5fc3BpX3JlZ2lzdHJ5ZC50ZXJtaW5hdGUoKQotICAgICAgICBpZiBzZWxmLl9zcGlfYnVzX2xh
dW5jaGVyOgotICAgICAgICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlci50ZXJtaW5hdGUoKQog
ICAgICAgICBzdXBlcihHdGtUZXN0UnVubmVyLCBzZWxmKS5fdGVhcl9kb3duX3Rlc3RpbmdfZW52
aXJvbm1lbnQoKQogCiAgICAgZGVmIGlzX2dsaWJfdGVzdChzZWxmLCB0ZXN0X3Byb2dyYW0pOgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>