Changeset 83158 in webkit

Timestamp:

Apr 7, 2011 2:56:36 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-04-07 Adam Barth <​abarth@webkit.org>

Reviewed by Maciej Stachowiak.

webkit-patch shouldn't state the whole working copy when calling check-webkit-style
​https://bugs.webkit.org/show_bug.cgi?id=58022

Previously, we were ignoring the args variable! This patch fixes the
regression introduced in ​http://trac.webkit.org/changeset/82771.

• Scripts/webkitpy/tool/commands/download_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/steps/checkstyle.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/download_unittest.py (modified) (1 diff)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/checkstyle.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-07  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        webkit-patch shouldn't state the whole working copy when calling check-webkit-style
+        https://bugs.webkit.org/show_bug.cgi?id=58022
+
+        Previously, we were ignoring the args variable!  This patch fixes the
+        regression introduced in http://trac.webkit.org/changeset/82771.
+
+        * Scripts/webkitpy/tool/commands/download_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/steps/checkstyle.py:
+
 2011-04-07  Maciej Stachowiak  <mjs@apple.com>
 

trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

@@ -124 +124 @@
 
     def test_check_style(self):
-        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\n"
-        self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr)
+        expected_stderr = """Processing 1 patch from 1 bug.
+Updating working directory
+MOCK run_and_throw_if_fail: ['mock-update-webkit']
+Processing patch 197 from bug 42.
+MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--git-commit', 'MOCK git commit', '--diff-files', 'MockFile1']
+"""
+        self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr, tool=MockTool(log_executive=True))
 
     def test_build_attachment(self):

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -694 +694 @@
         return "/mock/results.html"
 
+    def check_webkit_style_command(self):
+        return ["mock-check-webkit-style"]
+
+    def update_webkit_command(self):
+        return ["mock-update-webkit"]
+
+
 class MockTestPort1(object):
 

trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py

@@ -57 +57 @@
 
         try:
-            self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command())
+            self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command() + args)
         except ScriptError, e:
             if self._options.non_interactive: