Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

1 files changed, 23 insertions, 23 deletions

diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
index 4d23a4c..3d0ddd1 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py
@@ -39,37 +39,37 @@ class EarlyWarningSytemTest(QueuesTest):
         ews._can_build = lambda: True
         ews.review_patch(Mock())
 
-    def test_chromium_linux_ews(self):
+    def _default_expected_stderr(self, ews):
+        string_replacemnts = {
+            "name": ews.name,
+            "checkout_dir": os.getcwd(),  # FIXME: Use of os.getcwd() is wrong, should be scm.checkout_root
+        }
         expected_stderr = {
-            "begin_work_queue": "CAUTION: chromium-ews will discard all local changes in \"%s\"\nRunning WebKit chromium-ews.\n" % os.getcwd(),
+            "begin_work_queue": "CAUTION: %(name)s will discard all local changes in \"%(checkout_dir)s\"\nRunning WebKit %(name)s.\n" % string_replacemnts,
             "handle_unexpected_error": "Mock error message\n",
+            "process_work_item": "MOCK: update_status: %(name)s Pass\n" % string_replacemnts,
         }
-        self.assert_queue_outputs(ChromiumLinuxEWS(), expected_stderr=expected_stderr)
+        return expected_stderr
+
+    def _test_ews(self, ews):
+        self.assert_queue_outputs(ews, expected_stderr=self._default_expected_stderr(ews))
+
+    # FIXME: If all EWSes are going to output the same text, we
+    # could test them all in one method with a for loop over an array.
+    def test_chromium_linux_ews(self):
+        self._test_ews(ChromiumLinuxEWS())
 
     def test_chromium_windows_ews(self):
-        expected_stderr = {
-            "begin_work_queue": "CAUTION: cr-win-ews will discard all local changes in \"%s\"\nRunning WebKit cr-win-ews.\n" % os.getcwd(),
-            "handle_unexpected_error": "Mock error message\n",
-        }
-        self.assert_queue_outputs(ChromiumWindowsEWS(), expected_stderr=expected_stderr)
+        self._test_ews(ChromiumWindowsEWS())
 
     def test_qt_ews(self):
-        expected_stderr = {
-            "begin_work_queue": "CAUTION: qt-ews will discard all local changes in \"%s\"\nRunning WebKit qt-ews.\n" % os.getcwd(),
-            "handle_unexpected_error": "Mock error message\n",
-        }
-        self.assert_queue_outputs(QtEWS(), expected_stderr=expected_stderr)
+        self._test_ews(QtEWS())
 
     def test_gtk_ews(self):
-        expected_stderr = {
-            "begin_work_queue": "CAUTION: gtk-ews will discard all local changes in \"%s\"\nRunning WebKit gtk-ews.\n" % os.getcwd(),
-            "handle_unexpected_error": "Mock error message\n",
-        }
-        self.assert_queue_outputs(GtkEWS(), expected_stderr=expected_stderr)
+        self._test_ews(GtkEWS())
 
     def test_mac_ews(self):
-        expected_stderr = {
-            "begin_work_queue": "CAUTION: mac-ews will discard all local changes in \"%s\"\nRunning WebKit mac-ews.\n" % os.getcwd(),
-            "handle_unexpected_error": "Mock error message\n",
-        }
-        self.assert_queue_outputs(MacEWS(), expected_stderr=expected_stderr)
+        ews = MacEWS()
+        expected_stderr = self._default_expected_stderr(ews)
+        expected_stderr["process_work_item"] = "MOCK: update_status: mac-ews Error: mac-ews cannot process patches from non-committers :(\n"
+        self.assert_queue_outputs(ews, expected_stderr=expected_stderr)