| Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py
|
| index 70dce5bafaea6ec4bdd446c58ed1f32ab761739d..bbf663a2f7baddbd39014f14e9c0bcd7dd6f448b 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py
|
| @@ -47,19 +47,24 @@ from webkitpy.common.system.filesystem_mock import MockFileSystem
|
|
|
|
|
| class ScriptErrorTest(unittest.TestCase):
|
| +
|
| def test_message_with_output(self):
|
| error = ScriptError('My custom message!', '', -1)
|
| self.assertEqual(error.message_with_output(), 'My custom message!')
|
| error = ScriptError('My custom message!', '', -1, 'My output.')
|
| self.assertEqual(error.message_with_output(), 'My custom message!\n\noutput: My output.')
|
| error = ScriptError('', 'my_command!', -1, 'My output.', '/Users/username/blah')
|
| - self.assertEqual(error.message_with_output(), 'Failed to run "\'my_command!\'" exit_code: -1 cwd: /Users/username/blah\n\noutput: My output.')
|
| + self.assertEqual(error.message_with_output(),
|
| + 'Failed to run "\'my_command!\'" exit_code: -1 cwd: /Users/username/blah\n\noutput: My output.')
|
| error = ScriptError('', 'my_command!', -1, 'ab' + '1' * 499)
|
| - self.assertEqual(error.message_with_output(), 'Failed to run "\'my_command!\'" exit_code: -1\n\noutput: Last 500 characters of output:\nb' + '1' * 499)
|
| + self.assertEqual(error.message_with_output(),
|
| + 'Failed to run "\'my_command!\'" exit_code: -1\n\noutput: Last 500 characters of output:\nb' + '1' * 499)
|
|
|
| def test_message_with_tuple(self):
|
| error = ScriptError('', ('my', 'command'), -1, 'My output.', '/Users/username/blah')
|
| - self.assertEqual(error.message_with_output(), 'Failed to run "(\'my\', \'command\')" exit_code: -1 cwd: /Users/username/blah\n\noutput: My output.')
|
| + self.assertEqual(error.message_with_output(),
|
| + 'Failed to run "(\'my\', \'command\')" exit_code: -1 cwd: /Users/username/blah\n\noutput: My output.')
|
| +
|
|
|
| def never_ending_command():
|
| """Arguments for a command that will never end (useful for testing process
|
| @@ -75,6 +80,7 @@ def command_line(cmd, *args):
|
|
|
|
|
| class ExecutiveTest(unittest.TestCase):
|
| +
|
| def assert_interpreter_for_content(self, intepreter, content):
|
| fs = MockFileSystem()
|
|
|
|
|