From 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Nov 2012 12:18:48 +0100 Subject: 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 --- Tools/Scripts/webkitpy/tool/steps/commit_unittest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Tools/Scripts/webkitpy/tool/steps/commit_unittest.py') diff --git a/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py b/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py index 25d9b61a1..936e3ebab 100644 --- a/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py +++ b/Tools/Scripts/webkitpy/tool/steps/commit_unittest.py @@ -50,13 +50,16 @@ class CommitTest(unittest.TestCase): } tool.executive = MockExecutive(should_log=True, should_throw_when_run=False) - capture.assert_outputs(self, step.run, [state], expected_stderr="Committed r49824: \n") + expected_logs = "Committed r49824: \n" + capture.assert_outputs(self, step.run, [state], expected_logs=expected_logs) state = { "changed_files": ["platform/chromium/" + filename], } - capture.assert_outputs(self, step.run, [state], expected_stderr="MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--diff-files', 'platform/chromium/" - + filename + "'], cwd=/mock-checkout\nCommitted r49824: \n") + expected_logs = """MOCK run_and_throw_if_fail: ['mock-check-webkit-style', '--diff-files', 'platform/chromium/%s'], cwd=/mock-checkout +Committed r49824: +""" % filename + capture.assert_outputs(self, step.run, [state], expected_logs=expected_logs) tool.executive = MockExecutive(should_log=True, should_throw_when_run=set(["platform/chromium/" + filename])) self.assertRaises(ScriptError, capture.assert_outputs, self, step.run, [state]) -- cgit v1.2.1