Remove the cr-mac-ews (it's long been dead)
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 23:09:51 +0000 (23:09 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Feb 2012 23:09:51 +0000 (23:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78267

Reviewed by Adam Barth.

* QueueStatusServer/model/queues.py:
(Queue):
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
(ChromiumWindowsEWS):
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
(EarlyWarningSytemTest._test_builder_ews):
(EarlyWarningSytemTest._test_testing_ews):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/QueueStatusServer/model/queues.py
Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py
Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py

index 17e4d5a..59a190f 100644 (file)
@@ -1,3 +1,18 @@
+2012-02-09  Eric Seidel  <eric@webkit.org>
+
+        Remove the cr-mac-ews (it's long been dead)
+        https://bugs.webkit.org/show_bug.cgi?id=78267
+
+        Reviewed by Adam Barth.
+
+        * QueueStatusServer/model/queues.py:
+        (Queue):
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        (ChromiumWindowsEWS):
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+        (EarlyWarningSytemTest._test_builder_ews):
+        (EarlyWarningSytemTest._test_testing_ews):
+
 2012-02-09  Dirk Pranke  <dpranke@chromium.org>
 
         some tests in webkitpy are being run three times
index bd5e7ed..b132891 100644 (file)
@@ -39,13 +39,12 @@ class Queue(object):
     _all_queue_names = [
         "commit-queue",
         "style-queue",
-        "chromium-ews",
+        "chromium-ews",  # aka cr-linux-ews
         "qt-ews",
         "gtk-ews",
         "mac-ews",
         "win-ews",
         "efl-ews",
-        "cr-mac-ews",
     ]
 
     def __init__(self, name):
index 58aa6a8..387f61e 100644 (file)
@@ -186,24 +186,6 @@ class ChromiumWindowsEWS(AbstractChromiumEWS):
     name = "cr-win-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):
-    def process_work_item(self, patch):
-        if not patch.attacher() or not patch.attacher().can_commit:
-            self._did_error(patch, "%s cannot process patches from non-committers :(" % self.name)
-            return False
-        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(AbstractEarlyWarningSystem):
     name = "mac-ews"
     port_name = "mac"
index afb1db0..d695cf2 100644 (file)
@@ -71,13 +71,6 @@ class EarlyWarningSytemTest(QueuesTest):
         ews.bind_to_tool(MockTool())
         self.assert_queue_outputs(ews, expected_stderr=self._default_expected_stderr(ews))
 
-    def _test_committer_only_ews(self, ews):
-        ews.bind_to_tool(MockTool())
-        expected_stderr = self._default_expected_stderr(ews)
-        string_replacemnts = {"name": ews.name}
-        expected_stderr["process_work_item"] = "MOCK: update_status: %(name)s Error: %(name)s cannot process patches from non-committers :(\nMOCK: release_work_item: %(name)s 10000\n" % string_replacemnts
-        self.assert_queue_outputs(ews, expected_stderr=expected_stderr)
-
     def _test_testing_ews(self, ews):
         ews.layout_test_results = lambda: None
         ews.bind_to_tool(MockTool())
@@ -85,9 +78,6 @@ class EarlyWarningSytemTest(QueuesTest):
         expected_stderr["handle_script_error"] = "ScriptError error message\n"
         self.assert_queue_outputs(ews, expected_stderr=expected_stderr)
 
-    def test_committer_only_ewses(self):
-        self._test_committer_only_ews(ChromiumMacEWS())
-
     def test_builder_ewses(self):
         self._test_builder_ews(MacEWS())
         self._test_builder_ews(ChromiumWindowsEWS())