Changeset 87594 in webkit


Ignore:
Timestamp:
May 27, 2011 7:16:16 PM (13 years ago)
Author:
dpranke@chromium.org
Message:

2011-05-27 Dirk Pranke <dpranke@chromium.org>

Reviewed by Eric Seidel.

NRWT: minor cleanup in printing module
https://bugs.webkit.org/show_bug.cgi?id=60329

  • Scripts/webkitpy/layout_tests/layout_package/printing.py:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r87593 r87594  
     12011-05-27  Dirk Pranke  <dpranke@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        NRWT: minor cleanup in printing module
     6        https://bugs.webkit.org/show_bug.cgi?id=60329
     7
     8        * Scripts/webkitpy/layout_tests/layout_package/printing.py:
     9
    1102011-05-27  Steve Lacey  <sjl@chromium.org>
    211
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py

    r87593 r87594  
    3737from webkitpy.layout_tests.layout_package import test_expectations
    3838
     39# FIXME: Change this to __file__ when we can fix test-webkitpy's logging configuration.
    3940_log = logging.getLogger("webkitpy.layout_tests.printer")
    4041
     
    338339    def print_progress(self, result_summary, retrying, test_list):
    339340        """Print progress through the tests as determined by --print."""
    340         if self.enabled('one-line-progress'):
    341             self._print_one_line_progress(result_summary, retrying)
    342         else:
    343             return
    344 
    345         if result_summary.remaining == 0:
    346             self._meter.update('')
    347 
    348     def _print_one_line_progress(self, result_summary, retrying):
    349         """Displays the progress through the test run."""
     341        if self.disabled('one-line-progress'):
     342            return
     343
    350344        percent_complete = 100 * (result_summary.expected +
    351345            result_summary.unexpected) / result_summary.total
     
    357351             result_summary.unexpected, result_summary.remaining))
    358352
     353        if result_summary.remaining == 0:
     354            self._meter.update('')
     355
    359356    def print_unexpected_results(self, unexpected_results):
    360357        """Prints a list of the unexpected results to the buildbot stream."""
     
    366363        regressions = {}
    367364
    368         def add_result(test, results):
     365        def add_to_dict_of_lists(dict, key, value):
     366            dict.setdefault(key, []).append(value)
     367
     368        def add_result(test, results, passes=passes, flaky=flaky, regressions=regressions):
    369369            actual = results['actual'].split(" ")
    370370            expected = results['expected'].split(" ")
    371371            if actual == ['PASS']:
    372372                if 'CRASH' in expected:
    373                     _add_to_dict_of_lists(passes,
    374                                           'Expected to crash, but passed',
     373                    add_to_dict_of_lists(passes,
     374                                         'Expected to crash, but passed',
     375                                         test)
     376                elif 'TIMEOUT' in expected:
     377                    add_to_dict_of_lists(passes,
     378                                         'Expected to timeout, but passed',
    375379                                          test)
    376                 elif 'TIMEOUT' in expected:
    377                     _add_to_dict_of_lists(passes,
    378                                           'Expected to timeout, but passed',
    379                                            test)
    380380                else:
    381                     _add_to_dict_of_lists(passes,
    382                                           'Expected to fail, but passed',
    383                                           test)
     381                    add_to_dict_of_lists(passes,
     382                                         'Expected to fail, but passed',
     383                                         test)
    384384            elif len(actual) > 1:
    385385                # We group flaky tests by the first actual result we got.
    386                 _add_to_dict_of_lists(flaky, actual[0], test)
     386                add_to_dict_of_lists(flaky, actual[0], test)
    387387            else:
    388                 _add_to_dict_of_lists(regressions, results['actual'], test)
     388                add_to_dict_of_lists(regressions, results['actual'], test)
    389389
    390390        resultsjsonparser.for_each_test(unexpected_results['tests'], add_result)
     
    455455        else:
    456456            self._meter.write("%s\n" % msg)
    457 
    458 #
    459 # Utility routines used by the Controller class
    460 #
    461 
    462 
    463 def _add_to_dict_of_lists(dict, key, value):
    464     dict.setdefault(key, []).append(value)
Note: See TracChangeset for help on using the changeset viewer.