2010-10-22 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Eric Seidel.

        test-webkitpy fails when passed -v (or any other option)

        Fix port/base_unittest to pass an explicit list of arguments
        rather than accidentally picking up sys.argv.

        https://bugs.webkit.org/show_bug.cgi?id=48071

        * Scripts/webkitpy/layout_tests/port/base_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d7472589cfb5f5f357c936de6127f6c5bb84f5c1..5ab4c7635ad851e1bdbfb745a595f21ccdc4f434 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-22  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        test-webkitpy fails when passed -v (or any other option)
+
+        Fix port/base_unittest to pass an explicit list of arguments
+        rather than accidentally picking up sys.argv.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48071
+
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+
 2010-10-22  Brian Weinstein  <bweinstein@apple.com>
 
         Windows build fix. Update the createNewPage callback to account for the new

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py
index 93f88082ab38a6fe92dcd3f9a3b3c243a4e905fa..ee868e80f3aa0d685444b3f37dcec15558daef36 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base_unittest.py
@@ -250,7 +250,7 @@ class PortTest(unittest.TestCase):
                          abspath_to_uri(test_file))
 
     def test_get_option__set(self):
-        options, args = optparse.OptionParser().parse_args()
+        options, args = optparse.OptionParser().parse_args([])
         options.foo = 'bar'
         port = base.Port(options=options)
         self.assertEqual(port.get_option('foo'), 'bar')
@@ -269,7 +269,7 @@ class PortTest(unittest.TestCase):
         self.assertEqual(port.get_option('foo'), 'bar')
 
     def test_set_option_default__set(self):
-        options, args = optparse.OptionParser().parse_args()
+        options, args = optparse.OptionParser().parse_args([])
         options.foo = 'bar'
         port = base.Port(options=options)
         # This call should have no effect.