Changeset 137770 in webkit

Timestamp:

Dec 14, 2012, 2:13:54 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

"Running 1 DumpRenderTree over X shards" is not a helpful output
​https://bugs.webkit.org/show_bug.cgi?id=104858

Reviewed by Dirk Pranke.

The word "shard" is not typically used in test frameworks. This word is confusing for many WebKit
contributors who typically don't have much experience on distributed computations and databases.
So only print this message out in the debug mode.

• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
• Scripts/webkitpy/layout_tests/views/printing.py:

(Printer.print_workers_and_shards):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/views/printing.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        "Running 1 DumpRenderTree over X shards" is not a helpful output
+        https://bugs.webkit.org/show_bug.cgi?id=104858
+
+        Reviewed by Dirk Pranke.
+
+        The word "shard" is not typically used in test frameworks. This word is confusing for many WebKit
+        contributors who typically don't have much experience on distributed computations and databases.
+        So only print this message out in the debug mode.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer.print_workers_and_shards):
+
 2012-12-13  Eric Seidel  <eric@webkit.org>
 

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

@@ -318 +318 @@
         _, regular_output, _ = logging_run(['--debug-rwt-logging', '--child-processes', '2'], shared_port=False)
         try:
-            self.assertTrue(any(['(1 locked)' in line for line in regular_output.buflist]))
+            self.assertTrue(any(['1 locked' in line for line in regular_output.buflist]))
         finally:
             if save_env_webkit_test_max_locked_shards:

trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py

@@ -115 +115 @@
         driver_name = self._port.driver_name()
         if num_workers == 1:
-            self._print_default("Running 1 %s over %s." % (driver_name, grammar.pluralize('shard', num_shards)))
-        else:
-            self._print_default("Running %d %ss in parallel over %d shards (%d locked)." %
-                (num_workers, driver_name, num_shards, num_locked_shards))
+            self._print_default("Running 1 %s." % driver_name)
+            self._print_debug("(%s)." % grammar.pluralize('shard', num_shards))
+        else:
+            self._print_default("Running %d %ss in parallel." % (num_workers, driver_name))
+            self._print_debug("(%d shards; %d locked)." % (num_shards, num_locked_shards))
         self._print_default('')