diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-29 12:18:57 +0100 |
| commit | 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 (patch) | |
| tree | bed2fe914fe0f7ec70abfb47d2d84af8a3604d09 /Tools/Scripts/webkitpy/tool/commands/roll_unittest.py | |
| parent | 01485457c9a5da3f1121015afd25bb53af77662e (diff) | |
| download | qtwebkit-4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064.tar.gz | |
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)
New snapshot that includes the fix for installing the QtWebProcess into libexec
Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools/Scripts/webkitpy/tool/commands/roll_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/tool/commands/roll_unittest.py | 10 |
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): |