summaryrefslogtreecommitdiff
path: root/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/commands/roll_unittest.py')
-rw-r--r--Tools/Scripts/webkitpy/tool/commands/roll_unittest.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py b/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py
index 237a1c94f..1dae497bc 100644
--- a/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py
@@ -34,20 +34,20 @@ from webkitpy.tool.mocktool import MockOptions, MockTool
class RollCommandsTest(CommandsTest):
def test_update_chromium_deps(self):
- expected_stderr = """Updating Chromium DEPS to 6764
+ expected_logs = """Updating Chromium DEPS to 6764
MOCK: MockDEPS.write_variable(chromium_rev, 6764)
MOCK: user.open_url: file://...
Was that diff correct?
Committed r49824: <http://trac.webkit.org/changeset/49824>
"""
- self.assert_execute_outputs(RollChromiumDEPS(), [6764], expected_stderr=expected_stderr)
+ self.assert_execute_outputs(RollChromiumDEPS(), [6764], expected_logs=expected_logs)
def test_update_chromium_deps_older_revision(self):
options = MockOptions(non_interactive=False)
- expected_stderr = """Current Chromium DEPS revision 6564 is newer than 5764.
-ERROR: Unable to update Chromium DEPS
+ expected_logs = """Current Chromium DEPS revision 6564 is newer than 5764.
+Unable to update Chromium DEPS
"""
- self.assert_execute_outputs(RollChromiumDEPS(), [5764], options=options, expected_stderr=expected_stderr, expected_exception=SystemExit)
+ self.assert_execute_outputs(RollChromiumDEPS(), [5764], options=options, expected_logs=expected_logs, expected_exception=SystemExit)
class PostRollCommandsTest(CommandsTest):