Index: Tools/Scripts/webkitpy/tool/steps/steps_unittest.py |
diff --git a/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py b/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py |
index 5ac94cf45caa5571ba895daa1b714a84fb447d6e..75bd9b13469acab65dd7e456191a5c3fb3c6e87e 100644 |
--- a/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py |
+++ b/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py |
@@ -1,9 +1,9 @@ |
# Copyright (C) 2010 Google Inc. All rights reserved. |
-# |
+# |
# Redistribution and use in source and binary forms, with or without |
# modification, are permitted provided that the following conditions are |
# met: |
-# |
+# |
# * Redistributions of source code must retain the above copyright |
# notice, this list of conditions and the following disclaimer. |
# * Redistributions in binary form must reproduce the above |
@@ -13,7 +13,7 @@ |
# * Neither the name of Google Inc. nor the names of its |
# contributors may be used to endorse or promote products derived from |
# this software without specific prior written permission. |
-# |
+# |
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
@@ -57,37 +57,10 @@ class StepsTest(unittest.TestCase): |
tool.user.prompt = lambda message: 50000 |
self._run_step(steps.PromptForBugOrTitle, tool=tool) |
- def _post_diff_options(self): |
- options = self._step_options() |
- options.git_commit = None |
- options.description = None |
- options.comment = None |
- options.review = True |
- options.request_commit = False |
- options.open_bug = True |
- return options |
- |
def _assert_step_output_with_bug(self, step, bug_id, expected_logs, options=None): |
state = {'bug_id': bug_id} |
OutputCapture().assert_outputs(self, self._run_step, [step, MockTool(), options, state], expected_logs=expected_logs) |
- def _assert_post_diff_output_for_bug(self, step, bug_id, expected_logs): |
- self._assert_step_output_with_bug(step, bug_id, expected_logs, self._post_diff_options()) |
- |
- def test_post_diff(self): |
- expected_logs = "MOCK add_patch_to_bug: bug_id=78, description=Patch, mark_for_review=True, mark_for_commit_queue=False, mark_for_landing=False\nMOCK: user.open_url: http://example.com/78\n" |
- self._assert_post_diff_output_for_bug(steps.PostDiff, 78, expected_logs) |
- |
- def test_post_diff_for_commit(self): |
- expected_logs = "MOCK add_patch_to_bug: bug_id=78, description=Patch for landing, mark_for_review=False, mark_for_commit_queue=False, mark_for_landing=True\n" |
- self._assert_post_diff_output_for_bug(steps.PostDiffForCommit, 78, expected_logs) |
- |
- def test_ensure_bug_is_open_and_assigned(self): |
- expected_logs = "MOCK reopen_bug 50004 with comment 'Reopening to attach new patch.'\n" |
- self._assert_step_output_with_bug(steps.EnsureBugIsOpenAndAssigned, 50004, expected_logs) |
- expected_logs = "MOCK reassign_bug: bug_id=50002, assignee=None\n" |
- self._assert_step_output_with_bug(steps.EnsureBugIsOpenAndAssigned, 50002, expected_logs) |
- |
def test_runtests_args(self): |
mock_options = self._step_options() |
mock_options.non_interactive = False |