<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[70022] trunk/WebKitTools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/70022">70022</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-18 21:05:11 -0700 (Mon, 18 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-10-18  Eric Seidel  &lt;eric@webkit.org&gt;

        Reviewed by Adam Barth.

        Make it possible to run a chromium-mac-ews builder
        https://bugs.webkit.org/show_bug.cgi?id=47876

        Since we can't run Mac OS X in a VM, we need to only run committer patches.
        There was a multiple inheritance problem which was holding this patch back,
        but I decided to just ignore the problem and go with a functional hack for now.

        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystempy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (70021 => 70022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-10-19 03:22:04 UTC (rev 70021)
+++ trunk/WebKitTools/ChangeLog        2010-10-19 04:05:11 UTC (rev 70022)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2010-10-18  Eric Seidel  &lt;eric@webkit.org&gt;
+
+        Reviewed by Adam Barth.
+
+        Make it possible to run a chromium-mac-ews builder
+        https://bugs.webkit.org/show_bug.cgi?id=47876
+
+        Since we can't run Mac OS X in a VM, we need to only run committer patches.
+        There was a multiple inheritance problem which was holding this patch back,
+        but I decided to just ignore the problem and go with a functional hack for now.
+
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+
</ins><span class="cx"> 2010-10-18  Kenneth Russell  &lt;kbr@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Tony Chang.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (70021 => 70022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py        2010-10-19 03:22:04 UTC (rev 70021)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py        2010-10-19 04:05:11 UTC (rev 70022)
</span><span class="lines">@@ -148,10 +148,6 @@
</span><span class="cx">     name = &quot;cr-win-ews&quot;
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class ChromiumMacEWS(AbstractChromiumEWS):
-    name = &quot;cr-mac-ews&quot;
-
-
</del><span class="cx"> # For platforms that we can't run inside a VM (like Mac OS X), we require
</span><span class="cx"> # patches to be uploaded by committers, who are generally trustworthy folk. :)
</span><span class="cx"> class AbstractCommitterOnlyEWS(AbstractEarlyWarningSystem):
</span><span class="lines">@@ -166,6 +162,14 @@
</span><span class="cx">         return AbstractEarlyWarningSystem.process_work_item(self, patch)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+# FIXME: Inheriting from AbstractCommitterOnlyEWS is kinda a hack, but it
+# happens to work because AbstractChromiumEWS and AbstractCommitterOnlyEWS
+# provide disjoint sets of functionality, and Python is otherwise smart
+# enough to handle the diamond inheritance.
+class ChromiumMacEWS(AbstractChromiumEWS, AbstractCommitterOnlyEWS):
+    name = &quot;cr-mac-ews&quot;
+
+
</ins><span class="cx"> class MacEWS(AbstractCommitterOnlyEWS):
</span><span class="cx">     name = &quot;mac-ews&quot;
</span><span class="cx">     port_name = &quot;mac&quot;
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (70021 => 70022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py        2010-10-19 03:22:04 UTC (rev 70021)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py        2010-10-19 04:05:11 UTC (rev 70022)
</span><span class="lines">@@ -85,3 +85,12 @@
</span><span class="cx">             &quot;handle_script_error&quot;: SystemExit,
</span><span class="cx">         }
</span><span class="cx">         self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
</span><ins>+
+    def test_chromium_mac_ews(self):
+        ews = ChromiumMacEWS()
+        expected_stderr = self._default_expected_stderr(ews)
+        expected_stderr[&quot;process_work_item&quot;] = &quot;MOCK: update_status: cr-mac-ews Error: cr-mac-ews cannot process patches from non-committers :(\n&quot;
+        expected_exceptions = {
+            &quot;handle_script_error&quot;: SystemExit,
+        }
+        self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
</ins></span></pre>
</div>
</div>

</body>
</html>