Changeset 63020 in webkit


Ignore:
Timestamp:
Jul 9, 2010 6:14:03 PM (14 years ago)
Author:
abarth@webkit.org
Message:

2010-07-09 Ojan Vafai <​ojan@chromium.org>

Reviewed by Adam Barth.

r63004 broke some python tests
​https://bugs.webkit.org/show_bug.cgi?id=42007

AbstractStep now checks options.no_squash and options.squash, so
they needed to have real values. Mock would return an object for those,
which would then act as if the values were True.

  • Scripts/webkitpy/tool/commands/commandtest.py:
  • Scripts/webkitpy/tool/commands/download_unittest.py:
  • Scripts/webkitpy/tool/commands/stepsequence.py:
  • Scripts/webkitpy/tool/commands/upload_unittest.py:
  • Scripts/webkitpy/tool/mocktool.py:
  • Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
  • Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
  • Scripts/webkitpy/tool/steps/steps_unittest.py:
  • Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
  • Scripts/webkitpy/tool/steps/validatereviewer_unittest.py:
Location:
trunk/WebKitTools
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitTools/ChangeLog

    r63004 r63020  
     12010-07-09  Ojan Vafai  <ojan@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        r63004 broke some python tests
     6        https://bugs.webkit.org/show_bug.cgi?id=42007
     7
     8        AbstractStep now checks options.no_squash and options.squash, so
     9        they needed to have real values. Mock would return an object for those,
     10        which would then act as if the values were True.
     11
     12        * Scripts/webkitpy/tool/commands/commandtest.py:
     13        * Scripts/webkitpy/tool/commands/download_unittest.py:
     14        * Scripts/webkitpy/tool/commands/stepsequence.py:
     15        * Scripts/webkitpy/tool/commands/upload_unittest.py:
     16        * Scripts/webkitpy/tool/mocktool.py:
     17        * Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py:
     18        * Scripts/webkitpy/tool/steps/preparechangelog_unittest.py:
     19        * Scripts/webkitpy/tool/steps/steps_unittest.py:
     20        * Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py:
     21        * Scripts/webkitpy/tool/steps/validatereviewer_unittest.py:
     22
    1232010-07-09  Ojan Vafai  <ojan@chromium.org>
    224

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/commandtest.py

    r57788 r63020  
    3030
    3131from webkitpy.common.system.outputcapture import OutputCapture
    32 from webkitpy.tool.mocktool import MockTool
    33 from webkitpy.thirdparty.mock import Mock
     32from webkitpy.tool.mocktool import MockOptions, MockTool
    3433
    3534class CommandsTest(unittest.TestCase):
    36     def assert_execute_outputs(self, command, args, expected_stdout="", expected_stderr="", options=Mock(), tool=MockTool()):
     35    def assert_execute_outputs(self, command, args, expected_stdout="", expected_stderr="", options=MockOptions(), tool=MockTool()):
    3736        command.bind_to_tool(tool)
    3837        OutputCapture().assert_outputs(self, command.execute, [options, args, tool], expected_stdout=expected_stdout, expected_stderr=expected_stderr)

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/download_unittest.py

    r60903 r63020  
    3333from webkitpy.tool.commands.commandtest import CommandsTest
    3434from webkitpy.tool.commands.download import *
    35 from webkitpy.tool.mocktool import MockTool
     35from webkitpy.tool.mocktool import MockOptions, MockTool
    3636
    3737
    … …  
    5757class DownloadCommandsTest(CommandsTest):
    5858    def _default_options(self):
    59         options = Mock()
     59        options = MockOptions()
    6060        options.force_clean = False
    6161        options.clean = True

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py

    r62923 r63020  
    7878            if not options.quiet:
    7979                log(e.message_with_output())
     80            raise e
    8081            if options.parent_command:
    8182                command = tool.command_by_name(options.parent_command)

  • trunk/WebKitTools/Scripts/webkitpy/tool/commands/upload_unittest.py

    r60635 r63020  
    3030from webkitpy.tool.commands.commandtest import CommandsTest
    3131from webkitpy.tool.commands.upload import *
    32 from webkitpy.tool.mocktool import MockTool
     32from webkitpy.tool.mocktool import MockOptions, MockTool
    3333
    3434class UploadCommandsTest(CommandsTest):
    … …  
    5252
    5353    def test_post(self):
    54         options = Mock()
     54        options = MockOptions()
    5555        options.description = "MOCK description"
    5656        options.request_commit = False
    … …  
    8181
    8282    def test_upload(self):
    83         options = Mock()
     83        options = MockOptions()
    8484        options.description = "MOCK description"
    8585        options.request_commit = False

  • trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py

    r63004 r63020  
    516516        return "http://dummy_url"
    517517
     518
    518519class MockExecute(Mock):
    519520    def __init__(self, should_log):
    … …  
    536537            log("MOCK run_command: %s" % args)
    537538        return "MOCK output of child process"
     539
     540
     541class MockOptions(Mock):
     542    no_squash = False
     543    squash = False
    538544
    539545

  • trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebugforlanddiff_unittest.py

    r57788 r63020  
    3030
    3131from webkitpy.common.system.outputcapture import OutputCapture
    32 from webkitpy.thirdparty.mock import Mock
    33 from webkitpy.tool.mocktool import MockTool
     32from webkitpy.tool.mocktool import MockOptions, MockTool
    3433from webkitpy.tool.steps.closebugforlanddiff import CloseBugForLandDiff
    3534
    … …  
    3736    def test_empty_state(self):
    3837        capture = OutputCapture()
    39         step = CloseBugForLandDiff(MockTool(), Mock())
     38        step = CloseBugForLandDiff(MockTool(), MockOptions())
    4039        expected_stderr = "Committed r49824: <http://trac.webkit.org/changeset/49824>\nNo bug id provided.\n"
    4140        capture.assert_outputs(self, step.run, [{"commit_text" : "Mock commit text"}], expected_stderr=expected_stderr)

  • trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog_unittest.py

    r61098 r63020  
    3232from webkitpy.common.checkout.changelog_unittest import ChangeLogTest
    3333from webkitpy.common.system.outputcapture import OutputCapture
    34 from webkitpy.thirdparty.mock import Mock
    35 from webkitpy.tool.mocktool import MockTool
     34from webkitpy.tool.mocktool import MockOptions, MockTool
    3635from webkitpy.tool.steps.preparechangelog import PrepareChangeLog
    3736
    … …  
    4039    def test_ensure_bug_url(self):
    4140        capture = OutputCapture()
    42         step = PrepareChangeLog(MockTool(), Mock())
     41        step = PrepareChangeLog(MockTool(), MockOptions())
    4342        changelog_contents = u"%s\n%s" % (self._new_entry_boilerplate, self._example_changelog)
    4443        changelog_path = self._write_tmp_file_with_contents(changelog_contents.encode("utf-8"))

  • trunk/WebKitTools/Scripts/webkitpy/tool/steps/steps_unittest.py

    r60007 r63020  
    3131from webkitpy.common.system.outputcapture import OutputCapture
    3232from webkitpy.common.config.ports import WebKitPort
    33 from webkitpy.thirdparty.mock import Mock
    34 from webkitpy.tool.mocktool import MockTool
     33from webkitpy.tool.mocktool import MockOptions, MockTool
    3534from webkitpy.tool.steps.update import Update
    3635from webkitpy.tool.steps.runtests import RunTests
    … …  
    4342            tool = MockTool()
    4443        if not options:
    45             options = Mock()
     44            options = MockOptions()
    4645        if not state:
    4746            state = {}
    … …  
    4948
    5049    def test_update_step(self):
    51         options = Mock()
     50        options = MockOptions()
    5251        options.update = True
    5352        expected_stderr = "Updating working directory\n"
    … …  
    6463
    6564    def test_runtests_leopard_commit_queue_hack(self):
    66         mock_options = Mock()
     65        mock_options = MockOptions()
    6766        mock_options.non_interactive = True
    6867        step = RunTests(MockTool(log_executive=True), mock_options)

  • trunk/WebKitTools/Scripts/webkitpy/tool/steps/updatechangelogswithreview_unittest.py

    r57788 r63020  
    3030
    3131from webkitpy.common.system.outputcapture import OutputCapture
    32 from webkitpy.thirdparty.mock import Mock
    33 from webkitpy.tool.mocktool import MockTool
     32from webkitpy.tool.mocktool import MockOptions, MockTool
    3433from webkitpy.tool.steps.updatechangelogswithreviewer import UpdateChangeLogsWithReviewer
    3534
    … …  
    3736    def test_guess_reviewer_from_bug(self):
    3837        capture = OutputCapture()
    39         step = UpdateChangeLogsWithReviewer(MockTool(), Mock())
     38        step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
    4039        expected_stderr = "0 reviewed patches on bug 75, cannot infer reviewer.\n"
    4140        capture.assert_outputs(self, step._guess_reviewer_from_bug, [75], expected_stderr=expected_stderr)
    … …  
    4342    def test_empty_state(self):
    4443        capture = OutputCapture()
    45         step = UpdateChangeLogsWithReviewer(MockTool(), Mock())
     44        step = UpdateChangeLogsWithReviewer(MockTool(), MockOptions())
    4645        capture.assert_outputs(self, step.run, [{}])

  • trunk/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer_unittest.py

    r57788 r63020  
    3131from webkitpy.common.checkout.changelog import ChangeLogEntry
    3232from webkitpy.common.system.outputcapture import OutputCapture
    33 from webkitpy.thirdparty.mock import Mock
    34 from webkitpy.tool.mocktool import MockTool
     33from webkitpy.tool.mocktool import MockOptions, MockTool
    3534from webkitpy.tool.steps.validatereviewer import ValidateReviewer
    3635
    … …  
    4948
    5049    def test_has_valid_reviewer(self):
    51         step = ValidateReviewer(MockTool(), Mock())
     50        step = ValidateReviewer(MockTool(), MockOptions())
    5251        self._test_review_text(step, "Reviewed by Eric Seidel.", True)
    5352        self._test_review_text(step, "Reviewed by Eric Seidel", True) # Not picky about the '.'
Note: See TracChangeset for help on using the changeset viewer.