Title: [143929] trunk/Tools
- Revision
- 143929
- Author
- [email protected]
- Date
- 2013-02-25 08:51:31 -0800 (Mon, 25 Feb 2013)
Log Message
Fix tests after r143910
https://bugs.webkit.org/show_bug.cgi?id=110757
Reviewed by Andreas Kling.
While here, also add a test for the bug r143910 fixed.
* Scripts/webkitpy/common/system/executive_unittest.py:
(ScriptErrorTest.test_message_with_output):
(ScriptErrorTest):
(ScriptErrorTest.test_message_with_tuple):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (143928 => 143929)
--- trunk/Tools/ChangeLog 2013-02-25 16:46:59 UTC (rev 143928)
+++ trunk/Tools/ChangeLog 2013-02-25 16:51:31 UTC (rev 143929)
@@ -1,5 +1,19 @@
2013-02-25 Nico Weber <[email protected]>
+ Fix tests after r143910
+ https://bugs.webkit.org/show_bug.cgi?id=110757
+
+ Reviewed by Andreas Kling.
+
+ While here, also add a test for the bug r143910 fixed.
+
+ * Scripts/webkitpy/common/system/executive_unittest.py:
+ (ScriptErrorTest.test_message_with_output):
+ (ScriptErrorTest):
+ (ScriptErrorTest.test_message_with_tuple):
+
+2013-02-25 Nico Weber <[email protected]>
+
[chromium] Apparently built-product-archive is written in Python, not Perl :-/
https://bugs.webkit.org/show_bug.cgi?id=110755
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py (143928 => 143929)
--- trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2013-02-25 16:46:59 UTC (rev 143928)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2013-02-25 16:51:31 UTC (rev 143929)
@@ -56,10 +56,14 @@
error = ScriptError('My custom message!', '', -1, 'My output.')
self.assertEqual(error.message_with_output(), 'My custom message!\n\nMy 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\nMy output.')
+ self.assertEqual(error.message_with_output(), 'Failed to run "\'my_command!\'" exit_code: -1 cwd: /Users/username/blah\n\nMy output.')
error = ScriptError('', 'my_command!', -1, 'ab' + '1' * 499)
- self.assertEqual(error.message_with_output(), 'Failed to run "my_command!" exit_code: -1\n\nLast 500 characters of output:\nb' + '1' * 499)
+ self.assertEqual(error.message_with_output(), 'Failed to run "\'my_command!\'" exit_code: -1\n\nLast 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\nMy output.')
+
def never_ending_command():
"""Arguments for a command that will never end (useful for testing process
killing). It should be a process that is unlikely to already be running
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
