Changeset 91136 in webkit

Timestamp:

Jul 15, 2011 6:10:59 PM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

[NRWT] Add support for --no-http
​https://bugs.webkit.org/show_bug.cgi?id=64564

Reviewed by Dirk Pranke.

Added support for --no-http, which disables both HTTP and websockets tests.
It also matches the old-run-webkit-tests behavior if --force is used.

• Scripts/webkitpy/layout_tests/controllers/manager.py:

Fixed HTTP_SUBDIR and WEBSOCKET_SUBDIR as tests do not start with a leading separator.
We check if --no-http is set and add the HTTP / websockets tests to the skipped list prior to looking
at the expectation file. Fixed the _test_requires_lock function to use the same code path to determine
what is worth have an HTTP lock as --no-http to avoid badness.

• Scripts/webkitpy/layout_tests/port/test.py: Added 2 new tests to our mock filesystem to validate that

we do skip properly HTTP / websocket tests inside platform/.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Added tests that we properly skip all the tests.

• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:

Added checks for the command line arguments.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-15  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [NRWT] Add support for --no-http
+        https://bugs.webkit.org/show_bug.cgi?id=64564
+
+        Reviewed by Dirk Pranke.
+
+        Added support for --no-http, which disables both HTTP and websockets tests.
+        It also matches the old-run-webkit-tests behavior if --force is used.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        Fixed HTTP_SUBDIR and WEBSOCKET_SUBDIR as tests do not start with a leading separator.
+        We check if --no-http is set and add the HTTP / websockets tests to the skipped list prior to looking
+        at the expectation file. Fixed the  _test_requires_lock function to use the same code path to determine
+        what is worth have an HTTP lock as --no-http to avoid badness.
+
+        * Scripts/webkitpy/layout_tests/port/test.py: Added 2 new tests to our mock filesystem to validate that
+        we do skip properly HTTP / websocket tests inside platform/.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        Added tests that we properly skip all the tests.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        Added checks for the command line arguments.
+
 2011-07-13  Jon Honeycutt  <jhoneycutt@apple.com>
 

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

@@ -280 +280 @@
         self._expectations = None
 
-        self.HTTP_SUBDIR = port.TEST_PATH_SEPARATOR + 'http' + port.TEST_PATH_SEPARATOR
-        self.WEBSOCKET_SUBDIR = port.TEST_PATH_SEPARATOR + 'websocket' + port.TEST_PATH_SEPARATOR
+        self.HTTP_SUBDIR = 'http' + port.TEST_PATH_SEPARATOR
+        self.WEBSOCKET_SUBDIR = 'websocket' + port.TEST_PATH_SEPARATOR
         self.LAYOUT_TESTS_DIRECTORY = 'LayoutTests'
         self._has_http_lock = False
@@ -356 +356 @@
             self._options.lint_test_files,
             port.test_expectations_overrides())
+
+    def _is_http_test(self, test):
+        return self.HTTP_SUBDIR in test or self.WEBSOCKET_SUBDIR in test
+
+    def _http_tests(self):
+        return set(test for test in self._test_files if self._is_http_test(test))
 
     def parse_expectations(self):
@@ -386 +392 @@
 
         skipped = set()
+
+        if not self._options.http:
+            skipped = skipped.union(self._http_tests())
+
         if num_all_test_files > 1 and not self._options.force:
-            skipped = self._expectations.get_tests_with_result_type(
-                           test_expectations.SKIP)
-            self._test_files -= skipped
+            skipped = skipped.union(self._expectations.get_tests_with_result_type(test_expectations.SKIP))
             if self._options.skip_failing_tests:
-                failing = self._expectations.get_tests_with_result_type(
-                               test_expectations.FAIL)
+                failing = self._expectations.get_tests_with_result_type(test_expectations.FAIL)
                 self._test_files -= failing
+
+        self._test_files -= skipped
 
         # Create a sorted list of test files so the subset chunk,
@@ -538 +547 @@
         """Return True if the test needs to be locked when
         running multiple copies of NRWTs."""
-        split_path = test_file.split(self._port.TEST_PATH_SEPARATOR)
-        return 'http' in split_path or 'websocket' in split_path
+        return self._is_http_test(test_file)
 
     def _test_is_slow(self, test_file):
@@ -936 +944 @@
 
     def start_servers_with_lock(self):
+        assert(self._options.http)
         self._printer.print_update('Acquiring http lock ...')
         self._port.acquire_http_lock()

trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py

@@ -178 +178 @@
 
     tests.add('websocket/tests/passes/text.html')
+
+    # For --no-http tests, test that platform specific HTTP tests are properly skipped.
+    tests.add('platform/test-snow-leopard/http/test.html')
+    tests.add('platform/test-snow-leopard/websocket/test.html')
+
     return tests
 

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

@@ -153 +153 @@
             normalized_platform_directories.append(port.filesystem.normpath(path))
         options.additional_platform_directory = normalized_platform_directories
+
+    if not options.http and options.force:
+        warnings.append("--no-http is ignored since --force is also provided")
+        options.http = True
 
     return warnings
@@ -318 +322 @@
             default=True, dest="record_results",
             help="Don't record the results."),
-        # old-run-webkit-tests also has HTTP toggle options:
-        # --[no-]http                     Run (or do not run) http tests
-        #                                 (default: run)
+        optparse.make_option("--http", action="store_true", dest="http",
+            default=True, help="Run HTTP and WebSocket tests (default)"),
+        optparse.make_option("--no-http", action="store_false", dest="http",
+            help="Don't run HTTP and WebSocket tests"),
     ]
 

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

@@ -651 +651 @@
         self.assertTrue('--additional-platform-directory=foo is ignored since it is not absolute\n' in regular_output.get())
 
+    def test_no_http_and_force(self):
+        # See test_run_force, using --force raises an exception.
+        # FIXME: We would like to check the warnings generated.
+        self.assertRaises(ValueError, logging_run, ['--force', '--no-http'])
+
+    @staticmethod
+    def has_test_of_type(tests, type):
+        return [test for test in tests if type in test]
+
+    def test_no_http_tests(self):
+        batch_tests_dryrun = get_tests_run(['LayoutTests/http', 'websocket/'], flatten_batches=True)
+        self.assertTrue(MainTest.has_test_of_type(batch_tests_dryrun, 'http'))
+        self.assertTrue(MainTest.has_test_of_type(batch_tests_dryrun, 'websocket'))
+
+        batch_tests_run_no_http = get_tests_run(['--no-http', 'LayoutTests/http', 'websocket/'], flatten_batches=True)
+        self.assertFalse(MainTest.has_test_of_type(batch_tests_run_no_http, 'http'))
+        self.assertFalse(MainTest.has_test_of_type(batch_tests_run_no_http, 'websocket'))
+
+        batch_tests_run_http = get_tests_run(['--http', 'LayoutTests/http', 'websocket/'], flatten_batches=True)
+        self.assertTrue(MainTest.has_test_of_type(batch_tests_run_http, 'http'))
+        self.assertTrue(MainTest.has_test_of_type(batch_tests_run_http, 'websocket'))
 
 MainTest = skip_if(MainTest, sys.platform == 'cygwin' and compare_version(sys, '2.6')[0] < 0, 'new-run-webkit-tests tests hang on Cygwin Python 2.5.2')