<?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>205875</bug_id>
          
          <creation_ts>2020-01-07 11:38:19 -0800</creation_ts>
          <short_desc>run-webkit-tests: clobber-old-results should remove the entire results folder</short_desc>
          <delta_ts>2020-01-28 08:46:36 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</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>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          <dependson>205981</dependson>
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jonathan Bedard">jbedard</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>ap</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>slewis</cc>
    
    <cc>tsavell</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1603688</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 11:38:19 -0800</bug_when>
    <thetext>In automation, we want to clear out the entirety of the results folder when --clobber-old-results is passed. In particular, we want to remove timeout and crash logs.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603689</commentid>
    <comment_count>1</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 11:38:56 -0800</bug_when>
    <thetext>&lt;rdar://problem/58236117&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603692</commentid>
    <comment_count>2</comment_count>
      <attachid>387007</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 11:42:20 -0800</bug_when>
    <thetext>Created attachment 387007
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603765</commentid>
    <comment_count>3</comment_count>
      <attachid>387007</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-01-07 13:53:34 -0800</bug_when>
    <thetext>Comment on attachment 387007
Patch

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

&gt; Tools/ChangeLog:3
&gt; +        run-webki-tests: clobber-old-results should remove the entire results folder

run-webkit-tests

&gt; Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:-462
&gt; -        # files in the results directory are explicitly used for cross-run
&gt; -        # tracking.

What is this &quot;cross-run tracking&quot;? Is it about saving results for a retry?

Without having thought about the code much, I wonder if the patch makes it so that orginal results will be deleted when using --retry (which is the default).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603766</commentid>
    <comment_count>4</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-01-07 13:53:55 -0800</bug_when>
    <thetext>Or when running iPad tests after the main suite.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603781</commentid>
    <comment_count>5</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 14:08:37 -0800</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #3)
&gt; Comment on attachment 387007 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=387007&amp;action=review
&gt; 
&gt; &gt; Tools/ChangeLog:3
&gt; &gt; +        run-webki-tests: clobber-old-results should remove the entire results folder
&gt; 
&gt; run-webkit-tests
&gt; 
&gt; &gt; Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:-462
&gt; &gt; -        # files in the results directory are explicitly used for cross-run
&gt; &gt; -        # tracking.
&gt; 
&gt; What is this &quot;cross-run tracking&quot;? Is it about saving results for a retry?
&gt; 
&gt; Without having thought about the code much, I wonder if the patch makes it
&gt; so that orginal results will be deleted when using --retry (which is the
&gt; default).

I&apos;m not really sure what this was originally referring to, but I can&apos;t see it being anything except undesirable when passing --clobber-old-results.

_clobber_old_results is run before all the rounds, so this doesn&apos;t effect results on iOS where we have separate iPhone/iPad rounds.

Another approach we could take its only deleting crashlogs, python stack traces and spindumps instead of the entire directory. The problem with that approach is that I still can&apos;t think of a reason why keeping any result data between tests would ever be useful in infrastructure, especially since sometimes we build out of order.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603786</commentid>
    <comment_count>6</comment_count>
      <attachid>387032</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 14:19:05 -0800</bug_when>
    <thetext>Created attachment 387032
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603795</commentid>
    <comment_count>7</comment_count>
      <attachid>387032</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-01-07 14:32:51 -0800</bug_when>
    <thetext>Comment on attachment 387032
Patch

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

Yes, I also don&apos;t remember any files or run-webkit-tests modes where we wanted to keep any files in the results directory between invocations.

&gt; Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:628
&gt; -        # Now we test that --clobber-old-results does remove the old entries and the old retries,
&gt; -        # and that we don&apos;t retry again.
&gt; +        # Now we test that --clobber-old-results does remove the old entries and the old retries

Please keep the period at the end of the sentence.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603801</commentid>
    <comment_count>8</comment_count>
      <attachid>387035</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-07 14:41:06 -0800</bug_when>
    <thetext>Created attachment 387035
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603842</commentid>
    <comment_count>9</comment_count>
      <attachid>387035</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-07 15:54:42 -0800</bug_when>
    <thetext>Comment on attachment 387035
Patch for landing

Clearing flags on attachment: 387035

Committed r254165: &lt;https://trac.webkit.org/changeset/254165&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603843</commentid>
    <comment_count>10</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-07 15:54:43 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1603874</commentid>
    <comment_count>11</comment_count>
    <who name="Truitt Savell">tsavell</who>
    <bug_when>2020-01-07 16:41:40 -0800</bug_when>
    <thetext>Reverted r254165 for reason:

Caused 500+ missing results on Mac

Committed r254176: &lt;https://trac.webkit.org/changeset/254176&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604081</commentid>
    <comment_count>12</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-08 07:11:37 -0800</bug_when>
    <thetext>I guess we have our answer. We are using the previous test results to detect when certain tests (compositing, in particular) change their output. This seems like a very unstable way of doing things.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604255</commentid>
    <comment_count>13</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-08 13:33:32 -0800</bug_when>
    <thetext>(In reply to Jonathan Bedard from comment #12)
&gt; I guess we have our answer. We are using the previous test results to detect
&gt; when certain tests (compositing, in particular) change their output. This
&gt; seems like a very unstable way of doing things.

Probably would have helped to actually delete the right thing.

The previous patch was deleting WebKit/LayoutTests instead of WebKit/build/*/layout-test-results.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604257</commentid>
    <comment_count>14</comment_count>
      <attachid>387134</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-08 13:36:23 -0800</bug_when>
    <thetext>Created attachment 387134
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604362</commentid>
    <comment_count>15</comment_count>
      <attachid>387134</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-08 16:31:06 -0800</bug_when>
    <thetext>Comment on attachment 387134
Patch

Clearing flags on attachment: 387134

Committed r254235: &lt;https://trac.webkit.org/changeset/254235&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604363</commentid>
    <comment_count>16</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-08 16:31:08 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604447</commentid>
    <comment_count>17</comment_count>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-01-08 18:19:50 -0800</bug_when>
    <thetext>This seems to have broken the layout-tests completely.

https://build.webkit.org/builders/Apple%20High%20Sierra%20Release%20WK1%20%28Tests%29/builds/18157

https://build.webkit.org/builders/Apple%20Mojave%20Release%20WK2%20%28Tests%29/builds/9327

17:22:50.857 39532 Stopping HTTP server ...
17:22:50.859 39532 Attempting to shut down httpd server at pid 39550

ServerError raised: Failed to stop httpd: httpd: Could not open configuration file /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/httpd.conf: No such file or directory
 (exit code=None)
Traceback (most recent call last):
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py&quot;, line 91, in main
    run_details = run(port, options, args, stderr)
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py&quot;, line 485, in run
    run_details = manager.run(args)
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py&quot;, line 314, in run
    self._runner.stop_servers()
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py&quot;, line 230, in stop_servers
    self._port.stop_http_server()
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/port/base.py&quot;, line 1063, in stop_http_server
    self._http_server.stop()
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py&quot;, line 134, in stop
    self._stop_running_server()
  File &quot;/Volumes/Data/slave/mojave-release-tests-wk2/build/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py&quot;, line 209, in _stop_running_server
    raise self._server_error(&apos;Failed to stop %s&apos; % self._name, err, retval)
ServerError: Failed to stop httpd: httpd: Could not open configuration file /Volumes/Data/slave/mojave-release-tests-wk2/build/layout-test-results/httpd.conf: No such file or directory
 (exit code=None)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604450</commentid>
    <comment_count>18</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-08 18:21:44 -0800</bug_when>
    <thetext>Re-opened since this is blocked by bug 205981</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604483</commentid>
    <comment_count>19</comment_count>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-01-08 19:55:04 -0800</bug_when>
    <thetext>Next time, please wait for EWS.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604625</commentid>
    <comment_count>20</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-09 07:53:56 -0800</bug_when>
    <thetext>Sorry about that....we apparently clobber results after starting the HTTP server.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1604634</commentid>
    <comment_count>21</comment_count>
      <attachid>387232</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-09 08:17:17 -0800</bug_when>
    <thetext>Created attachment 387232
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1611680</commentid>
    <comment_count>22</comment_count>
      <attachid>387232</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-01-27 16:08:51 -0800</bug_when>
    <thetext>Comment on attachment 387232
Patch

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

&gt; Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:460
&gt; +        self._printer.write_update(&quot;Clobbering all results in {}&quot;.format(self._results_directory))

I think that you can just as well say &quot;deleting directory&quot; now, as it&apos;s no longer about just results.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1611709</commentid>
    <comment_count>23</comment_count>
      <attachid>388941</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-27 16:56:12 -0800</bug_when>
    <thetext>Created attachment 388941
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1611720</commentid>
    <comment_count>24</comment_count>
      <attachid>388945</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-01-27 17:13:34 -0800</bug_when>
    <thetext>Created attachment 388945
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1611947</commentid>
    <comment_count>25</comment_count>
      <attachid>388945</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-28 08:46:34 -0800</bug_when>
    <thetext>Comment on attachment 388945
Patch

Clearing flags on attachment: 388945

Committed r255240: &lt;https://trac.webkit.org/changeset/255240&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1611948</commentid>
    <comment_count>26</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-01-28 08:46:36 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>387007</attachid>
            <date>2020-01-07 11:42:20 -0800</date>
            <delta_ts>2020-01-07 14:19:03 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200107114220.patch</filename>
            <type>text/plain</type>
            <size>3722</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NDE0MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTAxLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2ktdGVzdHM6IGNsb2JiZXItb2xkLXJlc3VsdHMgc2hvdWxk
IHJlbW92ZSB0aGUgZW50aXJlIHJlc3VsdHMgZm9sZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53
ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU4NzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt
LzU4MjM2MTE3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg
ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w
eToKKyAgICAgICAgKE1hbmFnZXIuX2Nsb2JiZXJfb2xkX3Jlc3VsdHMpOiBSZW1vdmUgZW50aXJl
IHJlc3VsdHMgZm9sZGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz
L3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVuVGVzdC50
ZXN0X3JldHJ5aW5nX2FuZF9mbGFreV90ZXN0cyk6IGNsb2JiZXItb2xkLXJlc3VsdHMgbm93IHJl
bW92ZXMgdGhlCisgICAgICAgIGVudGlyZSByZXN1bHRzIGRpcmVjdG9yeS4KKwogMjAyMC0wMS0w
NyAgQmFzdWtlIFN1enVraSAgPGJhc3VrZS5zdXp1a2lAc29ueS5jb20+CiAKICAgICAgICAgY2hl
Y2std2Via2l0LXN0eWxlOiBibWFsbG9jIGRvZXNuJ3QgdXNlIGNvbmZpZy5oCkluZGV4OiBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0
aW9udGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90
ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQkocmV2aXNpb24gMjU0MTQx
KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0
c19pbnRlZ3JhdGlvbnRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTYyNSwxMSArNjI1LDEwIEBA
IGNsYXNzIFJ1blRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKICAgICAgICAgc2VsZi5h
c3NlcnRUcnVlKGhvc3QuZmlsZXN5c3RlbS5leGlzdHMoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0
cy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVhbC50eHQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRG
YWxzZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMvcmV0
cmllcy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVhbC50eHQnKSkKIAotICAgICAgICAjIE5vdyB3
ZSB0ZXN0IHRoYXQgLS1jbG9iYmVyLW9sZC1yZXN1bHRzIGRvZXMgcmVtb3ZlIHRoZSBvbGQgZW50
cmllcyBhbmQgdGhlIG9sZCByZXRyaWVzLAotICAgICAgICAjIGFuZCB0aGF0IHdlIGRvbid0IHJl
dHJ5IGFnYWluLgorICAgICAgICAjIE5vdyB3ZSB0ZXN0IHRoYXQgLS1jbG9iYmVyLW9sZC1yZXN1
bHRzIGRvZXMgcmVtb3ZlIHRoZSBvbGQgZW50cmllcyBhbmQgdGhlIG9sZCByZXRyaWVzCiAgICAg
ICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIGRldGFpbHMsIGVyciwgXyA9IGxvZ2dpbmdf
cnVuKFsnLS1uby1yZXRyeS1mYWlsdXJlcycsICctLWNsb2JiZXItb2xkLXJlc3VsdHMnLCAnZmFp
bHVyZXMvZmxha3knXSwgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgaG9zdD1ob3N0KQotICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKGRldGFpbHMuZXhpdF9jb2RlLCAxKQorICAgICAgICBzZWxmLmFzc2Vy
dEVxdWFsKGRldGFpbHMuZXhpdF9jb2RlLCAwKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJ0Ns
b2JiZXJpbmcgb2xkIHJlc3VsdHMnIGluIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFz
c2VydFRydWUoJ2ZsYWt5L3RleHQuaHRtbCcgaW4gZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNl
bGYuYXNzZXJ0VHJ1ZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcvdG1wL2xheW91dC10ZXN0LXJl
c3VsdHMvZmFpbHVyZXMvZmxha3kvdGV4dC1hY3R1YWwudHh0JykpCkluZGV4OiBUb29scy9TY3Jp
cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h
bmFnZXIucHkJKHJldmlzaW9uIDI1NDE0MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5
b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ1Nywx
NiArNDU3LDEwIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICAgICAg
X2xvZy5kZWJ1ZygiQWRkaW5nIHJlc3VsdHMgZm9yIG90aGVyIGNyYXNoOiAiICsgc3RyKHRlc3Qp
KQogCiAgICAgZGVmIF9jbG9iYmVyX29sZF9yZXN1bHRzKHNlbGYpOgotICAgICAgICAjIEp1c3Qg
Y2xvYmJlciB0aGUgYWN0dWFsIHRlc3QgcmVzdWx0cyBkaXJlY3RvcmllcyBzaW5jZSB0aGUgb3Ro
ZXIKLSAgICAgICAgIyBmaWxlcyBpbiB0aGUgcmVzdWx0cyBkaXJlY3RvcnkgYXJlIGV4cGxpY2l0
bHkgdXNlZCBmb3IgY3Jvc3MtcnVuCi0gICAgICAgICMgdHJhY2tpbmcuCi0gICAgICAgIHNlbGYu
X3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDbG9iYmVyaW5nIG9sZCByZXN1bHRzIGluICVzIiAlCi0g
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5
KQorICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgiQ2xvYmJlcmluZyBvbGQgcmVz
dWx0cyBpbiAlcyIgJSBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSkKICAgICAgICAgbGF5b3V0X3Rl
c3RzX2RpciA9IHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpCi0gICAgICAgIHBvc3NpYmxl
X2RpcnMgPSBzZWxmLl9wb3J0LnRlc3RfZGlycygpCi0gICAgICAgIGZvciBkaXJuYW1lIGluIHBv
c3NpYmxlX2RpcnM6Ci0gICAgICAgICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmlzZGlyKHNlbGYu
X2ZpbGVzeXN0ZW0uam9pbihsYXlvdXRfdGVzdHNfZGlyLCBkaXJuYW1lKSk6Ci0gICAgICAgICAg
ICAgICAgc2VsZi5fZmlsZXN5c3RlbS5ybXRyZWUoc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYu
X3Jlc3VsdHNfZGlyZWN0b3J5LCBkaXJuYW1lKSkKKyAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3Rl
bS5pc2RpcihsYXlvdXRfdGVzdHNfZGlyKToKKyAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0u
cm10cmVlKGxheW91dF90ZXN0c19kaXIpCiAKICAgICBkZWYgX3Rlc3RzX3RvX3JldHJ5KHNlbGYs
IHJ1bl9yZXN1bHRzLCBpbmNsdWRlX2NyYXNoZXMpOgogICAgICAgICByZXR1cm4gW3Jlc3VsdC50
ZXN0X25hbWUgZm9yIHJlc3VsdCBpbiBydW5fcmVzdWx0cy51bmV4cGVjdGVkX3Jlc3VsdHNfYnlf
bmFtZS52YWx1ZXMoKSBpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>387032</attachid>
            <date>2020-01-07 14:19:05 -0800</date>
            <delta_ts>2020-01-07 14:41:04 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200107141904.patch</filename>
            <type>text/plain</type>
            <size>3723</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NDE0MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTAxLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu
cHk6CisgICAgICAgIChNYW5hZ2VyLl9jbG9iYmVyX29sZF9yZXN1bHRzKTogUmVtb3ZlIGVudGly
ZSByZXN1bHRzIGZvbGRlci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0
cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weToKKyAgICAgICAgKFJ1blRlc3Qu
dGVzdF9yZXRyeWluZ19hbmRfZmxha3lfdGVzdHMpOiBjbG9iYmVyLW9sZC1yZXN1bHRzIG5vdyBy
ZW1vdmVzIHRoZQorICAgICAgICBlbnRpcmUgcmVzdWx0cyBkaXJlY3RvcnkuCisKIDIwMjAtMDEt
MDcgIEJhc3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgogCiAgICAgICAgIGNo
ZWNrLXdlYmtpdC1zdHlsZTogYm1hbGxvYyBkb2Vzbid0IHVzZSBjb25maWcuaApJbmRleDogVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3Jh
dGlvbnRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf
dGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkJKHJldmlzaW9uIDI1NDE0
MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz
dHNfaW50ZWdyYXRpb250ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MjUsMTEgKzYyNSwxMCBA
QCBjbGFzcyBSdW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UCiAgICAgICAgIHNlbGYu
YXNzZXJ0VHJ1ZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcvdG1wL2xheW91dC10ZXN0LXJlc3Vs
dHMvZmFpbHVyZXMvZmxha3kvdGV4dC1hY3R1YWwudHh0JykpCiAgICAgICAgIHNlbGYuYXNzZXJ0
RmFsc2UoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Jl
dHJpZXMvZmFpbHVyZXMvZmxha3kvdGV4dC1hY3R1YWwudHh0JykpCiAKLSAgICAgICAgIyBOb3cg
d2UgdGVzdCB0aGF0IC0tY2xvYmJlci1vbGQtcmVzdWx0cyBkb2VzIHJlbW92ZSB0aGUgb2xkIGVu
dHJpZXMgYW5kIHRoZSBvbGQgcmV0cmllcywKLSAgICAgICAgIyBhbmQgdGhhdCB3ZSBkb24ndCBy
ZXRyeSBhZ2Fpbi4KKyAgICAgICAgIyBOb3cgd2UgdGVzdCB0aGF0IC0tY2xvYmJlci1vbGQtcmVz
dWx0cyBkb2VzIHJlbW92ZSB0aGUgb2xkIGVudHJpZXMgYW5kIHRoZSBvbGQgcmV0cmllcwogICAg
ICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAgICAgICBkZXRhaWxzLCBlcnIsIF8gPSBsb2dnaW5n
X3J1bihbJy0tbm8tcmV0cnktZmFpbHVyZXMnLCAnLS1jbG9iYmVyLW9sZC1yZXN1bHRzJywgJ2Zh
aWx1cmVzL2ZsYWt5J10sIHRlc3RzX2luY2x1ZGVkPVRydWUsIGhvc3Q9aG9zdCkKLSAgICAgICAg
c2VsZi5hc3NlcnRFcXVhbChkZXRhaWxzLmV4aXRfY29kZSwgMSkKKyAgICAgICAgc2VsZi5hc3Nl
cnRFcXVhbChkZXRhaWxzLmV4aXRfY29kZSwgMCkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdD
bG9iYmVyaW5nIG9sZCByZXN1bHRzJyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5h
c3NlcnRUcnVlKCdmbGFreS90ZXh0Lmh0bWwnIGluIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBz
ZWxmLmFzc2VydFRydWUoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygnL3RtcC9sYXlvdXQtdGVzdC1y
ZXN1bHRzL2ZhaWx1cmVzL2ZsYWt5L3RleHQtYWN0dWFsLnR4dCcpKQpJbmRleDogVG9vbHMvU2Ny
aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t
YW5hZ2VyLnB5CShyZXZpc2lvbiAyNTQxNDEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh
eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00NTcs
MTYgKzQ1NywxMCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAg
IF9sb2cuZGVidWcoIkFkZGluZyByZXN1bHRzIGZvciBvdGhlciBjcmFzaDogIiArIHN0cih0ZXN0
KSkKIAogICAgIGRlZiBfY2xvYmJlcl9vbGRfcmVzdWx0cyhzZWxmKToKLSAgICAgICAgIyBKdXN0
IGNsb2JiZXIgdGhlIGFjdHVhbCB0ZXN0IHJlc3VsdHMgZGlyZWN0b3JpZXMgc2luY2UgdGhlIG90
aGVyCi0gICAgICAgICMgZmlsZXMgaW4gdGhlIHJlc3VsdHMgZGlyZWN0b3J5IGFyZSBleHBsaWNp
dGx5IHVzZWQgZm9yIGNyb3NzLXJ1bgotICAgICAgICAjIHRyYWNraW5nLgotICAgICAgICBzZWxm
Ll9wcmludGVyLndyaXRlX3VwZGF0ZSgiQ2xvYmJlcmluZyBvbGQgcmVzdWx0cyBpbiAlcyIgJQot
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9y
eSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNsb2JiZXJpbmcgb2xkIHJl
c3VsdHMgaW4gJXMiICUgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpCiAgICAgICAgIGxheW91dF90
ZXN0c19kaXIgPSBzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKQotICAgICAgICBwb3NzaWJs
ZV9kaXJzID0gc2VsZi5fcG9ydC50ZXN0X2RpcnMoKQotICAgICAgICBmb3IgZGlybmFtZSBpbiBw
b3NzaWJsZV9kaXJzOgotICAgICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5pc2RpcihzZWxm
Ll9maWxlc3lzdGVtLmpvaW4obGF5b3V0X3Rlc3RzX2RpciwgZGlybmFtZSkpOgotICAgICAgICAg
ICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucm10cmVlKHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxm
Ll9yZXN1bHRzX2RpcmVjdG9yeSwgZGlybmFtZSkpCisgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0
ZW0uaXNkaXIobGF5b3V0X3Rlc3RzX2Rpcik6CisgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVt
LnJtdHJlZShsYXlvdXRfdGVzdHNfZGlyKQogCiAgICAgZGVmIF90ZXN0c190b19yZXRyeShzZWxm
LCBydW5fcmVzdWx0cywgaW5jbHVkZV9jcmFzaGVzKToKICAgICAgICAgcmV0dXJuIFtyZXN1bHQu
dGVzdF9uYW1lIGZvciByZXN1bHQgaW4gcnVuX3Jlc3VsdHMudW5leHBlY3RlZF9yZXN1bHRzX2J5
X25hbWUudmFsdWVzKCkgaWYK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>387035</attachid>
            <date>2020-01-07 14:41:06 -0800</date>
            <delta_ts>2020-01-08 13:36:21 -0800</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-205875-20200107144105.patch</filename>
            <type>text/plain</type>
            <size>3729</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NDE0MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTAxLTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgor
CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu
YWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX2Nsb2JiZXJfb2xkX3Jlc3VsdHMpOiBSZW1vdmUg
ZW50aXJlIHJlc3VsdHMgZm9sZGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0
X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVu
VGVzdC50ZXN0X3JldHJ5aW5nX2FuZF9mbGFreV90ZXN0cyk6IGNsb2JiZXItb2xkLXJlc3VsdHMg
bm93IHJlbW92ZXMgdGhlCisgICAgICAgIGVudGlyZSByZXN1bHRzIGRpcmVjdG9yeS4KKwogMjAy
MC0wMS0wNyAgQmFzdWtlIFN1enVraSAgPGJhc3VrZS5zdXp1a2lAc29ueS5jb20+CiAKICAgICAg
ICAgY2hlY2std2Via2l0LXN0eWxlOiBibWFsbG9jIGRvZXNuJ3QgdXNlIGNvbmZpZy5oCkluZGV4
OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2lu
dGVncmF0aW9udGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh
eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQkocmV2aXNpb24g
MjU0MTQxKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp
dF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTYyNSwxMSArNjI1
LDEwIEBAIGNsYXNzIFJ1blRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKICAgICAgICAg
c2VsZi5hc3NlcnRUcnVlKGhvc3QuZmlsZXN5c3RlbS5leGlzdHMoJy90bXAvbGF5b3V0LXRlc3Qt
cmVzdWx0cy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVhbC50eHQnKSkKICAgICAgICAgc2VsZi5h
c3NlcnRGYWxzZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcvdG1wL2xheW91dC10ZXN0LXJlc3Vs
dHMvcmV0cmllcy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVhbC50eHQnKSkKIAotICAgICAgICAj
IE5vdyB3ZSB0ZXN0IHRoYXQgLS1jbG9iYmVyLW9sZC1yZXN1bHRzIGRvZXMgcmVtb3ZlIHRoZSBv
bGQgZW50cmllcyBhbmQgdGhlIG9sZCByZXRyaWVzLAotICAgICAgICAjIGFuZCB0aGF0IHdlIGRv
bid0IHJldHJ5IGFnYWluLgorICAgICAgICAjIE5vdyB3ZSB0ZXN0IHRoYXQgLS1jbG9iYmVyLW9s
ZC1yZXN1bHRzIGRvZXMgcmVtb3ZlIHRoZSBvbGQgZW50cmllcyBhbmQgdGhlIG9sZCByZXRyaWVz
LgogICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAgICAgICBkZXRhaWxzLCBlcnIsIF8gPSBs
b2dnaW5nX3J1bihbJy0tbm8tcmV0cnktZmFpbHVyZXMnLCAnLS1jbG9iYmVyLW9sZC1yZXN1bHRz
JywgJ2ZhaWx1cmVzL2ZsYWt5J10sIHRlc3RzX2luY2x1ZGVkPVRydWUsIGhvc3Q9aG9zdCkKLSAg
ICAgICAgc2VsZi5hc3NlcnRFcXVhbChkZXRhaWxzLmV4aXRfY29kZSwgMSkKKyAgICAgICAgc2Vs
Zi5hc3NlcnRFcXVhbChkZXRhaWxzLmV4aXRfY29kZSwgMCkKICAgICAgICAgc2VsZi5hc3NlcnRU
cnVlKCdDbG9iYmVyaW5nIG9sZCByZXN1bHRzJyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAg
c2VsZi5hc3NlcnRUcnVlKCdmbGFreS90ZXh0Lmh0bWwnIGluIGVyci5nZXR2YWx1ZSgpKQogICAg
ICAgICBzZWxmLmFzc2VydFRydWUoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygnL3RtcC9sYXlvdXQt
dGVzdC1yZXN1bHRzL2ZhaWx1cmVzL2ZsYWt5L3RleHQtYWN0dWFsLnR4dCcpKQpJbmRleDogVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s
bGVycy9tYW5hZ2VyLnB5CShyZXZpc2lvbiAyNTQxNDEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp
dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBA
IC00NTcsMTYgKzQ1NywxMCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAg
ICAgICAgIF9sb2cuZGVidWcoIkFkZGluZyByZXN1bHRzIGZvciBvdGhlciBjcmFzaDogIiArIHN0
cih0ZXN0KSkKIAogICAgIGRlZiBfY2xvYmJlcl9vbGRfcmVzdWx0cyhzZWxmKToKLSAgICAgICAg
IyBKdXN0IGNsb2JiZXIgdGhlIGFjdHVhbCB0ZXN0IHJlc3VsdHMgZGlyZWN0b3JpZXMgc2luY2Ug
dGhlIG90aGVyCi0gICAgICAgICMgZmlsZXMgaW4gdGhlIHJlc3VsdHMgZGlyZWN0b3J5IGFyZSBl
eHBsaWNpdGx5IHVzZWQgZm9yIGNyb3NzLXJ1bgotICAgICAgICAjIHRyYWNraW5nLgotICAgICAg
ICBzZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgiQ2xvYmJlcmluZyBvbGQgcmVzdWx0cyBpbiAl
cyIgJQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9yZXN1bHRzX2Rp
cmVjdG9yeSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNsb2JiZXJpbmcg
b2xkIHJlc3VsdHMgaW4gJXMiICUgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpCiAgICAgICAgIGxh
eW91dF90ZXN0c19kaXIgPSBzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKQotICAgICAgICBw
b3NzaWJsZV9kaXJzID0gc2VsZi5fcG9ydC50ZXN0X2RpcnMoKQotICAgICAgICBmb3IgZGlybmFt
ZSBpbiBwb3NzaWJsZV9kaXJzOgotICAgICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5pc2Rp
cihzZWxmLl9maWxlc3lzdGVtLmpvaW4obGF5b3V0X3Rlc3RzX2RpciwgZGlybmFtZSkpOgotICAg
ICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucm10cmVlKHNlbGYuX2ZpbGVzeXN0ZW0uam9p
bihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgZGlybmFtZSkpCisgICAgICAgIGlmIHNlbGYuX2Zp
bGVzeXN0ZW0uaXNkaXIobGF5b3V0X3Rlc3RzX2Rpcik6CisgICAgICAgICAgICBzZWxmLl9maWxl
c3lzdGVtLnJtdHJlZShsYXlvdXRfdGVzdHNfZGlyKQogCiAgICAgZGVmIF90ZXN0c190b19yZXRy
eShzZWxmLCBydW5fcmVzdWx0cywgaW5jbHVkZV9jcmFzaGVzKToKICAgICAgICAgcmV0dXJuIFty
ZXN1bHQudGVzdF9uYW1lIGZvciByZXN1bHQgaW4gcnVuX3Jlc3VsdHMudW5leHBlY3RlZF9yZXN1
bHRzX2J5X25hbWUudmFsdWVzKCkgaWYK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>387134</attachid>
            <date>2020-01-08 13:36:23 -0800</date>
            <delta_ts>2020-01-09 08:17:04 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200108133622.patch</filename>
            <type>text/plain</type>
            <size>3341</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NDIyMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTAxLTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu
cHk6CisgICAgICAgIChNYW5hZ2VyLl9jbG9iYmVyX29sZF9yZXN1bHRzKTogUmVtb3ZlIGVudGly
ZSByZXN1bHRzIGZvbGRlci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0
cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weToKKyAgICAgICAgKFJ1blRlc3Qu
dGVzdF9yZXRyeWluZ19hbmRfZmxha3lfdGVzdHMpOiBjbG9iYmVyLW9sZC1yZXN1bHRzIG5vdyBy
ZW1vdmVzIHRoZQorICAgICAgICBlbnRpcmUgcmVzdWx0cyBkaXJlY3RvcnkuCisKIDIwMjAtMDEt
MDggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Np
b24gcjI1NDE2MDogNiBBUEkgdGVzdCBmYWlsdXJlcwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr
aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp
dF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkJKHJldmlzaW9uIDI1NDIxOSkKKysrIFRvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250
ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02MzAsNyArNjMwLDcgQEAgY2xhc3MgUnVuVGVzdCh1
bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVAogICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQogICAg
ICAgICBkZXRhaWxzLCBlcnIsIF8gPSBsb2dnaW5nX3J1bihbJy0tbm8tcmV0cnktZmFpbHVyZXMn
LCAnLS1jbG9iYmVyLW9sZC1yZXN1bHRzJywgJ2ZhaWx1cmVzL2ZsYWt5J10sIHRlc3RzX2luY2x1
ZGVkPVRydWUsIGhvc3Q9aG9zdCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkZXRhaWxzLmV4
aXRfY29kZSwgMSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdDbG9iYmVyaW5nIG9sZCByZXN1
bHRzJyBpbiBlcnIuZ2V0dmFsdWUoKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdDbG9iYmVy
aW5nIGFsbCByZXN1bHRzJyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRU
cnVlKCdmbGFreS90ZXh0Lmh0bWwnIGluIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFz
c2VydFRydWUoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRz
L2ZhaWx1cmVzL2ZsYWt5L3RleHQtYWN0dWFsLnR4dCcpKQogICAgICAgICBzZWxmLmFzc2VydEZh
bHNlKGhvc3QuZmlsZXN5c3RlbS5leGlzdHMoJ3JldHJpZXMnKSkKSW5kZXg6IFRvb2xzL1Njcmlw
dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu
YWdlci5weQkocmV2aXNpb24gMjU0MjE5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv
dXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQkod29ya2luZyBjb3B5KQpAQCAtNDU3LDE2
ICs0NTcsOSBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIF9s
b2cuZGVidWcoIkFkZGluZyByZXN1bHRzIGZvciBvdGhlciBjcmFzaDogIiArIHN0cih0ZXN0KSkK
IAogICAgIGRlZiBfY2xvYmJlcl9vbGRfcmVzdWx0cyhzZWxmKToKLSAgICAgICAgIyBKdXN0IGNs
b2JiZXIgdGhlIGFjdHVhbCB0ZXN0IHJlc3VsdHMgZGlyZWN0b3JpZXMgc2luY2UgdGhlIG90aGVy
Ci0gICAgICAgICMgZmlsZXMgaW4gdGhlIHJlc3VsdHMgZGlyZWN0b3J5IGFyZSBleHBsaWNpdGx5
IHVzZWQgZm9yIGNyb3NzLXJ1bgotICAgICAgICAjIHRyYWNraW5nLgotICAgICAgICBzZWxmLl9w
cmludGVyLndyaXRlX3VwZGF0ZSgiQ2xvYmJlcmluZyBvbGQgcmVzdWx0cyBpbiAlcyIgJQotICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSkK
LSAgICAgICAgbGF5b3V0X3Rlc3RzX2RpciA9IHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2Rpcigp
Ci0gICAgICAgIHBvc3NpYmxlX2RpcnMgPSBzZWxmLl9wb3J0LnRlc3RfZGlycygpCi0gICAgICAg
IGZvciBkaXJuYW1lIGluIHBvc3NpYmxlX2RpcnM6Ci0gICAgICAgICAgICBpZiBzZWxmLl9maWxl
c3lzdGVtLmlzZGlyKHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihsYXlvdXRfdGVzdHNfZGlyLCBkaXJu
YW1lKSk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5ybXRyZWUoc2VsZi5fZmls
ZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBkaXJuYW1lKSkKKyAgICAgICAg
c2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNsb2JiZXJpbmcgYWxsIHJlc3VsdHMgaW4ge30i
LmZvcm1hdChzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSkpCisgICAgICAgIGlmIHNlbGYuX2ZpbGVz
eXN0ZW0uaXNkaXIoc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpOgorICAgICAgICAgICAgc2VsZi5f
ZmlsZXN5c3RlbS5ybXRyZWUoc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpCiAKICAgICBkZWYgX3Rl
c3RzX3RvX3JldHJ5KHNlbGYsIHJ1bl9yZXN1bHRzLCBpbmNsdWRlX2NyYXNoZXMpOgogICAgICAg
ICByZXR1cm4gW3Jlc3VsdC50ZXN0X25hbWUgZm9yIHJlc3VsdCBpbiBydW5fcmVzdWx0cy51bmV4
cGVjdGVkX3Jlc3VsdHNfYnlfbmFtZS52YWx1ZXMoKSBpZgo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>387232</attachid>
            <date>2020-01-09 08:17:17 -0800</date>
            <delta_ts>2020-01-27 16:56:09 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200109081713.patch</filename>
            <type>text/plain</type>
            <size>5565</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NDI1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIwLTAxLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu
cHk6CisgICAgICAgIChNYW5hZ2VyLnJ1bik6IEJvb3QgaHR0cCBzZXJ2ZXJzIGFmdGVyIHRoZSBi
dWlsZCBjaGVjayBhbmQgYWZ0ZXIgY2xvYmJlcmluZworICAgICAgICBvbGQgcmVzdWx0cy4KKyAg
ICAgICAgKE1hbmFnZXIuX2Nsb2JiZXJfb2xkX3Jlc3VsdHMpOiBSZW1vdmUgZW50aXJlIHJlc3Vs
dHMgZm9sZGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93
ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVuVGVzdC50ZXN0X3Jl
dHJ5aW5nX2FuZF9mbGFreV90ZXN0cyk6IGNsb2JiZXItb2xkLXJlc3VsdHMgbm93IHJlbW92ZXMg
dGhlCisgICAgICAgIGVudGlyZSByZXN1bHRzIGRpcmVjdG9yeS4KKwogMjAyMC0wMS0wOSAgRGF2
aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktpdFRlc3RSdW5u
ZXIgbGVha3Mgb2JqZWN0cyBpbiBhIHRvcC1sZXZlbCBhdXRvcmVsZWFzZVBvb2wgdGhhdCdzIG5l
dmVyIGNsZWFyZWQKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1
bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj
cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250
ZXN0LnB5CShyZXZpc2lvbiAyNTQyNTkpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91
dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQkod29ya2luZyBjb3B5
KQpAQCAtNjMwLDcgKzYzMCw3IEBAIGNsYXNzIFJ1blRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0
cmVhbVQKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAgICAgICAgZGV0YWlscywgZXJyLCBf
ID0gbG9nZ2luZ19ydW4oWyctLW5vLXJldHJ5LWZhaWx1cmVzJywgJy0tY2xvYmJlci1vbGQtcmVz
dWx0cycsICdmYWlsdXJlcy9mbGFreSddLCB0ZXN0c19pbmNsdWRlZD1UcnVlLCBob3N0PWhvc3Qp
CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGV0YWlscy5leGl0X2NvZGUsIDEpCi0gICAgICAg
IHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xvYmJlcmluZyBvbGQgcmVzdWx0cycgaW4gZXJyLmdldHZhbHVl
KCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xvYmJlcmluZyBhbGwgcmVzdWx0cycgaW4g
ZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnZmxha3kvdGV4dC5odG1s
JyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGhvc3QuZmlsZXN5
c3RlbS5leGlzdHMoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy9mYWlsdXJlcy9mbGFreS90ZXh0
LWFjdHVhbC50eHQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShob3N0LmZpbGVzeXN0ZW0u
ZXhpc3RzKCdyZXRyaWVzJykpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90
ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv
d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHJldmlzaW9uIDI1
NDI1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz
L21hbmFnZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTIyMywxMiArMjIzLDYgQEAgY2xhc3MgTWFu
YWdlcihvYmplY3QpOgogICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgnTm8gdGVzdHMgdG8gcnVu
LicpCiAgICAgICAgICAgICByZXR1cm4gdGVzdF9ydW5fcmVzdWx0cy5SdW5EZXRhaWxzKGV4aXRf
Y29kZT0tMSkKIAotICAgICAgICBuZWVkc19odHRwID0gYW55KChzZWxmLl9pc19odHRwX3Rlc3Qo
dGVzdCkgYW5kIG5vdCBzZWxmLl9uZWVkc193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSkgZm9yIHRl
c3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2RldmljZSkgZm9yIHRlc3QgaW4gdGVz
dHMpCi0gICAgICAgIG5lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlciA9IGFueShzZWxmLl9u
ZWVkc193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSBmb3IgdGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0
c190b19ydW5fYnlfZGV2aWNlKSBmb3IgdGVzdCBpbiB0ZXN0cykKLSAgICAgICAgbmVlZHNfd2Vi
c29ja2V0cyA9IGFueShzZWxmLl9pc193ZWJzb2NrZXRfdGVzdCh0ZXN0KSBmb3IgdGVzdHMgaW4g
aXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKSBmb3IgdGVzdCBpbiB0ZXN0cykKLSAg
ICAgICAgc2VsZi5fcnVubmVyID0gTGF5b3V0VGVzdFJ1bm5lcihzZWxmLl9vcHRpb25zLCBzZWxm
Ll9wb3J0LCBzZWxmLl9wcmludGVyLCBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgc2VsZi5fdGVz
dF9pc19zbG93LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRz
X2h0dHA9bmVlZHNfaHR0cCwgbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyPW5lZWRzX3dl
Yl9wbGF0Zm9ybV90ZXN0X3NlcnZlciwgbmVlZHNfd2Vic29ja2V0cz1uZWVkc193ZWJzb2NrZXRz
KQotCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDaGVja2luZyBidWlsZCAu
Li4iKQogICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5jaGVja19idWlsZCgpOgogICAgICAgICAg
ICAgX2xvZy5lcnJvcigiQnVpbGQgY2hlY2sgZmFpbGVkIikKQEAgLTI0MCw2ICsyMzQsMTIgQEAg
Y2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIENyZWF0ZSB0aGUgb3V0cHV0IGRpcmVj
dG9yeSBpZiBpdCBkb2Vzbid0IGFscmVhZHkgZXhpc3QuCiAgICAgICAgIHNlbGYuX3BvcnQuaG9z
dC5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5
KQogCisgICAgICAgIG5lZWRzX2h0dHAgPSBhbnkoKHNlbGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSBh
bmQgbm90IHNlbGYuX25lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0KHRlc3QpKSBmb3IgdGVzdHMgaW4g
aXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKSBmb3IgdGVzdCBpbiB0ZXN0cykKKyAg
ICAgICAgbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyID0gYW55KHNlbGYuX25lZWRzX3dl
Yl9wbGF0Zm9ybV90ZXN0KHRlc3QpIGZvciB0ZXN0cyBpbiBpdGVydmFsdWVzKHRlc3RzX3RvX3J1
bl9ieV9kZXZpY2UpIGZvciB0ZXN0IGluIHRlc3RzKQorICAgICAgICBuZWVkc193ZWJzb2NrZXRz
ID0gYW55KHNlbGYuX2lzX3dlYnNvY2tldF90ZXN0KHRlc3QpIGZvciB0ZXN0cyBpbiBpdGVydmFs
dWVzKHRlc3RzX3RvX3J1bl9ieV9kZXZpY2UpIGZvciB0ZXN0IGluIHRlc3RzKQorICAgICAgICBz
ZWxmLl9ydW5uZXIgPSBMYXlvdXRUZXN0UnVubmVyKHNlbGYuX29wdGlvbnMsIHNlbGYuX3BvcnQs
IHNlbGYuX3ByaW50ZXIsIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBzZWxmLl90ZXN0X2lzX3Ns
b3csCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmVlZHNfaHR0cD1u
ZWVkc19odHRwLCBuZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXI9bmVlZHNfd2ViX3BsYXRm
b3JtX3Rlc3Rfc2VydmVyLCBuZWVkc193ZWJzb2NrZXRzPW5lZWRzX3dlYnNvY2tldHMpCisKICAg
ICAgICAgaW5pdGlhbF9yZXN1bHRzID0gTm9uZQogICAgICAgICByZXRyeV9yZXN1bHRzID0gTm9u
ZQogICAgICAgICBlbmFibGVkX3BpeGVsX3Rlc3RzX2luX3JldHJ5ID0gRmFsc2UKQEAgLTQ1Nywx
NiArNDU3LDkgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBf
bG9nLmRlYnVnKCJBZGRpbmcgcmVzdWx0cyBmb3Igb3RoZXIgY3Jhc2g6ICIgKyBzdHIodGVzdCkp
CiAKICAgICBkZWYgX2Nsb2JiZXJfb2xkX3Jlc3VsdHMoc2VsZik6Ci0gICAgICAgICMgSnVzdCBj
bG9iYmVyIHRoZSBhY3R1YWwgdGVzdCByZXN1bHRzIGRpcmVjdG9yaWVzIHNpbmNlIHRoZSBvdGhl
cgotICAgICAgICAjIGZpbGVzIGluIHRoZSByZXN1bHRzIGRpcmVjdG9yeSBhcmUgZXhwbGljaXRs
eSB1c2VkIGZvciBjcm9zcy1ydW4KLSAgICAgICAgIyB0cmFja2luZy4KLSAgICAgICAgc2VsZi5f
cHJpbnRlci53cml0ZV91cGRhdGUoIkNsb2JiZXJpbmcgb2xkIHJlc3VsdHMgaW4gJXMiICUKLSAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcmVzdWx0c19kaXJlY3Rvcnkp
Ci0gICAgICAgIGxheW91dF90ZXN0c19kaXIgPSBzZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIo
KQotICAgICAgICBwb3NzaWJsZV9kaXJzID0gc2VsZi5fcG9ydC50ZXN0X2RpcnMoKQotICAgICAg
ICBmb3IgZGlybmFtZSBpbiBwb3NzaWJsZV9kaXJzOgotICAgICAgICAgICAgaWYgc2VsZi5fZmls
ZXN5c3RlbS5pc2RpcihzZWxmLl9maWxlc3lzdGVtLmpvaW4obGF5b3V0X3Rlc3RzX2RpciwgZGly
bmFtZSkpOgotICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ucm10cmVlKHNlbGYuX2Zp
bGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgZGlybmFtZSkpCisgICAgICAg
IHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDbG9iYmVyaW5nIGFsbCByZXN1bHRzIGluIHt9
Ii5mb3JtYXQoc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpKQorICAgICAgICBpZiBzZWxmLl9maWxl
c3lzdGVtLmlzZGlyKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KToKKyAgICAgICAgICAgIHNlbGYu
X2ZpbGVzeXN0ZW0ucm10cmVlKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KQogCiAgICAgZGVmIF90
ZXN0c190b19yZXRyeShzZWxmLCBydW5fcmVzdWx0cywgaW5jbHVkZV9jcmFzaGVzKToKICAgICAg
ICAgcmV0dXJuIFtyZXN1bHQudGVzdF9uYW1lIGZvciByZXN1bHQgaW4gcnVuX3Jlc3VsdHMudW5l
eHBlY3RlZF9yZXN1bHRzX2J5X25hbWUudmFsdWVzKCkgaWYK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>388941</attachid>
            <date>2020-01-27 16:56:12 -0800</date>
            <delta_ts>2020-01-27 17:13:32 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200127165611.patch</filename>
            <type>text/plain</type>
            <size>5533</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NTIxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIwLTAxLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgor
CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu
YWdlci5weToKKyAgICAgICAgKE1hbmFnZXIucnVuKTogQm9vdCBodHRwIHNlcnZlcnMgYWZ0ZXIg
dGhlIGJ1aWxkIGNoZWNrIGFuZCBhZnRlciBjbG9iYmVyaW5nCisgICAgICAgIG9sZCByZXN1bHRz
LgorICAgICAgICAoTWFuYWdlci5fY2xvYmJlcl9vbGRfcmVzdWx0cyk6IFJlbW92ZSBlbnRpcmUg
cmVzdWx0cyBmb2xkZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv
cnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAgIChSdW5UZXN0LnRl
c3RfcmV0cnlpbmdfYW5kX2ZsYWt5X3Rlc3RzKTogY2xvYmJlci1vbGQtcmVzdWx0cyBub3cgcmVt
b3ZlcyB0aGUKKyAgICAgICAgZW50aXJlIHJlc3VsdHMgZGlyZWN0b3J5LgorCiAyMDIwLTAxLTI3
ICBOb2FtIFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk
LiBBZGRpbmcgbXlzZWxmIGJhY2sgYXMgYSByZXZpZXdlci4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv
d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93
ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CShyZXZpc2lvbiAyNTUyMTEpCisrKyBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0
aW9udGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNzEwLDcgKzcxMCw3IEBAIGNsYXNzIFJ1blRl
c3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkK
ICAgICAgICAgZGV0YWlscywgZXJyLCBfID0gbG9nZ2luZ19ydW4oWyctLW5vLXJldHJ5LWZhaWx1
cmVzJywgJy0tY2xvYmJlci1vbGQtcmVzdWx0cycsICdmYWlsdXJlcy9mbGFreSddLCB0ZXN0c19p
bmNsdWRlZD1UcnVlLCBob3N0PWhvc3QpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGV0YWls
cy5leGl0X2NvZGUsIDEpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xvYmJlcmluZyBvbGQg
cmVzdWx0cycgaW4gZXJyLmdldHZhbHVlKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xv
YmJlcmluZyBhbGwgcmVzdWx0cycgaW4gZXJyLmdldHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNz
ZXJ0VHJ1ZSgnZmxha3kvdGV4dC5odG1sJyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2Vs
Zi5hc3NlcnRUcnVlKGhvc3QuZmlsZXN5c3RlbS5leGlzdHMoJy90bXAvbGF5b3V0LXRlc3QtcmVz
dWx0cy9mYWlsdXJlcy9mbGFreS90ZXh0LWFjdHVhbC50eHQnKSkKICAgICAgICAgc2VsZi5hc3Nl
cnRGYWxzZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCdyZXRyaWVzJykpCkluZGV4OiBUb29scy9T
Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz
L21hbmFnZXIucHkJKHJldmlzaW9uIDI1NTIxMSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv
bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTIy
MywxMiArMjIzLDYgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgX2xvZy5j
cml0aWNhbCgnTm8gdGVzdHMgdG8gcnVuLicpCiAgICAgICAgICAgICByZXR1cm4gdGVzdF9ydW5f
cmVzdWx0cy5SdW5EZXRhaWxzKGV4aXRfY29kZT0tMSkKIAotICAgICAgICBuZWVkc19odHRwID0g
YW55KChzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkgYW5kIG5vdCBzZWxmLl9uZWVkc193ZWJfcGxh
dGZvcm1fdGVzdCh0ZXN0KSkgZm9yIHRlc3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5
X2RldmljZSkgZm9yIHRlc3QgaW4gdGVzdHMpCi0gICAgICAgIG5lZWRzX3dlYl9wbGF0Zm9ybV90
ZXN0X3NlcnZlciA9IGFueShzZWxmLl9uZWVkc193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSBmb3Ig
dGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKSBmb3IgdGVzdCBpbiB0
ZXN0cykKLSAgICAgICAgbmVlZHNfd2Vic29ja2V0cyA9IGFueShzZWxmLl9pc193ZWJzb2NrZXRf
dGVzdCh0ZXN0KSBmb3IgdGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNl
KSBmb3IgdGVzdCBpbiB0ZXN0cykKLSAgICAgICAgc2VsZi5fcnVubmVyID0gTGF5b3V0VGVzdFJ1
bm5lcihzZWxmLl9vcHRpb25zLCBzZWxmLl9wb3J0LCBzZWxmLl9wcmludGVyLCBzZWxmLl9yZXN1
bHRzX2RpcmVjdG9yeSwgc2VsZi5fdGVzdF9pc19zbG93LAotICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIG5lZWRzX2h0dHA9bmVlZHNfaHR0cCwgbmVlZHNfd2ViX3BsYXRm
b3JtX3Rlc3Rfc2VydmVyPW5lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlciwgbmVlZHNfd2Vi
c29ja2V0cz1uZWVkc193ZWJzb2NrZXRzKQotCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVf
dXBkYXRlKCJDaGVja2luZyBidWlsZCAuLi4iKQogICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5j
aGVja19idWlsZCgpOgogICAgICAgICAgICAgX2xvZy5lcnJvcigiQnVpbGQgY2hlY2sgZmFpbGVk
IikKQEAgLTI0MCw2ICsyMzQsMTIgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAj
IENyZWF0ZSB0aGUgb3V0cHV0IGRpcmVjdG9yeSBpZiBpdCBkb2Vzbid0IGFscmVhZHkgZXhpc3Qu
CiAgICAgICAgIHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5
KHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KQogCisgICAgICAgIG5lZWRzX2h0dHAgPSBhbnkoKHNl
bGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSBhbmQgbm90IHNlbGYuX25lZWRzX3dlYl9wbGF0Zm9ybV90
ZXN0KHRlc3QpKSBmb3IgdGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNl
KSBmb3IgdGVzdCBpbiB0ZXN0cykKKyAgICAgICAgbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2Vy
dmVyID0gYW55KHNlbGYuX25lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0KHRlc3QpIGZvciB0ZXN0cyBp
biBpdGVydmFsdWVzKHRlc3RzX3RvX3J1bl9ieV9kZXZpY2UpIGZvciB0ZXN0IGluIHRlc3RzKQor
ICAgICAgICBuZWVkc193ZWJzb2NrZXRzID0gYW55KHNlbGYuX2lzX3dlYnNvY2tldF90ZXN0KHRl
c3QpIGZvciB0ZXN0cyBpbiBpdGVydmFsdWVzKHRlc3RzX3RvX3J1bl9ieV9kZXZpY2UpIGZvciB0
ZXN0IGluIHRlc3RzKQorICAgICAgICBzZWxmLl9ydW5uZXIgPSBMYXlvdXRUZXN0UnVubmVyKHNl
bGYuX29wdGlvbnMsIHNlbGYuX3BvcnQsIHNlbGYuX3ByaW50ZXIsIHNlbGYuX3Jlc3VsdHNfZGly
ZWN0b3J5LCBzZWxmLl90ZXN0X2lzX3Nsb3csCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgbmVlZHNfaHR0cD1uZWVkc19odHRwLCBuZWVkc193ZWJfcGxhdGZvcm1fdGVz
dF9zZXJ2ZXI9bmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLCBuZWVkc193ZWJzb2NrZXRz
PW5lZWRzX3dlYnNvY2tldHMpCisKICAgICAgICAgaW5pdGlhbF9yZXN1bHRzID0gTm9uZQogICAg
ICAgICByZXRyeV9yZXN1bHRzID0gTm9uZQogICAgICAgICBlbmFibGVkX3BpeGVsX3Rlc3RzX2lu
X3JldHJ5ID0gRmFsc2UKQEAgLTQ1NywxNiArNDU3LDkgQEAgY2xhc3MgTWFuYWdlcihvYmplY3Qp
OgogICAgICAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKCJBZGRpbmcgcmVzdWx0cyBmb3Igb3Ro
ZXIgY3Jhc2g6ICIgKyBzdHIodGVzdCkpCiAKICAgICBkZWYgX2Nsb2JiZXJfb2xkX3Jlc3VsdHMo
c2VsZik6Ci0gICAgICAgICMgSnVzdCBjbG9iYmVyIHRoZSBhY3R1YWwgdGVzdCByZXN1bHRzIGRp
cmVjdG9yaWVzIHNpbmNlIHRoZSBvdGhlcgotICAgICAgICAjIGZpbGVzIGluIHRoZSByZXN1bHRz
IGRpcmVjdG9yeSBhcmUgZXhwbGljaXRseSB1c2VkIGZvciBjcm9zcy1ydW4KLSAgICAgICAgIyB0
cmFja2luZy4KLSAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNsb2JiZXJpbmcg
b2xkIHJlc3VsdHMgaW4gJXMiICUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
c2VsZi5fcmVzdWx0c19kaXJlY3RvcnkpCi0gICAgICAgIGxheW91dF90ZXN0c19kaXIgPSBzZWxm
Ll9wb3J0LmxheW91dF90ZXN0c19kaXIoKQotICAgICAgICBwb3NzaWJsZV9kaXJzID0gc2VsZi5f
cG9ydC50ZXN0X2RpcnMoKQotICAgICAgICBmb3IgZGlybmFtZSBpbiBwb3NzaWJsZV9kaXJzOgot
ICAgICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5pc2RpcihzZWxmLl9maWxlc3lzdGVtLmpv
aW4obGF5b3V0X3Rlc3RzX2RpciwgZGlybmFtZSkpOgotICAgICAgICAgICAgICAgIHNlbGYuX2Zp
bGVzeXN0ZW0ucm10cmVlKHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVj
dG9yeSwgZGlybmFtZSkpCisgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJEZWxl
dGluZyByZXN1bHRzIGRpcmVjdG9yeSB7fSIuZm9ybWF0KHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5
KSkKKyAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5pc2RpcihzZWxmLl9yZXN1bHRzX2RpcmVj
dG9yeSk6CisgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLnJtdHJlZShzZWxmLl9yZXN1bHRz
X2RpcmVjdG9yeSkKIAogICAgIGRlZiBfdGVzdHNfdG9fcmV0cnkoc2VsZiwgcnVuX3Jlc3VsdHMs
IGluY2x1ZGVfY3Jhc2hlcyk6CiAgICAgICAgIHJldHVybiBbcmVzdWx0LnRlc3RfbmFtZSBmb3Ig
cmVzdWx0IGluIHJ1bl9yZXN1bHRzLnVuZXhwZWN0ZWRfcmVzdWx0c19ieV9uYW1lLnZhbHVlcygp
IGlmCg==
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>388945</attachid>
            <date>2020-01-27 17:13:34 -0800</date>
            <delta_ts>2020-01-28 08:46:34 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-205875-20200127171333.patch</filename>
            <type>text/plain</type>
            <size>5537</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI1NTIxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE5IEBACisyMDIwLTAxLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBjbG9iYmVyLW9sZC1yZXN1bHRzIHNob3Vs
ZCByZW1vdmUgdGhlIGVudGlyZSByZXN1bHRzIGZvbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mu
d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl
bS81ODIzNjExNz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgor
CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu
YWdlci5weToKKyAgICAgICAgKE1hbmFnZXIucnVuKTogQm9vdCBodHRwIHNlcnZlcnMgYWZ0ZXIg
dGhlIGJ1aWxkIGNoZWNrIGFuZCBhZnRlciBjbG9iYmVyaW5nCisgICAgICAgIG9sZCByZXN1bHRz
LgorICAgICAgICAoTWFuYWdlci5fY2xvYmJlcl9vbGRfcmVzdWx0cyk6IFJlbW92ZSBlbnRpcmUg
cmVzdWx0cyBmb2xkZXIuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv
cnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHk6CisgICAgICAgIChSdW5UZXN0LnRl
c3RfcmV0cnlpbmdfYW5kX2ZsYWt5X3Rlc3RzKTogY2xvYmJlci1vbGQtcmVzdWx0cyBub3cgcmVt
b3ZlcyB0aGUKKyAgICAgICAgZW50aXJlIHJlc3VsdHMgZGlyZWN0b3J5LgorCiAyMDIwLTAxLTI3
ICBOb2FtIFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2Vk
LiBBZGRpbmcgbXlzZWxmIGJhY2sgYXMgYSByZXZpZXdlci4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv
d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93
ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CShyZXZpc2lvbiAyNTUyMTEpCisrKyBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0
aW9udGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNzEwLDcgKzcxMCw3IEBAIGNsYXNzIFJ1blRl
c3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVQKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkK
ICAgICAgICAgZGV0YWlscywgZXJyLCBfID0gbG9nZ2luZ19ydW4oWyctLW5vLXJldHJ5LWZhaWx1
cmVzJywgJy0tY2xvYmJlci1vbGQtcmVzdWx0cycsICdmYWlsdXJlcy9mbGFreSddLCB0ZXN0c19p
bmNsdWRlZD1UcnVlLCBob3N0PWhvc3QpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGV0YWls
cy5leGl0X2NvZGUsIDEpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnQ2xvYmJlcmluZyBvbGQg
cmVzdWx0cycgaW4gZXJyLmdldHZhbHVlKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnRGVs
ZXRpbmcgcmVzdWx0cyBkaXJlY3RvcnknIGluIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxm
LmFzc2VydFRydWUoJ2ZsYWt5L3RleHQuaHRtbCcgaW4gZXJyLmdldHZhbHVlKCkpCiAgICAgICAg
IHNlbGYuYXNzZXJ0VHJ1ZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcvdG1wL2xheW91dC10ZXN0
LXJlc3VsdHMvZmFpbHVyZXMvZmxha3kvdGV4dC1hY3R1YWwudHh0JykpCiAgICAgICAgIHNlbGYu
YXNzZXJ0RmFsc2UoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygncmV0cmllcycpKQpJbmRleDogVG9v
bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s
bGVycy9tYW5hZ2VyLnB5CShyZXZpc2lvbiAyNTUyMTEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp
dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CSh3b3JraW5nIGNvcHkpCkBA
IC0yMjMsMTIgKzIyMyw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIF9s
b2cuY3JpdGljYWwoJ05vIHRlc3RzIHRvIHJ1bi4nKQogICAgICAgICAgICAgcmV0dXJuIHRlc3Rf
cnVuX3Jlc3VsdHMuUnVuRGV0YWlscyhleGl0X2NvZGU9LTEpCiAKLSAgICAgICAgbmVlZHNfaHR0
cCA9IGFueSgoc2VsZi5faXNfaHR0cF90ZXN0KHRlc3QpIGFuZCBub3Qgc2VsZi5fbmVlZHNfd2Vi
X3BsYXRmb3JtX3Rlc3QodGVzdCkpIGZvciB0ZXN0cyBpbiBpdGVydmFsdWVzKHRlc3RzX3RvX3J1
bl9ieV9kZXZpY2UpIGZvciB0ZXN0IGluIHRlc3RzKQotICAgICAgICBuZWVkc193ZWJfcGxhdGZv
cm1fdGVzdF9zZXJ2ZXIgPSBhbnkoc2VsZi5fbmVlZHNfd2ViX3BsYXRmb3JtX3Rlc3QodGVzdCkg
Zm9yIHRlc3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2RldmljZSkgZm9yIHRlc3Qg
aW4gdGVzdHMpCi0gICAgICAgIG5lZWRzX3dlYnNvY2tldHMgPSBhbnkoc2VsZi5faXNfd2Vic29j
a2V0X3Rlc3QodGVzdCkgZm9yIHRlc3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2Rl
dmljZSkgZm9yIHRlc3QgaW4gdGVzdHMpCi0gICAgICAgIHNlbGYuX3J1bm5lciA9IExheW91dFRl
c3RSdW5uZXIoc2VsZi5fb3B0aW9ucywgc2VsZi5fcG9ydCwgc2VsZi5fcHJpbnRlciwgc2VsZi5f
cmVzdWx0c19kaXJlY3RvcnksIHNlbGYuX3Rlc3RfaXNfc2xvdywKLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBuZWVkc19odHRwPW5lZWRzX2h0dHAsIG5lZWRzX3dlYl9w
bGF0Zm9ybV90ZXN0X3NlcnZlcj1uZWVkc193ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIsIG5lZWRz
X3dlYnNvY2tldHM9bmVlZHNfd2Vic29ja2V0cykKLQogICAgICAgICBzZWxmLl9wcmludGVyLndy
aXRlX3VwZGF0ZSgiQ2hlY2tpbmcgYnVpbGQgLi4uIikKICAgICAgICAgaWYgbm90IHNlbGYuX3Bv
cnQuY2hlY2tfYnVpbGQoKToKICAgICAgICAgICAgIF9sb2cuZXJyb3IoIkJ1aWxkIGNoZWNrIGZh
aWxlZCIpCkBAIC0yNDAsNiArMjM0LDEyIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAg
ICAgIyBDcmVhdGUgdGhlIG91dHB1dCBkaXJlY3RvcnkgaWYgaXQgZG9lc24ndCBhbHJlYWR5IGV4
aXN0LgogICAgICAgICBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5c3RlbS5tYXliZV9tYWtlX2RpcmVj
dG9yeShzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSkKIAorICAgICAgICBuZWVkc19odHRwID0gYW55
KChzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkgYW5kIG5vdCBzZWxmLl9uZWVkc193ZWJfcGxhdGZv
cm1fdGVzdCh0ZXN0KSkgZm9yIHRlc3RzIGluIGl0ZXJ2YWx1ZXModGVzdHNfdG9fcnVuX2J5X2Rl
dmljZSkgZm9yIHRlc3QgaW4gdGVzdHMpCisgICAgICAgIG5lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0
X3NlcnZlciA9IGFueShzZWxmLl9uZWVkc193ZWJfcGxhdGZvcm1fdGVzdCh0ZXN0KSBmb3IgdGVz
dHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKSBmb3IgdGVzdCBpbiB0ZXN0
cykKKyAgICAgICAgbmVlZHNfd2Vic29ja2V0cyA9IGFueShzZWxmLl9pc193ZWJzb2NrZXRfdGVz
dCh0ZXN0KSBmb3IgdGVzdHMgaW4gaXRlcnZhbHVlcyh0ZXN0c190b19ydW5fYnlfZGV2aWNlKSBm
b3IgdGVzdCBpbiB0ZXN0cykKKyAgICAgICAgc2VsZi5fcnVubmVyID0gTGF5b3V0VGVzdFJ1bm5l
cihzZWxmLl9vcHRpb25zLCBzZWxmLl9wb3J0LCBzZWxmLl9wcmludGVyLCBzZWxmLl9yZXN1bHRz
X2RpcmVjdG9yeSwgc2VsZi5fdGVzdF9pc19zbG93LAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIG5lZWRzX2h0dHA9bmVlZHNfaHR0cCwgbmVlZHNfd2ViX3BsYXRmb3Jt
X3Rlc3Rfc2VydmVyPW5lZWRzX3dlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlciwgbmVlZHNfd2Vic29j
a2V0cz1uZWVkc193ZWJzb2NrZXRzKQorCiAgICAgICAgIGluaXRpYWxfcmVzdWx0cyA9IE5vbmUK
ICAgICAgICAgcmV0cnlfcmVzdWx0cyA9IE5vbmUKICAgICAgICAgZW5hYmxlZF9waXhlbF90ZXN0
c19pbl9yZXRyeSA9IEZhbHNlCkBAIC00NTcsMTYgKzQ1Nyw5IEBAIGNsYXNzIE1hbmFnZXIob2Jq
ZWN0KToKICAgICAgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygiQWRkaW5nIHJlc3VsdHMgZm9y
IG90aGVyIGNyYXNoOiAiICsgc3RyKHRlc3QpKQogCiAgICAgZGVmIF9jbG9iYmVyX29sZF9yZXN1
bHRzKHNlbGYpOgotICAgICAgICAjIEp1c3QgY2xvYmJlciB0aGUgYWN0dWFsIHRlc3QgcmVzdWx0
cyBkaXJlY3RvcmllcyBzaW5jZSB0aGUgb3RoZXIKLSAgICAgICAgIyBmaWxlcyBpbiB0aGUgcmVz
dWx0cyBkaXJlY3RvcnkgYXJlIGV4cGxpY2l0bHkgdXNlZCBmb3IgY3Jvc3MtcnVuCi0gICAgICAg
ICMgdHJhY2tpbmcuCi0gICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDbG9iYmVy
aW5nIG9sZCByZXN1bHRzIGluICVzIiAlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KQotICAgICAgICBsYXlvdXRfdGVzdHNfZGlyID0g
c2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKLSAgICAgICAgcG9zc2libGVfZGlycyA9IHNl
bGYuX3BvcnQudGVzdF9kaXJzKCkKLSAgICAgICAgZm9yIGRpcm5hbWUgaW4gcG9zc2libGVfZGly
czoKLSAgICAgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uaXNkaXIoc2VsZi5fZmlsZXN5c3Rl
bS5qb2luKGxheW91dF90ZXN0c19kaXIsIGRpcm5hbWUpKToKLSAgICAgICAgICAgICAgICBzZWxm
Ll9maWxlc3lzdGVtLnJtdHJlZShzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19k
aXJlY3RvcnksIGRpcm5hbWUpKQorICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgi
RGVsZXRpbmcgcmVzdWx0cyBkaXJlY3Rvcnkge30iLmZvcm1hdChzZWxmLl9yZXN1bHRzX2RpcmVj
dG9yeSkpCisgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uaXNkaXIoc2VsZi5fcmVzdWx0c19k
aXJlY3RvcnkpOgorICAgICAgICAgICAgc2VsZi5fZmlsZXN5c3RlbS5ybXRyZWUoc2VsZi5fcmVz
dWx0c19kaXJlY3RvcnkpCiAKICAgICBkZWYgX3Rlc3RzX3RvX3JldHJ5KHNlbGYsIHJ1bl9yZXN1
bHRzLCBpbmNsdWRlX2NyYXNoZXMpOgogICAgICAgICByZXR1cm4gW3Jlc3VsdC50ZXN0X25hbWUg
Zm9yIHJlc3VsdCBpbiBydW5fcmVzdWx0cy51bmV4cGVjdGVkX3Jlc3VsdHNfYnlfbmFtZS52YWx1
ZXMoKSBpZgo=
</data>

          </attachment>
      

    </bug>

</bugzilla>