WebKitTools/ChangeLog

112010-04-12 Dirk Pranke <dpranke@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Add some very minimal unit tests for new-run-webkit-tests. This should

        be enough to catch egregious brokenness like syntax errors and import

        declaration issues.

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

        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:

        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py: Added.

2010-04-12  Dirk Pranke  <dpranke@chromium.org>

        Reviewed by Eric Seidel.

        Modify run_webkit_tests.py to not call sys.exit() at the end of test

WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@class TestRunner:

        """Returns whether the test runner needs an HTTP server."""

        return self._contains_tests(self.HTTP_SUBDIR)

607 def run(self, result_summary):

607 def run(self, result_summary, print_results):

        """Run all our tests on all our test files.

        For each test file, we run each test type. If there are any failures,

@@class TestRunner:

        Args:

          result_summary: a summary object tracking the test results.

615 print_results: whether or not to print the summary at the end

        Return:

          The number of unexpected results (0 == success)

@@class TestRunner:

        sys.stdout.flush()

        sys.stderr.flush()

        if (LOG_DETAILED_PROGRESS in self._options.log or

            (LOG_UNEXPECTED in self._options.log and

             result_summary.total != result_summary.expected)):

            print

675671 # This summary data gets written to stdout regardless of log level

676 self._print_one_line_summary(result_summary.total,

677 result_summary.expected)

        # (unless of course we're printing nothing).

        if print_results:

            if (LOG_DETAILED_PROGRESS in self._options.log or

                (LOG_UNEXPECTED in self._options.log and

                 result_summary.total != result_summary.expected)):

                print

            self._print_one_line_summary(result_summary.total,

                                         result_summary.expected)

        unexpected_results = self._summarize_unexpected_results(result_summary,

            retry_summary)

@@def create_logging_writer(options, log_option):

    return lambda str: 1

1370 def main(options, args):

1372def main(options, args, print_results=True):

    """Run the tests.

    Args:

      options: a dictionary of command line options

      args: a list of sub directories or files to test

1378 print_results: whether or not to log anything to stdout.

1379 Set to false by the unit tests

    Returns:

      the number of unexpected results that occurred, or -1 if there is an

          error.

@@def main(options, args):

        if options.fuzzy_pixel_tests:

            test_runner.add_test_type(fuzzy_image_diff.FuzzyImageDiff)

1519 num_unexpected_results = test_runner.run(result_summary)

1523 num_unexpected_results = test_runner.run(result_summary, print_results)

    port_obj.stop_helper()

WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

#!/usr/bin/python

# Copyright (C) 2010 Google Inc. All rights reserved.

#

# Redistribution and use in source and binary forms, with or without

# modification, are permitted provided that the following conditions are

# met:

#

#     * Redistributions of source code must retain the above copyright

# notice, this list of conditions and the following disclaimer.

#     * Redistributions in binary form must reproduce the above

# copyright notice, this list of conditions and the following disclaimer

# in the documentation and/or other materials provided with the

# distribution.

#     * Neither the name of Google Inc. nor the names of its

# contributors may be used to endorse or promote products derived from

# this software without specific prior written permission.

#

# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

"""Unit tests for run_webkit_tests."""

import os

import sys

import unittest

import run_webkit_tests

def passing_run(args):

    options, args = run_webkit_tests.parse_args(args)

    res = run_webkit_tests.main(options, args, False)

    return res == 0

class MainTest(unittest.TestCase):

    def test_fast(self):

        self.assertTrue(passing_run(['--platform', 'test',

                                     'fast/html']))

        self.assertTrue(passing_run(['--platform', 'test',

                                     '--run-singly',

                                     'fast/html']))

        self.assertTrue(passing_run(['--platform', 'test',

                                     'fast/html/article-element.html']))

        self.assertTrue(passing_run(['--platform', 'test',

                                    '--child-processes', '1',

                                     '--log', 'unexpected',

                                     'fast/html']))

if __name__ == '__main__':

    unittest.main()