<?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>64460</bug_id>
          
          <creation_ts>2011-07-13 09:52:13 -0700</creation_ts>
          <short_desc>Consolidate expectations parsing code.</short_desc>
          <delta_ts>2011-07-13 12:37:05 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>New Bugs</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>
          
          <blocked>64385</blocked>
          <everconfirmed>1</everconfirmed>
          <reporter name="Dimitri Glazkov (Google)">dglazkov</reporter>
          <assigned_to name="Dimitri Glazkov (Google)">dglazkov</assigned_to>
          <cc>abarth</cc>
    
    <cc>webkit.review.bot</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>436480</commentid>
    <comment_count>0</comment_count>
    <who name="Dimitri Glazkov (Google)">dglazkov</who>
    <bug_when>2011-07-13 09:52:13 -0700</bug_when>
    <thetext>Consolidate expectations parsing code.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>436482</commentid>
    <comment_count>1</comment_count>
      <attachid>100680</attachid>
    <who name="Dimitri Glazkov (Google)">dglazkov</who>
    <bug_when>2011-07-13 09:54:13 -0700</bug_when>
    <thetext>Created attachment 100680
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>436505</commentid>
    <comment_count>2</comment_count>
      <attachid>100680</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-07-13 10:25:14 -0700</bug_when>
    <thetext>Comment on attachment 100680
Patch

Rejecting attachment 100680 from commit-queue.

Failed to run &quot;[&apos;./Tools/Scripts/webkit-patch&apos;, &apos;--status-host=queues.webkit.org&apos;, &apos;--bot-id=ec2-cq-01&apos;, &apos;--port...&quot; exit_code: 1

Last 500 characters of output:
eviewer_by_email
    return self._reviewer_only(self.contributor_by_email(email))
  File &quot;/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/config/committers.py&quot;, line 434, in contributor_by_email
    return self._email_to_contributor_map().get(email)
  File &quot;/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/common/config/committers.py&quot;, line 403, in _email_to_contributor_map
    assert(email not in self._contributors_by_email)  # We should never have duplicate emails.
AssertionError

Full output: http://queues.webkit.org/results/9023631</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>436566</commentid>
    <comment_count>3</comment_count>
      <attachid>100680</attachid>
    <who name="Dimitri Glazkov (Google)">dglazkov</who>
    <bug_when>2011-07-13 11:42:13 -0700</bug_when>
    <thetext>Comment on attachment 100680
Patch

next in line.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>436601</commentid>
    <comment_count>4</comment_count>
      <attachid>100680</attachid>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-07-13 12:37:01 -0700</bug_when>
    <thetext>Comment on attachment 100680
Patch

Clearing flags on attachment: 100680

Committed r90941: &lt;http://trac.webkit.org/changeset/90941&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>436602</commentid>
    <comment_count>5</comment_count>
    <who name="WebKit Review Bot">webkit.review.bot</who>
    <bug_when>2011-07-13 12:37:05 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>100680</attachid>
            <date>2011-07-13 09:54:13 -0700</date>
            <delta_ts>2011-07-13 12:37:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-64460-20110713095412.patch</filename>
            <type>text/plain</type>
            <size>5248</size>
            <attacher name="Dimitri Glazkov (Google)">dglazkov</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5MjAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi
L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4YjQ4YWFhM2VkYWY4NzdjZmY4YjgxZGE3NDkwNzYwOGI2
NGJhNzM4Li40NjQzNjQ0NTE2MGM3MTY2MThlMDllNjRjNzIzYWFkMWU4ODIxNTBlIDEwMDY0NAot
LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQg
QEAKIDIwMTEtMDctMTMgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4K
IAorICAgICAgICBDb25zb2xpZGF0ZSBleHBlY3RhdGlvbnMgcGFyc2luZyBjb2RlLgorICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ0NjAKKworICAgICAg
ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0
cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weTogRm9sZGVkIFRlc3RF
eHBlY3RhdGlvblBhcnNlci5fc3BsaXRfZXhwZWN0YXRpb25fc3RyaW5nIGludG8gVGVzdEV4cGVj
dGF0aW9uUGFyc2VyLnBhcnNlLgorCisyMDExLTA3LTEzICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xh
emtvdkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgRWxpbWluYXRlIFRlc3RFeHBlY3RhdGlvbnNG
aWxlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ0
NTgKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k
ZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf
dGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDVjYjIzMjEwNDUwOGU1OTlm
ODlhZDI0M2RkOTFjNzc3NTNkNjUxNDYuLjg2ZGNiYWRhN2EyZjY0Zjk0YTU1ZGI3N2FkYWU0Yjc0
YWVhY2I4NjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz
L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTE3MywyNiArMTcz
LDQwIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlcjoKICAgICAgICAgQW55IGVycmFudCB3
aGl0ZXNwYWNlIGlzIG5vdCBwcmVzZXJ2ZWQuCiAKICAgICAgICAgIiIiCi0gICAgICAgIHJlc3Vs
dCA9IFRlc3RFeHBlY3RhdGlvbkxpbmUoKQorICAgICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBl
Y3RhdGlvbkxpbmUoKQogICAgICAgICBlcnJvcnMgPSBbXQotICAgICAgICAobW9kaWZpZXJzLCBu
YW1lLCBleHBlY3RhdGlvbnMsIGNvbW1lbnQpID0gY2xzLl9zcGxpdF9leHBlY3RhdGlvbl9zdHJp
bmcoZXhwZWN0YXRpb25fc3RyaW5nLCBlcnJvcnMpCisgICAgICAgIGNvbW1lbnRfaW5kZXggPSBl
eHBlY3RhdGlvbl9zdHJpbmcuZmluZCgiLy8iKQorICAgICAgICBpZiBjb21tZW50X2luZGV4ID09
IC0xOgorICAgICAgICAgICAgY29tbWVudF9pbmRleCA9IGxlbihleHBlY3RhdGlvbl9zdHJpbmcp
CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBleHBlY3RhdGlvbi5jb21tZW50ID0gZXhwZWN0
YXRpb25fc3RyaW5nW2NvbW1lbnRfaW5kZXggKyAyOl0KKworICAgICAgICByZW1haW5pbmdfc3Ry
aW5nID0gcmUuc3ViKHIiXHMrIiwgIiAiLCBleHBlY3RhdGlvbl9zdHJpbmdbOmNvbW1lbnRfaW5k
ZXhdLnN0cmlwKCkpCisgICAgICAgIGlmIGxlbihyZW1haW5pbmdfc3RyaW5nKSA9PSAwOgorICAg
ICAgICAgICAgZXhwZWN0YXRpb24ubWFsZm9ybWVkID0gRmFsc2UKKyAgICAgICAgICAgIGV4cGVj
dGF0aW9uLnZhbGlkID0gVHJ1ZQorICAgICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9uLCBlcnJv
cnMKKworICAgICAgICBwYXJ0cyA9IHJlbWFpbmluZ19zdHJpbmcuc3BsaXQoJzonKQorICAgICAg
ICBpZiBsZW4ocGFydHMpICE9IDI6CisgICAgICAgICAgICBlcnJvcnMuYXBwZW5kKCgiTWlzc2lu
ZyBhICc6JyBpbiIgaWYgbGVuKHBhcnRzKSA8IDIgZWxzZSAiRXh0cmFuZW91cyAnOicgaW4iLCAi
JyIgKyBleHBlY3RhdGlvbl9zdHJpbmcgKyAiJyIpKQorICAgICAgICBlbHNlOgorICAgICAgICAg
ICAgdGVzdF9hbmRfZXhwZWN0YXRpb24gPSBwYXJ0c1sxXS5zcGxpdCgnPScpCisgICAgICAgICAg
ICBpZiBsZW4odGVzdF9hbmRfZXhwZWN0YXRpb24pICE9IDI6CisgICAgICAgICAgICAgICAgZXJy
b3JzLmFwcGVuZCgoIk1pc3NpbmcgZXhwZWN0YXRpb25zIGluIiBpZiBsZW4odGVzdF9hbmRfZXhw
ZWN0YXRpb24pIDwgMiBlbHNlICJFeHRyYW5lb3VzICc9JyBpbiIsICInIiArIGV4cGVjdGF0aW9u
X3N0cmluZyArICInIikpCisKICAgICAgICAgaWYgbGVuKGVycm9ycykgPiAwOgotICAgICAgICAg
ICAgcmVzdWx0Lm1hbGZvcm1lZCA9IFRydWUKLSAgICAgICAgICAgIHJlc3VsdC5jb21tZW50ID0g
ZXhwZWN0YXRpb25fc3RyaW5nCi0gICAgICAgICAgICByZXN1bHQudmFsaWQgPSBGYWxzZQorICAg
ICAgICAgICAgZXhwZWN0YXRpb24uY29tbWVudCA9IGV4cGVjdGF0aW9uX3N0cmluZworICAgICAg
ICAgICAgZXhwZWN0YXRpb24ubWFsZm9ybWVkID0gVHJ1ZQorICAgICAgICAgICAgZXhwZWN0YXRp
b24udmFsaWQgPSBGYWxzZQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgcmVzdWx0Lm1hbGZv
cm1lZCA9IEZhbHNlCi0gICAgICAgICAgICByZXN1bHQuY29tbWVudCA9IGNvbW1lbnQKLSAgICAg
ICAgICAgIHJlc3VsdC52YWxpZCA9IFRydWUKLSAgICAgICAgICAgIHJlc3VsdC5uYW1lID0gbmFt
ZQotICAgICAgICAgICAgIyBGSVhNRTogTW9kaWZpZXJzIHNob3VsZCBiZSBpdHMgb3duIGNsYXNz
IGV2ZW50dWFsbHkuCi0gICAgICAgICAgICBpZiBtb2RpZmllcnMgaXMgbm90IE5vbmU6Ci0gICAg
ICAgICAgICAgICAgcmVzdWx0Lm1vZGlmaWVycyA9IGNscy5fc3BsaXRfc3BhY2Vfc2VwYXJhdGVk
KG1vZGlmaWVycykKLSAgICAgICAgICAgICMgRklYTUU6IEV4cGVjdGF0aW9ucyBzaG91bGQgYmUg
aXRzIG93biBjbGFzcyBldmVudHVhbGx5LgotICAgICAgICAgICAgaWYgZXhwZWN0YXRpb25zIGlz
IG5vdCBOb25lOgotICAgICAgICAgICAgICAgIHJlc3VsdC5leHBlY3RhdGlvbnMgPSBjbHMuX3Nw
bGl0X3NwYWNlX3NlcGFyYXRlZChleHBlY3RhdGlvbnMpCi0KLSAgICAgICAgcmV0dXJuIChyZXN1
bHQsIGVycm9ycykKKyAgICAgICAgICAgIGV4cGVjdGF0aW9uLm1hbGZvcm1lZCA9IEZhbHNlCisg
ICAgICAgICAgICBleHBlY3RhdGlvbi52YWxpZCA9IFRydWUKKyAgICAgICAgICAgIGV4cGVjdGF0
aW9uLm1vZGlmaWVycyA9IGNscy5fc3BsaXRfc3BhY2Vfc2VwYXJhdGVkKHBhcnRzWzBdKQorICAg
ICAgICAgICAgZXhwZWN0YXRpb24ubmFtZSA9IHRlc3RfYW5kX2V4cGVjdGF0aW9uWzBdLnN0cmlw
KCkKKyAgICAgICAgICAgIGV4cGVjdGF0aW9uLmV4cGVjdGF0aW9ucyA9IGNscy5fc3BsaXRfc3Bh
Y2Vfc2VwYXJhdGVkKHRlc3RfYW5kX2V4cGVjdGF0aW9uWzFdKQorCisgICAgICAgIHJldHVybiBl
eHBlY3RhdGlvbiwgZXJyb3JzCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgcGFyc2VfbGlz
dChjbHMsIGV4cGVjdGF0aW9uc19zdHJpbmcsIHZhbGlkYXRvcik6CkBAIC0yMDcsMzUgKzIyMSw2
IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlcjoKICAgICAgICAgcmV0dXJuIGV4cGVjdGF0
aW9ucwogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9zcGxpdF9leHBlY3RhdGlvbl9zdHJp
bmcoY2xzLCBsaW5lLCBlcnJvcnMpOgotICAgICAgICAiIiJTcGxpdHMgbGluZSBpbnRvIGEgc3Ry
aW5nIG9mIG1vZGlmaWVycywgYSB0ZXN0IG5hbWUsIGEgc3RyaW5nIG9mIGV4cGVjdGF0aW9ucywg
YW5kIGEgY29tbWVudCwKLSAgICAgICAgcmV0dXJuaW5nIHRoZW0gYXMgYSB0dXBsZS4gSW4gY2Fz
ZSBwYXJzaW5nIGVycm9yLCByZXR1cm5zIGVtcHR5IHR1cGxlLgotICAgICAgICAiIiIKLSAgICAg
ICAgY29tbWVudF9pbmRleCA9IGxpbmUuZmluZCgiLy8iKQotICAgICAgICBjb21tZW50ID0gJycK
LSAgICAgICAgaWYgY29tbWVudF9pbmRleCA9PSAtMToKLSAgICAgICAgICAgIGNvbW1lbnRfaW5k
ZXggPSBsZW4obGluZSkKLSAgICAgICAgICAgIGNvbW1lbnQgPSBOb25lCi0gICAgICAgIGVsc2U6
Ci0gICAgICAgICAgICBjb21tZW50ID0gbGluZVtjb21tZW50X2luZGV4ICsgMjpdCi0KLSAgICAg
ICAgbGluZSA9IHJlLnN1YihyIlxzKyIsICIgIiwgbGluZVs6Y29tbWVudF9pbmRleF0uc3RyaXAo
KSkKLSAgICAgICAgaWYgbGVuKGxpbmUpID09IDA6Ci0gICAgICAgICAgICByZXR1cm4gKE5vbmUs
IE5vbmUsIE5vbmUsIGNvbW1lbnQpCi0KLSAgICAgICAgcGFydHMgPSBsaW5lLnNwbGl0KCc6JykK
LSAgICAgICAgaWYgbGVuKHBhcnRzKSAhPSAyOgotICAgICAgICAgICAgZXJyb3JzLmFwcGVuZCgo
Ik1pc3NpbmcgYSAnOicgaW4iIGlmIGxlbihwYXJ0cykgPCAyIGVsc2UgIkV4dHJhbmVvdXMgJzon
IGluIiwgIiciICsgbGluZSArICInIikpCi0gICAgICAgICAgICByZXR1cm4gKE5vbmUsIE5vbmUs
IE5vbmUsIE5vbmUpCi0KLSAgICAgICAgdGVzdF9hbmRfZXhwZWN0YXRpb24gPSBwYXJ0c1sxXS5z
cGxpdCgnPScpCi0gICAgICAgIGlmIGxlbih0ZXN0X2FuZF9leHBlY3RhdGlvbikgIT0gMjoKLSAg
ICAgICAgICAgIGVycm9ycy5hcHBlbmQoKCJNaXNzaW5nIGV4cGVjdGF0aW9ucyBpbiIgaWYgbGVu
KHRlc3RfYW5kX2V4cGVjdGF0aW9uKSA8IDIgZWxzZSAiRXh0cmFuZW91cyAnPScgaW4iLCAiJyIg
KyBsaW5lICsgIiciKSkKLSAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSwgTm9uZSwgTm9u
ZSkKLQotICAgICAgICByZXR1cm4gKHBhcnRzWzBdLnN0cmlwKCksIHRlc3RfYW5kX2V4cGVjdGF0
aW9uWzBdLnN0cmlwKCksIHRlc3RfYW5kX2V4cGVjdGF0aW9uWzFdLnN0cmlwKCksIGNvbW1lbnQp
Ci0KLSAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgX3NwbGl0X3NwYWNlX3NlcGFyYXRlZChjbHMs
IHNwYWNlX3NlcGFyYXRlZF9zdHJpbmcpOgogICAgICAgICAiIiJTcGxpdHMgYSBzcGFjZS1zZXBh
cmF0ZWQgc3RyaW5nIGludG8gYW4gYXJyYXkuIiIiCiAgICAgICAgICMgRklYTUU6IExvd2VyLWNh
c2luZyBpcyBuZWNlc3NhcnkgdG8gc3VwcG9ydCBsZWdhY3kgY29kZS4gTmVlZCB0byBlbGltaW5h
dGUuCg==
</data>

          </attachment>
      

    </bug>

</bugzilla>