Commit c91ef968 authored by Ned Nguyen's avatar Ned Nguyen Committed by Commit Bot

Remove needs_http parameter in check_sys_deps method

This also remove check_sys_deps from base.Port's subclasses that are
the same as the base class method.

Note: this CL removes an unused parameter and is a refactor with no intended behavior change.

This clean up is a follow-up of https://chromium-review.googlesource.com/c/chromium/src/+/1229240/

BUG: chromium:773617,chromium:884776
Change-Id: I82edf733a696c4e0e6de20a8bac954e244d51365
Reviewed-on: https://chromium-review.googlesource.com/c/1333893
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607676}
parent 51354d42
...@@ -376,7 +376,7 @@ class Manager(object): ...@@ -376,7 +376,7 @@ class Manager(object):
# Check that the system dependencies (themes, fonts, ...) are correct. # Check that the system dependencies (themes, fonts, ...) are correct.
if not self._options.nocheck_sys_deps: if not self._options.nocheck_sys_deps:
self._printer.write_update('Checking system dependencies ...') self._printer.write_update('Checking system dependencies ...')
exit_code = self._port.check_sys_deps(self._needs_servers(test_names)) exit_code = self._port.check_sys_deps()
if exit_code: if exit_code:
return exit_code return exit_code
......
...@@ -456,7 +456,7 @@ class AndroidPort(base.Port): ...@@ -456,7 +456,7 @@ class AndroidPort(base.Port):
def num_workers(self, requested_num_workers): def num_workers(self, requested_num_workers):
return min(len(self._options.prepared_devices), requested_num_workers) return min(len(self._options.prepared_devices), requested_num_workers)
def check_sys_deps(self, needs_http): def check_sys_deps(self):
# _get_font_files() will throw if any of the required fonts is missing. # _get_font_files() will throw if any of the required fonts is missing.
self._get_font_files() self._get_font_files()
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
......
...@@ -386,7 +386,7 @@ class Port(object): ...@@ -386,7 +386,7 @@ class Port(object):
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
def check_sys_deps(self, needs_http): def check_sys_deps(self):
"""Checks whether the system is properly configured. """Checks whether the system is properly configured.
Most checks happen during invocation of the driver prior to running Most checks happen during invocation of the driver prior to running
......
...@@ -61,7 +61,7 @@ class BrowserTestPortOverrides(object): ...@@ -61,7 +61,7 @@ class BrowserTestPortOverrides(object):
return self._path_from_chromium_base( return self._path_from_chromium_base(
'chrome', 'test', 'data', 'printing', 'layout_tests') 'chrome', 'test', 'data', 'printing', 'layout_tests')
def check_sys_deps(self, needs_http): def check_sys_deps(self):
"""This function is meant to be a no-op since we don't want to actually """This function is meant to be a no-op since we don't want to actually
check for system dependencies. check for system dependencies.
""" """
......
...@@ -238,11 +238,6 @@ class FuchsiaPort(base.Port): ...@@ -238,11 +238,6 @@ class FuchsiaPort(base.Port):
# Run a single qemu instance. # Run a single qemu instance.
return min(MAX_WORKERS, requested_num_workers) return min(MAX_WORKERS, requested_num_workers)
def check_sys_deps(self, needs_http):
# There is nothing to check here. If we have the package built we should
# be able to run it.
return exit_codes.OK_EXIT_STATUS
def requires_http_server(self): def requires_http_server(self):
"""HTTP server is always required to avoid copying the tests to the VM. """HTTP server is always required to avoid copying the tests to the VM.
""" """
......
...@@ -73,7 +73,7 @@ class MockDRTPort(object): ...@@ -73,7 +73,7 @@ class MockDRTPort(object):
def check_build(self, needs_http, printer): def check_build(self, needs_http, printer):
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
def check_sys_deps(self, needs_http): def check_sys_deps(self):
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
def _driver_class(self, delegate): def _driver_class(self, delegate):
......
...@@ -423,7 +423,7 @@ class TestPort(Port): ...@@ -423,7 +423,7 @@ class TestPort(Port):
def check_build(self, needs_http, printer): def check_build(self, needs_http, printer):
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
def check_sys_deps(self, needs_http): def check_sys_deps(self):
return exit_codes.OK_EXIT_STATUS return exit_codes.OK_EXIT_STATUS
def default_configuration(self): def default_configuration(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment