Changeset 76398 in webkit

Timestamp:

Jan 21, 2011 3:23:49 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-01-21 Dirk Pranke <​dpranke@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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-21  Dirk Pranke  <dpranke@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@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py

@@ -115 +115 @@
     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)

trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -58 +58 @@
         port.stop_http_server()
 
-    def test_image_diff(self):
+    def disabled_test_image_diff(self):
         port = self.make_port()
         if not port:

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

@@ -99 +99 @@
 
 
-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)
@@ -241 +241 @@
     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)
@@ -520 +522 @@
     # 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):