Changeset 214377 in webkit

Timestamp:

Mar 24, 2017 2:23:59 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

webkitpy should be able to run API tests
​https://bugs.webkit.org/show_bug.cgi?id=170028

Patch by Srinivasan Vijayaraghavan <​svijayaraghavan@apple.com> on 2017-03-24
Reviewed by Alexey Proskuryakov.

• Scripts/webkitpy/common/config/ports.py:

(DeprecatedPort.run_api_tests_command): Added.

• Scripts/webkitpy/port/base.py:

(Port.api_results_directory): Added.

• Scripts/webkitpy/tool/steps/runtests.py:

(RunTests.run): Check if we should be running API tests.
(RunTests._run_api_tests): Generate script to run API tests with json output.

• Scripts/webkitpy/tool/steps/steps_unittest.py: Unit tests.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/runtests.py (modified) (2 diffs)
• Scripts/webkitpy/tool/steps/steps_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-03-24  Srinivasan Vijayaraghavan  <svijayaraghavan@apple.com>
+
+        webkitpy should be able to run API tests
+        https://bugs.webkit.org/show_bug.cgi?id=170028
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        (DeprecatedPort.run_api_tests_command): Added.
+        * Scripts/webkitpy/port/base.py:
+        (Port.api_results_directory): Added.
+        * Scripts/webkitpy/tool/steps/runtests.py:
+        (RunTests.run): Check if we should be running API tests.
+        (RunTests._run_api_tests): Generate script to run API tests with json output.
+        * Scripts/webkitpy/tool/steps/steps_unittest.py: Unit tests.
+
 2017-03-24  Srinivasan Vijayaraghavan  <svijayaraghavan@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -131 +131 @@
         return self.script_shell_command("run-bindings-tests")
 
+    def run_api_tests_command(self, build_style=None):
+        command = self.script_shell_command("run-api-tests")
+        return self._append_build_style_flag(command, build_style)
+
 
 class IOSPort(DeprecatedPort):

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -815 +815 @@
         return self._build_path()
 
+    def api_results_directory(self):
+        return self._build_path()
+
     def results_directory(self):
         """Absolute path to the place to store the test results (uses --results-directory)."""

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

@@ -61 +61 @@
         if self._options.group == "jsc":
             self._run_javascriptcore_tests()
+            return
+
+        if self._options.group == "api":
+            self._run_api_tests()
             return
 
@@ -170 +174 @@
         args.append("--json-output=%s" % results_file_path)
         self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
+
+    def _run_api_tests(self):
+        args = self._tool.deprecated_port().run_api_tests_command(self._options.build_style)
+        results_directory = self._tool.port_factory.get(options=self._options).api_results_directory()
+        results_file_path = self._tool.filesystem.join(results_directory, "api_test_results.json")
+        args.append("--json-output=%s" % results_file_path)
+        self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)

trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py

@@ -283 +283 @@
 This patch does not have relevant changes.
 """
+
+    def test_runtests_api(self):
+        mock_options = self._step_options()
+        mock_options.non_interactive = False
+        mock_options.build_style = "release"
+        mock_options.group = "api"
+        step = steps.RunTests(MockTool(log_executive=True), mock_options)
+        tool = MockTool(log_executive=True)
+        tool._deprecated_port = DeprecatedPort()
+        step = steps.RunTests(tool, mock_options)
+        expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--release', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
+"""
+        OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
+
+    def test_runtests_api_debug(self):
+        mock_options = self._step_options()
+        mock_options.non_interactive = False
+        mock_options.build_style = "debug"
+        mock_options.group = "api"
+        step = steps.RunTests(MockTool(log_executive=True), mock_options)
+        tool = MockTool(log_executive=True)
+        tool._deprecated_port = DeprecatedPort()
+        step = steps.RunTests(tool, mock_options)
+        expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--debug', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
+"""
+        OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)