Changeset 71336 in webkit

Timestamp:

Nov 4, 2010 8:24:40 AM (13 years ago)

Author:

Adam Roben

Message:

Reduce our dependence on coreutils when running Python tests

This patch introduces versions of the standard echo and cat utilities
implemented in Python. They are probably missing features of their
coreutils equivalents, but they can do what's necessary for our Python
tests. This is useful on Windows, where these utilities typically
aren't available.

Fixes <​http://webkit.org/b/48883> executive_unittest relies on echo
and cat utilities from coreutils, which are not present on Windows

Reviewed by Eric Seidel.

• Scripts/webkitpy/common/system/executive_unittest.py: Changed to use

our Python-based echo and cat.

• Scripts/webkitpy/common/system/fileutils.py: Added.

(make_stdout_binary): On Windows, puts sys.stdout into binary mode so
that \n won't be translated into \r\n. I couldn't think of a good way
to test this directly without touching the filesystem, but it is tested
indirectly by echo_unittest.

• Scripts/webkitpy/test/cat.py: Added.

(command_arguments): Returns a list for invoking cat with the given arguments.
(main): Acts like a simplified version of the coreutils cat utility.

• Scripts/webkitpy/test/cat_unittest.py: Added.

(CatTest.assert_cat): Runs cat with the given input and ensures the
output matches the input.
(CatTest.test_basic): Performs a simple test of cat.
(CatTest.test_no_newline): Tests what happens when the input string
doesn't have a trailing newline.
(CatTest.test_unicode): Tests passing a unicode string to cat.
(CatTest.test_as_command): Tests running cat as a separate command.

• Scripts/webkitpy/test/echo.py: Added.

(command_arguments): Returns a list for invoking echo with the given arguments.
(main): Acts like a simplified version of the coreutils echo utility.

• Scripts/webkitpy/test/echo_unittest.py: Added.

(EchoTest.test_basic): Performs a simple test of echo.
(EchoTest.test_no_newline): Tests passing -n to echo to suppress the
trailing newline.
(EchoTest.test_unicode): Tests passing unicode and non-unicode strings
to echo.
(EchoTest.test_argument_order): Tests what happens when -n is not the
first argument.
(EchoTest.test_empty_arguments): Tests what happens when you pass [] to
echo.main.
(EchoTest.test_no_arguments): Tests what happens when you call
echo.main with no arguments.
(EchoTest.test_as_command): Tests running echo as a separate command.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/common/system/fileutils.py (added)
• Scripts/webkitpy/test/cat.py (added)
• Scripts/webkitpy/test/cat_unittest.py (added)
• Scripts/webkitpy/test/echo.py (added)
• Scripts/webkitpy/test/echo_unittest.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-02  Adam Roben  <aroben@apple.com>
+
+        Reduce our dependence on coreutils when running Python tests
+
+        This patch introduces versions of the standard echo and cat utilities
+        implemented in Python. They are probably missing features of their
+        coreutils equivalents, but they can do what's necessary for our Python
+        tests. This is useful on Windows, where these utilities typically
+        aren't available.
+
+        Fixes <http://webkit.org/b/48883> executive_unittest relies on echo
+        and cat utilities from coreutils, which are not present on Windows
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/webkitpy/common/system/executive_unittest.py: Changed to use
+        our Python-based echo and cat.
+
+        * Scripts/webkitpy/common/system/fileutils.py: Added.
+        (make_stdout_binary): On Windows, puts sys.stdout into binary mode so
+        that \n won't be translated into \r\n. I couldn't think of a good way
+        to test this directly without touching the filesystem, but it is tested
+        indirectly by echo_unittest.
+
+        * Scripts/webkitpy/test/cat.py: Added.
+        (command_arguments): Returns a list for invoking cat with the given arguments.
+        (main): Acts like a simplified version of the coreutils cat utility.
+
+        * Scripts/webkitpy/test/cat_unittest.py: Added.
+        (CatTest.assert_cat): Runs cat with the given input and ensures the
+        output matches the input.
+        (CatTest.test_basic): Performs a simple test of cat.
+        (CatTest.test_no_newline): Tests what happens when the input string
+        doesn't have a trailing newline.
+        (CatTest.test_unicode): Tests passing a unicode string to cat.
+        (CatTest.test_as_command): Tests running cat as a separate command.
+
+        * Scripts/webkitpy/test/echo.py: Added.
+        (command_arguments): Returns a list for invoking echo with the given arguments.
+        (main): Acts like a simplified version of the coreutils echo utility.
+
+        * Scripts/webkitpy/test/echo_unittest.py: Added.
+        (EchoTest.test_basic): Performs a simple test of echo.
+        (EchoTest.test_no_newline): Tests passing -n to echo to suppress the
+        trailing newline.
+        (EchoTest.test_unicode): Tests passing unicode and non-unicode strings
+        to echo.
+        (EchoTest.test_argument_order): Tests what happens when -n is not the
+        first argument.
+        (EchoTest.test_empty_arguments): Tests what happens when you pass [] to
+        echo.main.
+        (EchoTest.test_no_arguments): Tests what happens when you call
+        echo.main with no arguments.
+        (EchoTest.test_as_command): Tests running echo as a separate command.
+
 2010-11-04  Renata Hodovan  <reni@inf.u-szeged.hu>
 

trunk/WebKitTools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -34 +34 @@
 
 from webkitpy.common.system.executive import Executive, run_command, ScriptError
+from webkitpy.test import cat, echo
 
 
@@ -47 +48 @@
         self.assertRaises(AssertionError, executive.run_command, "echo")
         self.assertRaises(AssertionError, executive.run_command, u"echo")
-        executive.run_command(["echo", "foo"])
-        executive.run_command(("echo", "foo"))
+        executive.run_command(echo.command_arguments('foo'))
+        executive.run_command(tuple(echo.command_arguments('foo')))
 
     def test_run_command_with_unicode(self):
@@ -58 +59 @@
         utf8_tor = unicode_tor.encode("utf-8")
 
-        output = executive.run_command(["cat"], input=unicode_tor)
+        output = executive.run_command(cat.command_arguments(), input=unicode_tor)
         self.assertEquals(output, unicode_tor)
 
-        output = executive.run_command(["echo", "-n", unicode_tor])
+        output = executive.run_command(echo.command_arguments("-n", unicode_tor))
         self.assertEquals(output, unicode_tor)
 
-        output = executive.run_command(["echo", "-n", unicode_tor], decode_output=False)
+        output = executive.run_command(echo.command_arguments("-n", unicode_tor), decode_output=False)
         self.assertEquals(output, utf8_tor)
 
         # Make sure that str() input also works.
-        output = executive.run_command(["cat"], input=utf8_tor, decode_output=False)
+        output = executive.run_command(cat.command_arguments(), input=utf8_tor, decode_output=False)
         self.assertEquals(output, utf8_tor)
 
         # FIXME: We should only have one run* method to test
-        output = executive.run_and_throw_if_fail(["echo", "-n", unicode_tor], quiet=True)
+        output = executive.run_and_throw_if_fail(echo.command_arguments("-n", unicode_tor), quiet=True)
         self.assertEquals(output, unicode_tor)
 
-        output = executive.run_and_throw_if_fail(["echo", "-n", unicode_tor], quiet=True, decode_output=False)
+        output = executive.run_and_throw_if_fail(echo.command_arguments("-n", unicode_tor), quiet=True, decode_output=False)
         self.assertEquals(output, utf8_tor)