Modified: trunk/Tools/ChangeLog (100590 => 100591)
--- trunk/Tools/ChangeLog 2011-11-17 10:56:26 UTC (rev 100590)
+++ trunk/Tools/ChangeLog 2011-11-17 10:58:56 UTC (rev 100591)
@@ -1,5 +1,11 @@
2011-11-17 Adam Barth <aba...@webkit.org>
+ Unreviewed. Fix style nits in printing.py.
+
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+
+2011-11-17 Adam Barth <aba...@webkit.org>
+
Minor style nits in run_webkit_tests.py
https://bugs.webkit.org/show_bug.cgi?id=72583
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (100590 => 100591)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2011-11-17 10:56:26 UTC (rev 100590)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2011-11-17 10:58:56 UTC (rev 100591)
@@ -35,23 +35,18 @@
from webkitpy.common.net import resultsjsonparser
from webkitpy.layout_tests.views.metered_stream import MeteredStream
-from webkitpy.layout_tests.models import test_expectations
+from webkitpy.layout_tests.models.test_expectations import TestExpectations
_log = logging.getLogger(__name__)
-TestExpectations = test_expectations.TestExpectations
-
NUM_SLOW_TESTS_TO_LOG = 10
FAST_UPDATES_SECONDS = 0.03
SLOW_UPDATES_SECONDS = 10.0
-PRINT_DEFAULT = ("misc,one-line-progress,one-line-summary,unexpected,"
- "unexpected-results,updates")
-PRINT_EVERYTHING = ("actual,config,expected,misc,one-line-progress,"
- "one-line-summary,slowest,timing,unexpected,"
- "unexpected-results,updates")
+PRINT_DEFAULT = "misc,one-line-progress,one-line-summary,unexpected,unexpected-results,updates"
+PRINT_EVERYTHING = "actual,config,expected,misc,one-line-progress,one-line-summary,slowest,timing,unexpected,unexpected-results,updates"
HELP_PRINTING = """
Output for run-webkit-tests is controlled by a comma-separated list of
@@ -164,8 +159,7 @@
log_datefmt = '%y%m%d %H:%M:%S'
log_level = logging.INFO
if verbose:
- log_fmt = ('%(asctime)s %(process)d %(filename)s:%(lineno)d '
- '%(levelname)s %(message)s')
+ log_fmt = '%(asctime)s %(process)d %(filename)s:%(lineno)d %(levelname)s %(message)s'
log_level = logging.DEBUG
root = logging.getLogger()
@@ -193,8 +187,7 @@
By default the buildbot-parsed code gets logged to stdout, and regular
output gets logged to stderr."""
- def __init__(self, port, options, regular_output, buildbot_output,
- configure_logging):
+ def __init__(self, port, options, regular_output, buildbot_output, configure_logging):
"""
Args
port interface to port-specific routines
@@ -206,11 +199,11 @@
configure_loggign Whether a logging handler should be registered
"""
- self._buildbot_stream = buildbot_output
- self._options = options
self._port = port
- self._meter = None
+ self._options = options
self._stream = regular_output
+ self._buildbot_stream = buildbot_output
+ self._meter = None
# These are used for --print one-line-progress
self._last_remaining = None
