[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 006872d65640f1516c6a742d92db97c23242fcf1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 04:05:11 2010 +0000

    2010-10-18  Eric Seidel  <eric at webkit.org>
    
            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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70022 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 91f0ef4..ce73ced 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-18  Eric Seidel  <eric at webkit.org>
+
+        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:
+
 2010-10-18  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
index 90b8bea..5ec468e 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
@@ -148,10 +148,6 @@ class ChromiumWindowsEWS(AbstractChromiumEWS):
     name = "cr-win-ews"
 
 
-class ChromiumMacEWS(AbstractChromiumEWS):
-    name = "cr-mac-ews"
-
-
 # For platforms that we can't run inside a VM (like Mac OS X), we require
 # patches to be uploaded by committers, who are generally trustworthy folk. :)
 class AbstractCommitterOnlyEWS(AbstractEarlyWarningSystem):
@@ -166,6 +162,14 @@ class AbstractCommitterOnlyEWS(AbstractEarlyWarningSystem):
         return AbstractEarlyWarningSystem.process_work_item(self, patch)
 
 
+# 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 = "cr-mac-ews"
+
+
 class MacEWS(AbstractCommitterOnlyEWS):
     name = "mac-ews"
     port_name = "mac"
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
index aad59e8..bc09e32 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
@@ -85,3 +85,12 @@ class EarlyWarningSytemTest(QueuesTest):
             "handle_script_error": SystemExit,
         }
         self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)
+
+    def test_chromium_mac_ews(self):
+        ews = ChromiumMacEWS()
+        expected_stderr = self._default_expected_stderr(ews)
+        expected_stderr["process_work_item"] = "MOCK: update_status: cr-mac-ews Error: cr-mac-ews cannot process patches from non-committers :(\n"
+        expected_exceptions = {
+            "handle_script_error": SystemExit,
+        }
+        self.assert_queue_outputs(ews, expected_stderr=expected_stderr, expected_exceptions=expected_exceptions)

-- 
WebKit Debian packaging