<?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>101976</bug_id>
          
          <creation_ts>2012-11-12 13:38:11 -0800</creation_ts>
          <short_desc>garden-o-matic doesn&apos;t know about reftests</short_desc>
          <delta_ts>2012-12-20 19:12:38 -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>528+ (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="Dirk Pranke">dpranke</reporter>
          <assigned_to name="Dirk Pranke">dpranke</assigned_to>
          <cc>abarth</cc>
    
    <cc>adamk</cc>
    
    <cc>dglazkov</cc>
    
    <cc>eric</cc>
    
    <cc>hayato</cc>
    
    <cc>ojan.autocc</cc>
    
    <cc>ojan</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>764761</commentid>
    <comment_count>0</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-11-12 13:38:11 -0800</bug_when>
    <thetext>So, if a reftest fails it shows up as an ImageFailure, and will let you happily rebaseline it. However, NRWT will notice that the test is a reftest, log a warning, and ignore the baselines.

I believe the information about whether the test is or isn&apos;t a reftest is in results.json, so we probably just need to make the UI aware of it. If not, it certainly would be easy to add.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764973</commentid>
    <comment_count>1</comment_count>
    <who name="Ojan Vafai">ojan</who>
    <bug_when>2012-11-12 16:49:26 -0800</bug_when>
    <thetext>In the examine view, it doesn&apos;t show you the rebaseline button for reftest. If it does, it&apos;s a regression.

On the main page, it&apos;s less clear what to do since multiple tests are grouped together. I suppose we shouldn&apos;t show the rebaseline button there either?

Also, webkit-patch can check if something is a reftest. It really should never rebaseline reftests. Fixing garden-o-matic is nice, but &quot;webkit-patch rebaseline&quot; should also know about reftests.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764980</commentid>
    <comment_count>2</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-11-12 16:58:08 -0800</bug_when>
    <thetext>I definitely get the rebaseline button when looking at the examine view under expected failures, so maybe it&apos;s just a regression.

As you say, it&apos;s really a bug if anything tries to rebaseline a reftest, not just garden-o-matic, but it&apos;s most important to fix the UI first, IMO.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764982</commentid>
    <comment_count>3</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-11-12 16:58:46 -0800</bug_when>
    <thetext>i.e., I think garden-o-matic, in addition to *not* showing the rebaseline button, should probably show something indicating that the test is a reftest.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>764983</commentid>
    <comment_count>4</comment_count>
    <who name="Ojan Vafai">ojan</who>
    <bug_when>2012-11-12 17:01:32 -0800</bug_when>
    <thetext>Yeah. I don&apos;t disagree with any of that.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>788748</commentid>
    <comment_count>5</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-11 13:43:52 -0800</bug_when>
    <thetext>*** Bug 104713 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>789026</commentid>
    <comment_count>6</comment_count>
      <attachid>178929</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-11 17:24:23 -0800</bug_when>
    <thetext>Created attachment 178929
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>789029</commentid>
    <comment_count>7</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-11 17:25:08 -0800</bug_when>
    <thetext>please give me feedback on what good js style would be for this; I don&apos;t know the idioms, but this looks pretty crufty.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>789113</commentid>
    <comment_count>8</comment_count>
      <attachid>178929</attachid>
    <who name="Ojan Vafai">ojan</who>
    <bug_when>2012-12-11 19:11:14 -0800</bug_when>
    <thetext>Comment on attachment 178929
Patch

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

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:44
&gt; +        if (isAnyReftest(testName, resultsByTest)) {
&gt; +            statusView.addMessage(id, testName + &apos; is a ref test, skipping&apos;);
&gt; +        } else {

Nit: single-line if shouldn&apos;t have curlies.

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:60
&gt; +    } else {
&gt; +        statusView.addFinalMessage(id, &apos;No tests left to rebaseline!&apos;)
&gt; +    }

Nit: single-line else shouldn&apos;t have curlies.

Non-nit: maybe make this text more explict? &apos;No non-reftests to rebaseline.&apos;

&gt; Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:63
&gt; +// FIXME: This is duplicated from ui/results.js :(.

ui.results.js is probably the wrong place for it. Maybe it should just be in results.js (i.e. not in the ui directory) as results.isAnyReftest. Then this code and ui.results.js can both call it? I dunno. I don&apos;t have the intended architecture of this stuff fresh in my brain, so not sure if that makes sense.

This is fine for now w the FIXME.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>789128</commentid>
    <comment_count>9</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-11 19:39:25 -0800</bug_when>
    <thetext>Committed r137407: &lt;http://trac.webkit.org/changeset/137407&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791011</commentid>
    <comment_count>10</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-13 15:29:46 -0800</bug_when>
    <thetext>Change reverted in http://trac.webkit.org/changeset/137664 ... this totally busted garden-o-matic (the rebaseline button was broken).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791087</commentid>
    <comment_count>11</comment_count>
      <attachid>179371</attachid>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-13 16:28:57 -0800</bug_when>
    <thetext>Created attachment 179371
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791088</commentid>
    <comment_count>12</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-13 16:29:41 -0800</bug_when>
    <thetext>Eric or Dimitri, can you take a look in both Adam and Ojan&apos;s absence?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791268</commentid>
    <comment_count>13</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-13 20:09:21 -0800</bug_when>
    <thetext>(whoops, r+&apos;ed the wrong patch by accident).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791269</commentid>
    <comment_count>14</comment_count>
      <attachid>179371</attachid>
    <who name="Eric Seidel (no email)">eric</who>
    <bug_when>2012-12-13 20:09:54 -0800</bug_when>
    <thetext>Comment on attachment 179371
Patch

I&apos;m happy to rs=me, but you probably want someone more qualified to look at this, even if post-facto.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>791895</commentid>
    <comment_count>15</comment_count>
    <who name="Dirk Pranke">dpranke</who>
    <bug_when>2012-12-14 15:18:00 -0800</bug_when>
    <thetext>Committed r137780: &lt;http://trac.webkit.org/changeset/137780&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>796054</commentid>
    <comment_count>16</comment_count>
    <who name="Tony Chang">tony</who>
    <bug_when>2012-12-20 19:12:38 -0800</bug_when>
    <thetext>*** Bug 90765 has been marked as a duplicate of this bug. ***</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>178929</attachid>
            <date>2012-12-11 17:24:23 -0800</date>
            <delta_ts>2012-12-13 16:28:55 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-101976-20121211172144.patch</filename>
            <type>text/plain</type>
            <size>7640</size>
            <attacher name="Dirk Pranke">dpranke</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3Mzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTVmMGM2MDYzYTM2ZWFmM2U3YTdmZjQ2MzU0MmFmYjA3
ZGQwMzcyZS4uMmRlNmExNzY2Zjg0NWY3MTY3NDM3ODJhNzQ3ZTM1NTNhNDVlMjBkNCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5
IEBACisyMDEyLTEyLTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg
ICAgICAgIGdhcmRlbi1vLW1hdGljIGRvZXNuJ3Qga25vdyBhYm91dCByZWZ0ZXN0cworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTc2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhIGZpcnN0
IGF0dGVtcHQgYXQgZml4aW5nIHRoaXMsIHNvcnQgb2YgYSAic3RvcC10aGUtYmxlZWRpbmciCisg
ICAgICAgIGZpeC4gV2Ugd2lsbCBub3cgbG9vayBhdCB0aGUgbGlzdCBvZiB0ZXN0cyB3ZSdyZSBh
c2tlZCB0byByZWJhc2VsaW5lLAorICAgICAgICBhbmQgbG9nIHdoaWNoIG9uZXMgYXJlIHJlZnRl
c3RzIGludG8gdGhlIHN0YXR1cyBhcmVhLCBhbmQgcmViYXNlbGluZQorICAgICAgICB0aGUgcmVz
dC4KKworICAgICAgICBMb25nZXItdGVybSwgd2Ugc2hvdWxkIGRpc3BsYXkgZmVlZGJhY2sgaW4g
dGhlIHJlc3VsdHMgYXJlYSBiYXNlZCBvbgorICAgICAgICB3aGljaCB0ZXN0cyB3ZSdyZSBsb29r
aW5nIGF0LiBJZiB0aGUgdGVzdCBsaXN0IGNvbnRhaW5zIG5vIHJlZnRlc3RzLAorICAgICAgICB3
ZSBzaG91bGQgYmVoYXZlIGFzIHRvZGF5OyBpZiB0aGUgbGlzdCBpcyBhbGwgcmVmdGVzdCwgd2Ug
c2hvdWxkCisgICAgICAgIHByb2JhYmx5IGRpc2FibGUgdGhlIGJ1dHRvbiwgYW5kIGlmIHRoZSBs
aXN0IGlzIGEgbWl4LCB3ZSBzaG91bGQKKyAgICAgICAgcHJvYmFibHkgZGlzcGxheSBhbiBhbGVy
dCBuZXh0IHRvIHRoZSBidXR0b24gb3Igc29tZXRoaW5nLiBJdCB3b3VsZAorICAgICAgICBhbHNv
IGJlIG5pY2UgdG8gYW5ub3RhdGUgd2hpY2ggdGVzdHMgd2VyZSByZWZ0ZXN0cywgbWF5YmUgd2l0
aCBhCisgICAgICAgICIocmVmdGVzdCkiIG5leHQgdG8gdGhlIHRlc3QgbmFtZSBvciBzb21ldGhp
bmcuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp
Zy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy9jb250cm9sbGVycy5qczoKKyAgICAg
ICAgKC4pOgorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u
ZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHMuanM6CisgICAg
ICAgICguKToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv
bmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzX3VuaXR0ZXN0
cy5qczoKKwogMjAxMi0xMi0xMSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg
ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzNzM3MS4KZGlmZiAtLWdpdCBhL1Rvb2xz
L0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rl
c3RGYWlsdXJlcy9zY3JpcHRzL2NvbnRyb2xsZXJzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv
cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3Njcmlw
dHMvY29udHJvbGxlcnMuanMKaW5kZXggZjJkMGEyZmIxOGRiMjU2YTk5YjcwMTdiNzQ1YjhmZWU4
OTk2NDVhNi4uOGJlYjcwZWU5NzJlMDYyY2VkMjRiNTk1ZTAxNTNjOTA4MDM3YWFmZCAxMDA2NDQK
LS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi
bGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanMKKysrIGIvVG9vbHMv
QnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVz
dEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanMKQEAgLTMwLDIzICszMCw0MyBAQCB2YXIg
Y29udHJvbGxlcnMgPSBjb250cm9sbGVycyB8fCB7fTsKIHZhciBrQ2hlY2tvdXRVbmF2YWlsYWJs
ZU1lc3NhZ2UgPSAnRmFpbGVkISBHYXJkZW4tby1tYXRpYyBuZWVkcyBhIGxvY2FsIHNlcnZlciB0
byBtb2RpZnkgeW91ciB3b3JraW5nIGNvcHkuIFBsZWFzZSBydW4gIndlYmtpdC1wYXRjaCBnYXJk
ZW4tby1tYXRpYyIgc3RhcnQgdGhlIGxvY2FsIHNlcnZlci4nOwogCiAvLyBGSVhNRTogV2hlcmUg
c2hvdWxkIHRoaXMgZnVuY3Rpb24gZ28/Ci1mdW5jdGlvbiByZWJhc2VsaW5lV2l0aFN0YXR1c1Vw
ZGF0ZXMoZmFpbHVyZUluZm9MaXN0KQorZnVuY3Rpb24gcmViYXNlbGluZVdpdGhTdGF0dXNVcGRh
dGVzKGZhaWx1cmVJbmZvTGlzdCwgcmVzdWx0c0J5VGVzdCkKIHsKLSAgICAvLyBGSVhNRTogSWYg
YSB0ZXN0IGlzIGEgcmVmdGVzdCwgd2Via2l0LXBhdGNoIHJlYmFzZWxpbmUtdGVzdCBzaG91bGQg
ZXJyb3Igb3V0Ci0gICAgLy8gYW5kIHdlIHNob3VsZCBhbGVydCAobW9kYWwgZGlhbG9nPykgdGhl
IHVzZXIuCiAgICAgdmFyIHN0YXR1c1ZpZXcgPSBuZXcgdWkuU3RhdHVzQXJlYSgnUmViYXNlbGlu
ZScpOwogICAgIHZhciBpZCA9IHN0YXR1c1ZpZXcubmV3SWQoKTsKIAogICAgIHZhciB0ZXN0TmFt
ZXMgPSBiYXNlLnVuaXF1aWZ5QXJyYXkoZmFpbHVyZUluZm9MaXN0Lm1hcChmdW5jdGlvbihmYWls
dXJlSW5mbykgeyByZXR1cm4gZmFpbHVyZUluZm8udGVzdE5hbWU7IH0pKTsKLSAgICB2YXIgdGVz
dE5hbWUgPSB0ZXN0TmFtZXMubGVuZ3RoID09IDEgPyB0ZXN0TmFtZXNbMF0gOiB0ZXN0TmFtZXMu
bGVuZ3RoICsgJyB0ZXN0cyc7Ci0gICAgc3RhdHVzVmlldy5hZGRNZXNzYWdlKGlkLCAnUGVyZm9y
bWluZyByZWJhc2VsaW5lIG9mICcgKyB0ZXN0TmFtZSArICcuLi4nKTsKIAotICAgIGNoZWNrb3V0
LnJlYmFzZWxpbmUoZmFpbHVyZUluZm9MaXN0LCBmdW5jdGlvbigpIHsKLSAgICAgICAgc3RhdHVz
Vmlldy5hZGRGaW5hbE1lc3NhZ2UoaWQsICdSZWJhc2VsaW5lIGRvbmUhIFBsZWFzZSBsYW5kIHdp
dGggIndlYmtpdC1wYXRjaCBsYW5kLWNvd2hhbmQiLicpOwotICAgIH0sIGZ1bmN0aW9uKGZhaWx1
cmVJbmZvKSB7Ci0gICAgICAgIHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShpZCwgZmFpbHVyZUluZm8u
dGVzdE5hbWUgKyAnIG9uICcgKyB1aS5kaXNwbGF5TmFtZUZvckJ1aWxkZXIoZmFpbHVyZUluZm8u
YnVpbGRlck5hbWUpKTsKLSAgICB9LCBmdW5jdGlvbigpIHsKLSAgICAgICAgc3RhdHVzVmlldy5h
ZGRGaW5hbE1lc3NhZ2UoaWQsIGtDaGVja291dFVuYXZhaWxhYmxlTWVzc2FnZSk7CisgICAgdmFy
IGZhaWx1cmVzVG9SZWJhc2VsaW5lID0gW107CisgICAgdGVzdE5hbWVzLmZvckVhY2goZnVuY3Rp
b24odGVzdE5hbWUpIHsKKyAgICAgICAgaWYgKGlzQW55UmVmdGVzdCh0ZXN0TmFtZSwgcmVzdWx0
c0J5VGVzdCkpIHsKKyAgICAgICAgICAgIHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShpZCwgdGVzdE5h
bWUgKyAnIGlzIGEgcmVmIHRlc3QsIHNraXBwaW5nJyk7CisgICAgICAgIH0gZWxzZSB7CisgICAg
ICAgICAgICBmYWlsdXJlc1RvUmViYXNlbGluZS5wdXNoKHRlc3ROYW1lKTsKKyAgICAgICAgICAg
IHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShpZCwgJ1JlYmFzZWxpbmluZyAnICsgdGVzdE5hbWUgKyAn
Li4uJyk7CisgICAgICAgIH0KKyAgICB9KTsKKyAgICAKKyAgICBpZiAoZmFpbHVyZXNUb1JlYmFz
ZWxpbmUubGVuZ3RoKSB7CisgICAgICAgIGNoZWNrb3V0LnJlYmFzZWxpbmUoZmFpbHVyZXNUb1Jl
YmFzZWxpbmUsIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgc3RhdHVzVmlldy5hZGRGaW5hbE1l
c3NhZ2UoaWQsICdSZWJhc2VsaW5lIGRvbmUhIFBsZWFzZSBsYW5kIHdpdGggIndlYmtpdC1wYXRj
aCBsYW5kLWNvd2hhbmQiLicpOworICAgICAgICB9LCBmdW5jdGlvbihmYWlsdXJlSW5mbykgewor
ICAgICAgICAgICAgc3RhdHVzVmlldy5hZGRNZXNzYWdlKGlkLCBmYWlsdXJlSW5mby50ZXN0TmFt
ZSArICcgb24gJyArIHVpLmRpc3BsYXlOYW1lRm9yQnVpbGRlcihmYWlsdXJlSW5mby5idWlsZGVy
TmFtZSkpOworICAgICAgICB9LCBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHN0YXR1c1ZpZXcu
YWRkRmluYWxNZXNzYWdlKGlkLCBrQ2hlY2tvdXRVbmF2YWlsYWJsZU1lc3NhZ2UpOworICAgICAg
ICB9KTsKKyAgICB9IGVsc2UgeworICAgICAgICBzdGF0dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShp
ZCwgJ05vIHRlc3RzIGxlZnQgdG8gcmViYXNlbGluZSEnKQorICAgIH0KK30KKworLy8gRklYTUU6
IFRoaXMgaXMgZHVwbGljYXRlZCBmcm9tIHVpL3Jlc3VsdHMuanMgOiguCitmdW5jdGlvbiBpc0Fu
eVJlZnRlc3QodGVzdE5hbWUsIHJlc3VsdHNCeVRlc3QpCit7CisgICAgcmV0dXJuIE9iamVjdC5r
ZXlzKHJlc3VsdHNCeVRlc3RbdGVzdE5hbWVdKS5tYXAoZnVuY3Rpb24oYnVpbGRlcikgeworICAg
ICAgICByZXR1cm4gcmVzdWx0c0J5VGVzdFt0ZXN0TmFtZV1bYnVpbGRlcl07CisgICAgfSkuc29t
ZShmdW5jdGlvbihyZXN1bHROb2RlKSB7CisgICAgICAgIHJldHVybiByZXN1bHROb2RlLnJlZnRl
c3RfdHlwZSAmJiByZXN1bHROb2RlLnJlZnRlc3RfdHlwZS5sZW5ndGg7CiAgICAgfSk7CiB9CiAK
QEAgLTk4LDcgKzExOCw3IEBAIGNvbnRyb2xsZXJzLlJlc3VsdHNEZXRhaWxzID0gYmFzZS5leHRl
bmRzKE9iamVjdCwgewogICAgIH0sCiAgICAgb25SZWJhc2VsaW5lOiBmdW5jdGlvbigpCiAgICAg
ewotICAgICAgICByZWJhc2VsaW5lV2l0aFN0YXR1c1VwZGF0ZXModGhpcy5fZmFpbHVyZUluZm9M
aXN0KCkpOworICAgICAgICByZWJhc2VsaW5lV2l0aFN0YXR1c1VwZGF0ZXModGhpcy5fZmFpbHVy
ZUluZm9MaXN0KCksIHRoaXMuX3Jlc3VsdHNCeVRlc3QpOwogICAgICAgICB0aGlzLl92aWV3Lm5l
eHRUZXN0KCk7CiAgICAgfSwKICAgICBvblVwZGF0ZUV4cGVjdGF0aW9uczogZnVuY3Rpb24oKQpA
QCAtMjA2LDcgKzIyNiwxNCBAQCB2YXIgRmFpbHVyZVN0cmVhbUNvbnRyb2xsZXIgPSBiYXNlLmV4
dGVuZHMoT2JqZWN0LCB7CiAgICAgfSwKICAgICBvblJlYmFzZWxpbmU6IGZ1bmN0aW9uKGZhaWx1
cmVzKQogICAgIHsKLSAgICAgICAgcmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVzKHRoaXMuX3Rv
RmFpbHVyZUluZm9MaXN0KGZhaWx1cmVzKSk7CisgICAgICAgIHZhciB0ZXN0TmFtZUxpc3QgPSBm
YWlsdXJlcy50ZXN0TmFtZUxpc3QoKTsKKyAgICAgICAgdmFyIGZhaWx1cmVzQnlUZXN0ID0gYmFz
ZS5maWx0ZXJEaWN0aW9uYXJ5KAorICAgICAgICAgICAgdGhpcy5fcmVzdWx0c0ZpbHRlcih0aGlz
Ll9tb2RlbC5yZXN1bHRzQnlCdWlsZGVyKSwKKyAgICAgICAgICAgIGZ1bmN0aW9uKGtleSkgewor
ICAgICAgICAgICAgICAgIHJldHVybiB0ZXN0TmFtZUxpc3QuaW5kZXhPZihrZXkpICE9IC0xOwor
ICAgICAgICAgICAgfSk7CisKKyAgICAgICAgcmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVzKHRo
aXMuX3RvRmFpbHVyZUluZm9MaXN0KGZhaWx1cmVzKSwgZmFpbHVyZXNCeVRlc3QpOwogICAgIH0s
CiAgICAgb25VcGRhdGVFeHBlY3RhdGlvbnM6IGZ1bmN0aW9uKGZhaWx1cmVzKQogICAgIHsKZGlm
ZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln
L3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHMuanMgYi9Ub29scy9C
dWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0
RmFpbHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzLmpzCmluZGV4IGQ2MjRhMjEyOWJjNjAxYzg3MjAz
NDYzNTdhOGEwOWFkNWNhZjBkMzEuLjA1ZTU5N2ViNDkzZWM0ZDIxYzU5ZjRkNGIxNmZhZjE3NDIy
NDQwNGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v
cmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHMuanMK
KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVi
bGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0cy5qcwpAQCAtMTg3LDcgKzE4
Nyw3IEBAIGZ1bmN0aW9uIGlzQW55UmVmdGVzdCh0ZXN0TmFtZSwgcmVzdWx0c0J5VGVzdCkKICAg
ICByZXR1cm4gT2JqZWN0LmtleXMocmVzdWx0c0J5VGVzdFt0ZXN0TmFtZV0pLm1hcChmdW5jdGlv
bihidWlsZGVyKSB7CiAgICAgICAgIHJldHVybiByZXN1bHRzQnlUZXN0W3Rlc3ROYW1lXVtidWls
ZGVyXTsKICAgICB9KS5zb21lKGZ1bmN0aW9uKHJlc3VsdE5vZGUpIHsKLSAgICAgICAgcmV0dXJu
IHJlc3VsdE5vZGUuaXNfcmVmdGVzdCB8fCByZXN1bHROb2RlLmlzX21pc21hdGNoX3JlZnRlc3QK
KyAgICAgICAgcmV0dXJuIHJlc3VsdE5vZGUucmVmdGVzdF90eXBlICYmIHJlc3VsdE5vZGUucmVm
dGVzdF90eXBlLmxlbmd0aDsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRT
bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1
cmVzL3NjcmlwdHMvdWkvcmVzdWx0c191bml0dGVzdHMuanMgYi9Ub29scy9CdWlsZFNsYXZlU3Vw
cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2Ny
aXB0cy91aS9yZXN1bHRzX3VuaXR0ZXN0cy5qcwppbmRleCAxYTRkNTUwODBjZDZjYjZmZWVkYjU0
ZTc2YTcyNmQzMDAwZDJiOWQ3Li4yNDU3YWM0YmRmNzdlOGZiOTEzN2M2NjA4YzU0ZWYzZGViNDky
NzM4IDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn
LWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzX3VuaXR0
ZXN0cy5qcworKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv
bmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzX3VuaXR0ZXN0
cy5qcwpAQCAtNjgsMTQgKzY4LDE0IEBAIHZhciBrRXhhbXBsZVJlZnRlc3RSZXN1bHRzID0gewog
ICAgICAgICAiTW9jayBCdWlsZGVyIjogewogICAgICAgICAgICAgImV4cGVjdGVkIjogIlBBU1Mi
LAogICAgICAgICAgICAgImFjdHVhbCI6ICJJTUFHRSIsCi0gICAgICAgICAgICAiaXNfcmVmdGVz
dCI6IHRydWUKKyAgICAgICAgICAgICJyZWZ0ZXN0X3R5cGUiOiBbIj09Il0KICAgICAgICAgfQog
ICAgIH0sCiAgICAgIm1pc21hdGNoLXJlZnRlc3QuaHRtbCI6IHsKICAgICAgICAgIk1vY2sgQnVp
bGRlciI6IHsKICAgICAgICAgICAgICJleHBlY3RlZCI6ICJQQVNTIiwKICAgICAgICAgICAgICJh
Y3R1YWwiOiAiSU1BR0UiLAotICAgICAgICAgICAgImlzX21pc21hdGNoX3JlZnRlc3QiOiB0cnVl
CisgICAgICAgICAgICAicmVmdGVzdF90eXBlIjogWyIhPSJdCiAgICAgICAgIH0KICAgICB9CiB9
Owo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>179371</attachid>
            <date>2012-12-13 16:28:57 -0800</date>
            <delta_ts>2012-12-13 20:09:54 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-101976-20121213162617.patch</filename>
            <type>text/plain</type>
            <size>7887</size>
            <attacher name="Dirk Pranke">dpranke</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NjczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2QwMzAwN2VlZGQzODVlY2YxNzczOGEwNDA3MmNlOGNm
ZTg1MTA4Mi4uYWVjNTUwM2MxNmUwODkzY2YyYWMwZDY5YjY5M2I3MGZmMmE0NDkzMiAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5
IEBACiAyMDEyLTEyLTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg
ICAgICAgIGdhcmRlbi1vLW1hdGljIGRvZXNuJ3Qga25vdyBhYm91dCByZWZ0ZXN0cworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxOTc2CisKKyAgICAg
ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXR0ZW1wdCB0byBtYWtl
IGdhcmRlbi1vLW1hdGljIHByb3Blcmx5IGF3YXJlIG9mIHJlZnRlc3RzIGFnYWluLgorCisgICAg
ICAgIFRoaXMgaXMgcmUtbGFuZGluZyByMTM3NDA3IHdpdGggYSBjaGFuZ2UgdG8KKyAgICAgICAg
cmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVzKCkgdG8gYWN0dWFsbHkgcGFzcyB0aGUgZmlsdGVy
ZWQKKyAgICAgICAgZmFpbHVyZUlub2ZMb3N0IHRvIGNoZWNrb3V0LnJlYmFzZWxpbmUoKS4KKwor
ICAgICAgICBVbmZvcnR1bmF0ZWx5LCB0aGUgdGVzdGluZyBjb3ZlcmFnZSBmb3IgdGhpcyB3aG9s
ZSBtb2R1bGUgaXMgYWxtb3N0CisgICAgICAgIG5vbi1leGlzdGVudCwgYW5kIGl0J3Mgbm90IG9i
dmlvdXMgdGhhdCB0aGVyZSdzIGEgZ29vZCB3YXkgdG8KKyAgICAgICAgc3R1YiBvdXQgY2hlY2tv
dXQucmViYXNlbGluZSgpIHRvIHRlc3QgdGhhdCB0aGUgcmlnaHQgdGhpbmcKKyAgICAgICAgaGFw
cGVucy4gSSB2ZXJpZmllZCB0aGUgY2hhbmdlIG1hbnVhbGx5LgorCisgICAgICAgICogQnVpbGRT
bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1
cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanM6CisgICAgICAgICguKToKKyAgICAgICAgKiBCdWls
ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFp
bHVyZXMvc2NyaXB0cy91aS9yZXN1bHRzLmpzOgorICAgICAgICAoLik6CisgICAgICAgICogQnVp
bGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZh
aWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0c191bml0dGVzdHMuanM6CisKKzIwMTItMTItMTMgIERp
cmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZCwg
cm9sbGluZyBvdXQgcjEzNzY2MS4KICAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu
Z2VzZXQvMTM3NjYxCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xMDQ4OTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl
YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NvbnRyb2xs
ZXJzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv
cHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxlcnMuanMKaW5kZXggZjJk
MGEyZmIxOGRiMjU2YTk5YjcwMTdiNzQ1YjhmZWU4OTk2NDVhNi4uOTRlMTZkN2I5Yjc0ZmQ2YmRk
MThkNmU3MzFmZjQ2Zjg3YmMwNGEwZSAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv
cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3Njcmlw
dHMvY29udHJvbGxlcnMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi
a2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY29udHJvbGxl
cnMuanMKQEAgLTMwLDIzICszMCw0OCBAQCB2YXIgY29udHJvbGxlcnMgPSBjb250cm9sbGVycyB8
fCB7fTsKIHZhciBrQ2hlY2tvdXRVbmF2YWlsYWJsZU1lc3NhZ2UgPSAnRmFpbGVkISBHYXJkZW4t
by1tYXRpYyBuZWVkcyBhIGxvY2FsIHNlcnZlciB0byBtb2RpZnkgeW91ciB3b3JraW5nIGNvcHku
IFBsZWFzZSBydW4gIndlYmtpdC1wYXRjaCBnYXJkZW4tby1tYXRpYyIgc3RhcnQgdGhlIGxvY2Fs
IHNlcnZlci4nOwogCiAvLyBGSVhNRTogV2hlcmUgc2hvdWxkIHRoaXMgZnVuY3Rpb24gZ28/Ci1m
dW5jdGlvbiByZWJhc2VsaW5lV2l0aFN0YXR1c1VwZGF0ZXMoZmFpbHVyZUluZm9MaXN0KQorZnVu
Y3Rpb24gcmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVzKGZhaWx1cmVJbmZvTGlzdCwgcmVzdWx0
c0J5VGVzdCkKIHsKLSAgICAvLyBGSVhNRTogSWYgYSB0ZXN0IGlzIGEgcmVmdGVzdCwgd2Via2l0
LXBhdGNoIHJlYmFzZWxpbmUtdGVzdCBzaG91bGQgZXJyb3Igb3V0Ci0gICAgLy8gYW5kIHdlIHNo
b3VsZCBhbGVydCAobW9kYWwgZGlhbG9nPykgdGhlIHVzZXIuCiAgICAgdmFyIHN0YXR1c1ZpZXcg
PSBuZXcgdWkuU3RhdHVzQXJlYSgnUmViYXNlbGluZScpOwogICAgIHZhciBpZCA9IHN0YXR1c1Zp
ZXcubmV3SWQoKTsKIAotICAgIHZhciB0ZXN0TmFtZXMgPSBiYXNlLnVuaXF1aWZ5QXJyYXkoZmFp
bHVyZUluZm9MaXN0Lm1hcChmdW5jdGlvbihmYWlsdXJlSW5mbykgeyByZXR1cm4gZmFpbHVyZUlu
Zm8udGVzdE5hbWU7IH0pKTsKLSAgICB2YXIgdGVzdE5hbWUgPSB0ZXN0TmFtZXMubGVuZ3RoID09
IDEgPyB0ZXN0TmFtZXNbMF0gOiB0ZXN0TmFtZXMubGVuZ3RoICsgJyB0ZXN0cyc7Ci0gICAgc3Rh
dHVzVmlldy5hZGRNZXNzYWdlKGlkLCAnUGVyZm9ybWluZyByZWJhc2VsaW5lIG9mICcgKyB0ZXN0
TmFtZSArICcuLi4nKTsKKyAgICB2YXIgZmFpbHVyZXNUb1JlYmFzZWxpbmUgPSBbXTsKKyAgICB2
YXIgdGVzdE5hbWVzTG9nZ2VkID0gW107CisgICAgZmFpbHVyZUluZm9MaXN0LmZvckVhY2goZnVu
Y3Rpb24oZmFpbHVyZUluZm8pIHsKKyAgICAgICAgaWYgKGlzQW55UmVmdGVzdChmYWlsdXJlSW5m
by50ZXN0TmFtZSwgcmVzdWx0c0J5VGVzdCkpIHsKKyAgICAgICAgICAgIGlmICh0ZXN0TmFtZXNM
b2dnZWQuaW5kZXhPZihmYWlsdXJlSW5mby50ZXN0TmFtZSkgPT0gLTEpIHsKKyAgICAgICAgICAg
ICAgICBzdGF0dXNWaWV3LmFkZE1lc3NhZ2UoaWQsIGZhaWx1cmVJbmZvLnRlc3ROYW1lICsgJyBp
cyBhIHJlZiB0ZXN0LCBza2lwcGluZycpOworICAgICAgICAgICAgICAgIHRlc3ROYW1lc0xvZ2dl
ZC5wdXNoKGZhaWx1cmVJbmZvLnRlc3ROYW1lKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBl
bHNlIHsKKyAgICAgICAgICAgIGZhaWx1cmVzVG9SZWJhc2VsaW5lLnB1c2goZmFpbHVyZUluZm8p
OworICAgICAgICAgICAgaWYgKHRlc3ROYW1lc0xvZ2dlZC5pbmRleE9mKGZhaWx1cmVJbmZvLnRl
c3ROYW1lKSA9PSAtMSkgeworICAgICAgICAgICAgICAgIHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShp
ZCwgJ1JlYmFzZWxpbmluZyAnICsgZmFpbHVyZUluZm8udGVzdE5hbWUgKyAnLi4uJyk7CisgICAg
ICAgICAgICAgICAgdGVzdE5hbWVzTG9nZ2VkLnB1c2goZmFpbHVyZUluZm8udGVzdE5hbWUpOwor
ICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfSk7CisgICAgCisgICAgaWYgKGZhaWx1cmVz
VG9SZWJhc2VsaW5lLmxlbmd0aCkgeworICAgICAgICBjaGVja291dC5yZWJhc2VsaW5lKGZhaWx1
cmVzVG9SZWJhc2VsaW5lLCBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHN0YXR1c1ZpZXcuYWRk
RmluYWxNZXNzYWdlKGlkLCAnUmViYXNlbGluZSBkb25lISBQbGVhc2UgbGFuZCB3aXRoICJ3ZWJr
aXQtcGF0Y2ggbGFuZC1jb3doYW5kIi4nKTsKKyAgICAgICAgfSwgZnVuY3Rpb24oZmFpbHVyZUlu
Zm8pIHsKKyAgICAgICAgICAgIHN0YXR1c1ZpZXcuYWRkTWVzc2FnZShpZCwgZmFpbHVyZUluZm8u
dGVzdE5hbWUgKyAnIG9uICcgKyB1aS5kaXNwbGF5TmFtZUZvckJ1aWxkZXIoZmFpbHVyZUluZm8u
YnVpbGRlck5hbWUpKTsKKyAgICAgICAgfSwgZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBzdGF0
dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShpZCwga0NoZWNrb3V0VW5hdmFpbGFibGVNZXNzYWdlKTsK
KyAgICAgICAgfSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc3RhdHVzVmlldy5hZGRGaW5hbE1l
c3NhZ2UoaWQsICdObyBub24tcmVmdGVzdHMgbGVmdCB0byByZWJhc2VsaW5lIScpCisgICAgfQor
fQogCi0gICAgY2hlY2tvdXQucmViYXNlbGluZShmYWlsdXJlSW5mb0xpc3QsIGZ1bmN0aW9uKCkg
ewotICAgICAgICBzdGF0dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShpZCwgJ1JlYmFzZWxpbmUgZG9u
ZSEgUGxlYXNlIGxhbmQgd2l0aCAid2Via2l0LXBhdGNoIGxhbmQtY293aGFuZCIuJyk7Ci0gICAg
fSwgZnVuY3Rpb24oZmFpbHVyZUluZm8pIHsKLSAgICAgICAgc3RhdHVzVmlldy5hZGRNZXNzYWdl
KGlkLCBmYWlsdXJlSW5mby50ZXN0TmFtZSArICcgb24gJyArIHVpLmRpc3BsYXlOYW1lRm9yQnVp
bGRlcihmYWlsdXJlSW5mby5idWlsZGVyTmFtZSkpOwotICAgIH0sIGZ1bmN0aW9uKCkgewotICAg
ICAgICBzdGF0dXNWaWV3LmFkZEZpbmFsTWVzc2FnZShpZCwga0NoZWNrb3V0VW5hdmFpbGFibGVN
ZXNzYWdlKTsKKy8vIEZJWE1FOiBUaGlzIGlzIGR1cGxpY2F0ZWQgZnJvbSB1aS9yZXN1bHRzLmpz
IDooLgorZnVuY3Rpb24gaXNBbnlSZWZ0ZXN0KHRlc3ROYW1lLCByZXN1bHRzQnlUZXN0KQorewor
ICAgIHJldHVybiBPYmplY3Qua2V5cyhyZXN1bHRzQnlUZXN0W3Rlc3ROYW1lXSkubWFwKGZ1bmN0
aW9uKGJ1aWxkZXIpIHsKKyAgICAgICAgcmV0dXJuIHJlc3VsdHNCeVRlc3RbdGVzdE5hbWVdW2J1
aWxkZXJdOworICAgIH0pLnNvbWUoZnVuY3Rpb24ocmVzdWx0Tm9kZSkgeworICAgICAgICByZXR1
cm4gcmVzdWx0Tm9kZS5yZWZ0ZXN0X3R5cGUgJiYgcmVzdWx0Tm9kZS5yZWZ0ZXN0X3R5cGUubGVu
Z3RoOwogICAgIH0pOwogfQogCkBAIC05OCw3ICsxMjMsNyBAQCBjb250cm9sbGVycy5SZXN1bHRz
RGV0YWlscyA9IGJhc2UuZXh0ZW5kcyhPYmplY3QsIHsKICAgICB9LAogICAgIG9uUmViYXNlbGlu
ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgcmViYXNlbGluZVdpdGhTdGF0dXNVcGRhdGVz
KHRoaXMuX2ZhaWx1cmVJbmZvTGlzdCgpKTsKKyAgICAgICAgcmViYXNlbGluZVdpdGhTdGF0dXNV
cGRhdGVzKHRoaXMuX2ZhaWx1cmVJbmZvTGlzdCgpLCB0aGlzLl9yZXN1bHRzQnlUZXN0KTsKICAg
ICAgICAgdGhpcy5fdmlldy5uZXh0VGVzdCgpOwogICAgIH0sCiAgICAgb25VcGRhdGVFeHBlY3Rh
dGlvbnM6IGZ1bmN0aW9uKCkKQEAgLTIwNiw3ICsyMzEsMTQgQEAgdmFyIEZhaWx1cmVTdHJlYW1D
b250cm9sbGVyID0gYmFzZS5leHRlbmRzKE9iamVjdCwgewogICAgIH0sCiAgICAgb25SZWJhc2Vs
aW5lOiBmdW5jdGlvbihmYWlsdXJlcykKICAgICB7Ci0gICAgICAgIHJlYmFzZWxpbmVXaXRoU3Rh
dHVzVXBkYXRlcyh0aGlzLl90b0ZhaWx1cmVJbmZvTGlzdChmYWlsdXJlcykpOworICAgICAgICB2
YXIgdGVzdE5hbWVMaXN0ID0gZmFpbHVyZXMudGVzdE5hbWVMaXN0KCk7CisgICAgICAgIHZhciBm
YWlsdXJlc0J5VGVzdCA9IGJhc2UuZmlsdGVyRGljdGlvbmFyeSgKKyAgICAgICAgICAgIHRoaXMu
X3Jlc3VsdHNGaWx0ZXIodGhpcy5fbW9kZWwucmVzdWx0c0J5QnVpbGRlciksCisgICAgICAgICAg
ICBmdW5jdGlvbihrZXkpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gdGVzdE5hbWVMaXN0Lmlu
ZGV4T2Yoa2V5KSAhPSAtMTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgIHJlYmFzZWxpbmVX
aXRoU3RhdHVzVXBkYXRlcyh0aGlzLl90b0ZhaWx1cmVJbmZvTGlzdChmYWlsdXJlcyksIGZhaWx1
cmVzQnlUZXN0KTsKICAgICB9LAogICAgIG9uVXBkYXRlRXhwZWN0YXRpb25zOiBmdW5jdGlvbihm
YWlsdXJlcykKICAgICB7CmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWls
ZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0cy91aS9y
ZXN1bHRzLmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m
aWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0cy5qcwppbmRleCBk
NjI0YTIxMjliYzYwMWM4NzIwMzQ2MzU3YThhMDlhZDVjYWYwZDMxLi4wNWU1OTdlYjQ5M2VjNGQy
MWM1OWY0ZDRiMTZmYWYxNzQyMjQ0MDRjIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3Vw
cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2Ny
aXB0cy91aS9yZXN1bHRzLmpzCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndl
YmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3Vs
dHMuanMKQEAgLTE4Nyw3ICsxODcsNyBAQCBmdW5jdGlvbiBpc0FueVJlZnRlc3QodGVzdE5hbWUs
IHJlc3VsdHNCeVRlc3QpCiAgICAgcmV0dXJuIE9iamVjdC5rZXlzKHJlc3VsdHNCeVRlc3RbdGVz
dE5hbWVdKS5tYXAoZnVuY3Rpb24oYnVpbGRlcikgewogICAgICAgICByZXR1cm4gcmVzdWx0c0J5
VGVzdFt0ZXN0TmFtZV1bYnVpbGRlcl07CiAgICAgfSkuc29tZShmdW5jdGlvbihyZXN1bHROb2Rl
KSB7Ci0gICAgICAgIHJldHVybiByZXN1bHROb2RlLmlzX3JlZnRlc3QgfHwgcmVzdWx0Tm9kZS5p
c19taXNtYXRjaF9yZWZ0ZXN0CisgICAgICAgIHJldHVybiByZXN1bHROb2RlLnJlZnRlc3RfdHlw
ZSAmJiByZXN1bHROb2RlLnJlZnRlc3RfdHlwZS5sZW5ndGg7CiAgICAgfSk7CiB9CiAKZGlmZiAt
LWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1
YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL3VpL3Jlc3VsdHNfdW5pdHRlc3RzLmpzIGIv
VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0
bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvdWkvcmVzdWx0c191bml0dGVzdHMuanMKaW5kZXggMWE0
ZDU1MDgwY2Q2Y2I2ZmVlZGI1NGU3NmE3MjZkMzAwMGQyYjlkNy4uMjQ1N2FjNGJkZjc3ZThmYjkx
MzdjNjYwOGM1NGVmM2RlYjQ5MjczOCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv
cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3Njcmlw
dHMvdWkvcmVzdWx0c191bml0dGVzdHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv
YnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMv
dWkvcmVzdWx0c191bml0dGVzdHMuanMKQEAgLTY4LDE0ICs2OCwxNCBAQCB2YXIga0V4YW1wbGVS
ZWZ0ZXN0UmVzdWx0cyA9IHsKICAgICAgICAgIk1vY2sgQnVpbGRlciI6IHsKICAgICAgICAgICAg
ICJleHBlY3RlZCI6ICJQQVNTIiwKICAgICAgICAgICAgICJhY3R1YWwiOiAiSU1BR0UiLAotICAg
ICAgICAgICAgImlzX3JlZnRlc3QiOiB0cnVlCisgICAgICAgICAgICAicmVmdGVzdF90eXBlIjog
WyI9PSJdCiAgICAgICAgIH0KICAgICB9LAogICAgICJtaXNtYXRjaC1yZWZ0ZXN0Lmh0bWwiOiB7
CiAgICAgICAgICJNb2NrIEJ1aWxkZXIiOiB7CiAgICAgICAgICAgICAiZXhwZWN0ZWQiOiAiUEFT
UyIsCiAgICAgICAgICAgICAiYWN0dWFsIjogIklNQUdFIiwKLSAgICAgICAgICAgICJpc19taXNt
YXRjaF9yZWZ0ZXN0IjogdHJ1ZQorICAgICAgICAgICAgInJlZnRlc3RfdHlwZSI6IFsiIT0iXQog
ICAgICAgICB9CiAgICAgfQogfTsK
</data>
<flag name="review"
          id="196218"
          type_id="1"
          status="+"
          setter="eric"
    />
          </attachment>
      

    </bug>

</bugzilla>