webkitpy: Reworking test chunking for sharding.

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

 # Copyright (C) 2010, 2012 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
@@ skipping 83 matching lines @@
             self._print_default("Pixel tests enabled")
         else:
             self._print_default("Pixel tests disabled")
 
         self._print_default("Regular timeout: %s, slow test timeout: %s" %
                             (self._options.time_out_ms, self._options.slow_time_out_ms))
 
         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):
         self._print_expected_results_of_type(run_results, test_expectations.PASS, "passes", tests_with_result_type_callback)
         self._print_expected_results_of_type(run_results, test_expectations.FAIL, "failures", tests_with_result_type_callback)
         self._print_expected_results_of_type(run_results, test_expectations.FLAKY, "flaky", tests_with_result_type_callback)
         self._print_debug('')
 
     def print_workers_and_shards(self, num_workers, num_shards, num_locked_shards):
         driver_name = self._port.driver_name()
@@ skipping 314 matching lines @@
         self._meter.write_throttled_update(msg)
 
     def write_update(self, msg):
         self._meter.write_update(msg)
 
     def writeln(self, msg):
         self._meter.writeln(msg)
 
     def flush(self):
         self._meter.flush()