Changeset 85927 in webkit

Timestamp:

May 6, 2011 12:33:46 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-05-06 Adam Barth <​abarth@webkit.org>

Reviewed by Ojan Vafai.

Add an option to NRWT to skip failing tests
​https://bugs.webkit.org/show_bug.cgi?id=60295

This option is similar to the way old-run-webkit-tests works. We're
planning to use this option on the testing EWS bots because they don't
use information from failing tests yet.

• Scripts/webkitpy/layout_tests/layout_package/manager.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-06  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Ojan Vafai.
+
+        Add an option to NRWT to skip failing tests
+        https://bugs.webkit.org/show_bug.cgi?id=60295
+
+        This option is similar to the way old-run-webkit-tests works.  We're
+        planning to use this option on the testing EWS bots because they don't
+        use information from failing tests yet.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-05-04  Philippe Normand  <pnormand@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@ -359 +359 @@
                            test_expectations.SKIP)
             self._test_files -= skipped
+            if self._options.skip_failing_tests:
+                failing = self._expectations.get_tests_with_result_type(
+                               test_expectations.FAIL)
+                self._test_files -= failing
 
         # Create a sorted list of test files so the subset chunk,

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

@@ -300 +300 @@
             default=False, help="Reset any existing baselines to the "
                  "generated results"),
+        optparse.make_option("--skip-failing-tests", action="store_true",
+            default=False, help="Skip tests that are expected to fail. "
+                 "Note: When using this option, you might miss new crashes "
+                 "in these tests."),
         optparse.make_option("--additional-drt-flag", action="append",
             default=[], help="Additional command line flag to pass to DumpRenderTree "

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

@@ -339 +339 @@
             self.assertEquals(len(batch), 1, '%s had too many tests' % ', '.join(batch))
 
+    def test_skip_failing_tests(self):
+        batches = get_tests_run(['--skip-failing-tests'])
+        has_passes_text = False
+        for batch in batches:
+            self.assertFalse('failures/expected/text.html' in batch)
+            has_passes_text = has_passes_text or ('passes/text.html' in batch)
+        self.assertTrue(has_passes_text)
+
     def test_run_singly_actually_runs_tests(self):
         res, _, _, _ = logging_run(['--run-singly', 'failures/unexpected'])