Changeset 139841 in webkit

Timestamp:

Jan 16, 2013 12:02:33 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

NRWT still confused about test count with --repeat-each and --iterations
​https://bugs.webkit.org/show_bug.cgi?id=106562

Patch by Jussi Kukkonen <​jussi.kukkonen@intel.com> on 2013-01-16
Reviewed by Dirk Pranke.

Fix the printed unique test count and skipped count. This
seems to have broken in r127688 ("NRWT lies about the number
of tests that it's skipping when used with --repeat-each").

Also add a test for print_found()

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

(Printer.print_found):

• Scripts/webkitpy/layout_tests/views/printing_unittest.py:

(Testprinter.test_details):
(Testprinter):
(Testprinter.test_found):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-16  Jussi Kukkonen  <jussi.kukkonen@intel.com>
+
+        NRWT still confused about test count with --repeat-each and --iterations
+        https://bugs.webkit.org/show_bug.cgi?id=106562
+
+        Reviewed by Dirk Pranke.
+
+        Fix the printed unique test count and skipped count. This
+        seems to have broken in r127688 ("NRWT lies about the number
+        of tests that it's skipping when used with --repeat-each").
+
+        Also add a test for print_found()
+
+        * Scripts/webkitpy/layout_tests/views/printing.py:
+        (Printer.print_found):
+        * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+        (Testprinter.test_details):
+        (Testprinter):
+        (Testprinter.test_found):
+
 2013-01-15  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -99 +99 @@
 
     def print_found(self, num_all_test_files, num_to_run, repeat_each, iterations):
-        num_unique_tests = num_to_run / (repeat_each * iterations)
-        found_str = 'Found %s; running %d' % (grammar.pluralize('test', num_all_test_files), num_unique_tests)
+        found_str = 'Found %s; running %d' % (grammar.pluralize('test', num_all_test_files), num_to_run)
         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_unique_tests)
+        found_str += ', skipping %d' % (num_all_test_files - num_to_run)
         self._print_default(found_str + '.')
+        print (found_str)
 
     def print_expected(self, run_results, tests_with_result_type_callback):

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

@@ -176 +176 @@
         printer.print_finished_test(result, expected=False, exp_str='', got_str='')
         self.assertNotEmpty(err)
+
+    def test_print_found(self):
+        printer, err = self.get_printer()
+
+        printer.print_found(100, 10, 1, 1)
+        self.assertWritten(err, ["Found 100 tests; running 10, skipping 90.\n"])
+
+        self.reset(err)
+        printer.print_found(100, 10, 2, 3)
+        self.assertWritten(err, ["Found 100 tests; running 10 (6 times each: --repeat-each=2 --iterations=3), skipping 90.\n"])