Changeset 82771 in webkit


Ignore:
Timestamp:
Apr 2, 2011 5:15:35 AM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-04-02 Patrick Gansterer <Patrick Gansterer>

Reviewed by Eric Seidel.

Remove AbstractStep._run_script and move script names to ports.py
https://bugs.webkit.org/show_bug.cgi?id=57704

Replace deprecated _run_script with _tool.executive.run_and_throw_if_fail.

  • Scripts/webkitpy/common/config/ports.py:
  • Scripts/webkitpy/tool/commands/download_unittest.py:
  • Scripts/webkitpy/tool/commands/roll_unittest.py:
  • Scripts/webkitpy/tool/commands/upload_unittest.py:
  • Scripts/webkitpy/tool/steps/abstractstep.py:
  • Scripts/webkitpy/tool/steps/checkstyle.py:
  • Scripts/webkitpy/tool/steps/preparechangelog.py:
  • Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:
  • Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
Location:
trunk/Tools
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r82770 r82771  
     12011-04-02  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Remove AbstractStep._run_script and move script names to ports.py
     6        https://bugs.webkit.org/show_bug.cgi?id=57704
     7
     8        Replace deprecated _run_script with _tool.executive.run_and_throw_if_fail.
     9
     10        * Scripts/webkitpy/common/config/ports.py:
     11        * Scripts/webkitpy/tool/commands/download_unittest.py:
     12        * Scripts/webkitpy/tool/commands/roll_unittest.py:
     13        * Scripts/webkitpy/tool/commands/upload_unittest.py:
     14        * Scripts/webkitpy/tool/steps/abstractstep.py:
     15        * Scripts/webkitpy/tool/steps/checkstyle.py:
     16        * Scripts/webkitpy/tool/steps/preparechangelog.py:
     17        * Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py:
     18        * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py:
     19
    1202011-04-02  Patrick Gansterer  <paroga@webkit.org>
    221
  • trunk/Tools/Scripts/webkitpy/common/config/ports.py

    r82770 r82771  
    9191
    9292    @classmethod
     93    def check_webkit_style_command(cls):
     94        return cls.script_shell_command("check-webkit-style")
     95
     96    @classmethod
     97    def prepare_changelog_command(cls):
     98        return cls.script_shell_command("prepare-ChangeLog")
     99
     100    @classmethod
    93101    def build_webkit_command(cls, build_style=None):
    94102        command = cls.script_shell_command("build-webkit")
  • trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py

    r76926 r82771  
    124124
    125125    def test_check_style(self):
    126         expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\nRunning check-webkit-style\n"
     126        expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\n"
    127127        self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr)
    128128
     
    172172
    173173    def test_prepare_rollout(self):
    174         expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\nRunning prepare-ChangeLog\n"
     174        expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\n"
    175175        self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr)
    176176
     
    185185cc: MOCK cc
    186186blocked: 42
    187 Running prepare-ChangeLog
    188187MOCK add_patch_to_bug: bug_id=78, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False
    189188-- Begin comment --
     
    203202        expected_stderr = """Preparing rollout for bug 42.
    204203Updating working directory
    205 Running prepare-ChangeLog
    206204MOCK: user.open_url: file://...
    207205Was that diff correct?
  • trunk/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py

    r76926 r82771  
    3737        expected_stderr = """Updating Chromium DEPS to 6764
    3838MOCK: MockDEPS.write_variable(chromium_rev, 6764)
    39 Running prepare-ChangeLog
    4039MOCK: user.open_url: file://...
    4140Was that diff correct?
  • trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py

    r80537 r82771  
    6060        options.review = True
    6161        options.suggest_reviewers = False
    62         expected_stderr = """Running check-webkit-style
    63 MOCK: user.open_url: file://...
     62        expected_stderr = """MOCK: user.open_url: file://...
    6463Was that diff correct?
    6564Obsoleting 2 old patches on bug 42
     
    108107        options.review = True
    109108        options.suggest_reviewers = False
    110         expected_stderr = """Running check-webkit-style
    111 MOCK: user.open_url: file://...
     109        expected_stderr = """MOCK: user.open_url: file://...
    112110Was that diff correct?
    113111Obsoleting 2 old patches on bug 42
  • trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py

    r80549 r82771  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
    29 from webkitpy.common.system.deprecated_logging import log
    3029from webkitpy.common.system.executive import ScriptError
    3130from webkitpy.common.config.ports import WebKitPort
     
    3736        self._tool = tool
    3837        self._options = options
    39 
    40     # FIXME: This should use tool.port()
    41     def _run_script(self, script_name, args=None, quiet=False, port=WebKitPort):
    42         log("Running %s" % script_name)
    43         command = port.script_shell_command(script_name)
    44         if args:
    45             command.extend(args)
    46         self._tool.executive.run_and_throw_if_fail(command, quiet)
    4738
    4839    def _changed_files(self, state):
  • trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py

    r71142 r82771  
    5757
    5858        try:
    59             self._run_script("check-webkit-style", args)
     59            self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command())
    6060        except ScriptError, e:
    6161            if self._options.non_interactive:
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py

    r80549 r82771  
    6262            return
    6363        os.chdir(self._tool.scm().checkout_root)
    64         args = self._tool.port().script_shell_command("prepare-ChangeLog")
     64        args = self._tool.port().prepare_changelog_command()
    6565        if state.get("bug_id"):
    6666            args.append("--bug=%s" % state["bug_id"])
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py

    r76926 r82771  
    3535class PrepareChangeLogForDEPSRoll(AbstractStep):
    3636    def run(self, state):
    37         self._run_script("prepare-ChangeLog")
     37        self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command())
    3838        changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None)
    3939        for changelog_path in changelog_paths:
  • trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py

    r76926 r82771  
    5151    def run(self, state):
    5252        # This could move to prepare-ChangeLog by adding a --revert= option.
    53         self._run_script("prepare-ChangeLog")
     53        self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command())
    5454        changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None)
    5555        bug_url = self._tool.bugs.bug_url_for_bug_id(state["bug_id"]) if state["bug_id"] else None
Note: See TracChangeset for help on using the changeset viewer.