[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c509c2d26f04d82ddd59f38f1ed5dd1e0526d8c6
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 22:11:37 2010 +0000

    2010-10-22  Dirk Pranke  <dpranke at 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 d747258..5ab4c76 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-22  Dirk Pranke  <dpranke at 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 at 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 93f8808..ee868e8 100644
--- 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.

-- 
WebKit Debian packaging