webkitpy: Reworking test chunking for sharding.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py
index 3170b040c9b1f46044fe75f0ad33cefb4660f245..3f281bac6140c347a419e204adc77eb8aed8b0c9 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/printing.py
@@ -101,11 +101,14 @@ class Printer(object):
         self._print_default('Command line: ' + ' '.join(self._port.driver_cmd_line()))
         self._print_default('')
 
-    def print_found(self, num_all_test_files, num_to_run, repeat_each, iterations):
-        found_str = 'Found %s; running %d' % (grammar.pluralize('test', num_all_test_files), num_to_run)
+    def print_found(self, num_all_test_files, num_shard_test_files, num_to_run, repeat_each, iterations):
+        found_str = 'Found %s' % grammar.pluralize('test', num_shard_test_files)
+        if num_all_test_files != num_shard_test_files:
+            found_str += ' (total %d)' % num_all_test_files
+        found_str += '; running %d' % num_to_run

[qyearsley, 2017/02/13 21:49:00]

So this might say something like "Found 2090 (total 41012); running 2045" or
something like that? Might the message  be clearer if it said something like
"Found 41012 (2090 on this shard); running 2045" or something like that?

[mithro, 2017/02/14 00:40:03]

I bounced back and forth between putting the total in the brackets and shard in
brackets. I think it's more useful to have the actual number being run first.

         if repeat_each * iterations > 1:
             found_str += ' (%d times each: --repeat-each=%d --iterations=%d)' % (repeat_each * iterations, repeat_each, iterations)
-        found_str += ', skipping %d' % (num_all_test_files - num_to_run)
+        found_str += ', skipping %d' % (num_shard_test_files - num_to_run)
         self._print_default(found_str + '.')
 
     def print_expected(self, run_results, tests_with_result_type_callback):