[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 602c8bfaa2b9a98f59d472ea0cc898c856b6c76b
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 23:23:49 2011 +0000

    2011-01-21  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Suppress a few remaining integration tests so that none of the
            layout_test unit tests ever read from the filesystem or launch
            subprocesses that aren't part of the unit tests.
    
            Also fix a minor bug in the printing unit tests that was
            incorrectly relying on sys.argv.
    
            https://bugs.webkit.org/show_bug.cgi?id=52863
    
            * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
            * Scripts/webkitpy/layout_tests/port/port_testcase.py:
            * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 173523f..12875fc 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-21  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Suppress a few remaining integration tests so that none of the
+        layout_test unit tests ever read from the filesystem or launch
+        subprocesses that aren't part of the unit tests.
+
+        Also fix a minor bug in the printing unit tests that was
+        incorrectly relying on sys.argv.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52863
+
+        * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-01-21  Darin Adler  <darin at apple.com>
 
        Fix Mac build.
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
index c3eb04f..12a786e 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
@@ -114,6 +114,7 @@ class TestUtilityFunctions(unittest.TestCase):
 class  Testprinter(unittest.TestCase):
     def get_printer(self, args=None, single_threaded=False,
                    is_fully_parallel=False):
+        args = args or []
         printing_options = printing.print_options()
         option_parser = optparse.OptionParser(option_list=printing_options)
         options, args = option_parser.parse_args(args)
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
index c7846c3..0b03b4c 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
@@ -57,7 +57,7 @@ class PortTestCase(unittest.TestCase):
         port.start_http_server()
         port.stop_http_server()
 
-    def test_image_diff(self):
+    def disabled_test_image_diff(self):
         port = self.make_port()
         if not port:
             return
diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index ffc97dd..677becd 100644
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -98,9 +98,9 @@ def passing_run(extra_args=None, port_obj=None, record_results=False,
     return res == 0
 
 
-def logging_run(extra_args=None, port_obj=None, tests_included=False, filesystem=None):
+def logging_run(extra_args=None, port_obj=None, record_results=False, tests_included=False, filesystem=None):
     options, parsed_args = parse_args(extra_args=extra_args,
-                                      record_results=False,
+                                      record_results=record_results,
                                       tests_included=tests_included,
                                       print_nothing=False)
     user = MockUser()
@@ -240,7 +240,9 @@ class MainTest(unittest.TestCase):
 
     def test_last_results(self):
         fs = port.unit_test_filesystem()
-        passing_run(['--clobber-old-results'], record_results=True, filesystem=fs)
+        # We do a logging run here instead of a passing run in order to
+        # suppress the output from the json generator.
+        (res, buildbot_output, regular_output, user) = logging_run(['--clobber-old-results'], record_results=True, filesystem=fs)
         (res, buildbot_output, regular_output, user) = logging_run(
             ['--print-last-failures'], filesystem=fs)
         self.assertEqual(regular_output.get(), ['\n\n'])
@@ -519,15 +521,14 @@ class DryrunTest(unittest.TestCase):
     # chromium platforms require a chromium checkout, and the mac platform
     # requires fcntl, so it can't be tested on win32, etc. There is
     # probably a better way of handling this.
-    def test_darwin(self):
+    def disabled_test_darwin(self):
         if sys.platform != "darwin":
             return
 
-        self.assertTrue(passing_run(['--platform', 'test']))
-        self.assertTrue(passing_run(['--platform', 'dryrun',
-                                     'fast/html']))
-        self.assertTrue(passing_run(['--platform', 'dryrun-mac',
-                                     'fast/html']))
+        self.assertTrue(passing_run(['--platform', 'dryrun', 'fast/html'],
+                        tests_included=True))
+        self.assertTrue(passing_run(['--platform', 'dryrun-mac', 'fast/html'],
+                        tests_included=True))
 
     def test_test(self):
         self.assertTrue(passing_run(['--platform', 'dryrun-test',

-- 
WebKit Debian packaging