Do not run webkitpy tests on multiple EWSes
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Nov 2017 01:21:39 +0000 (01:21 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Nov 2017 01:21:39 +0000 (01:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179834

Reviewed by Alexey Proskuryakov.

Do not run webkitpy tests in every EWS. We now have
a dedicated webkitpy test EWS.

* Scripts/webkitpy/tool/steps/runtests.py:
(RunTests.run): Do not run webkitpy tests in EWSes. These tests will still run
when --non-interactive option is not passed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/tool/steps/runtests.py

index 60f82e2..fdddbeb 100644 (file)
@@ -1,3 +1,17 @@
+2017-11-27  Aakash Jain  <aakash_jain@apple.com>
+
+        Do not run webkitpy tests on multiple EWSes
+        https://bugs.webkit.org/show_bug.cgi?id=179834
+
+        Reviewed by Alexey Proskuryakov.
+
+        Do not run webkitpy tests in every EWS. We now have
+        a dedicated webkitpy test EWS.
+
+        * Scripts/webkitpy/tool/steps/runtests.py:
+        (RunTests.run): Do not run webkitpy tests in EWSes. These tests will still run
+        when --non-interactive option is not passed. 
+
 2017-11-27  Jonathan Bedard  <jbedard@apple.com>
 
         webkitpy: Better name-version mapping (Part 1)
index 09ebf78..00c8fea 100644 (file)
@@ -81,22 +81,11 @@ class RunTests(AbstractStep):
         if not self._options.test:
             return
 
-        python_unittests_command = self._tool.deprecated_port().run_python_unittests_command()
-        if python_unittests_command:
-            _log.info("Running Python unit tests")
-            if self._options.non_interactive:
-                filesystem = self._tool.filesystem
-                python_unittest_results_directory = self._tool.port_factory.get().python_unittest_results_directory()
-                filesystem.maybe_make_directory(python_unittest_results_directory)
-
-                python_unittests_command.append('--json')
-                output = self._tool.executive.run_command(python_unittests_command, cwd=self._tool.scm().checkout_root, error_handler=Executive.ignore_error, return_stderr=False)
-                filesystem.write_text_file(filesystem.join(python_unittest_results_directory, "results.json"), output)
-            else:
-                self._tool.executive.run_and_throw_if_fail(python_unittests_command, cwd=self._tool.scm().checkout_root)
-
         if not self._options.non_interactive:
-            # FIXME: We should teach the commit-queue and the EWS how to run these tests.
+            python_unittests_command = self._tool.deprecated_port().run_python_unittests_command()
+            if python_unittests_command:
+                _log.info("Running Python unit tests")
+                self._tool.executive.run_and_throw_if_fail(python_unittests_command, cwd=self._tool.scm().checkout_root)
 
             perl_unittests_command = self._tool.deprecated_port().run_perl_unittests_command()
             if perl_unittests_command: