Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bd5790a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Changes the ACTS_ prefix to MOBLY_ for the config variable." am: cc90f0fb am: 98a599a7 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1350819

Change-Id: Ibd085553b68fccff0b59ce5054b3649f70ecc9e4
parents 1b99a066 98a599a7

system/gd/cert/gd_base_test.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ from cert.os_utils import read_crash_snippet_and_log_tail 
from cert.os_utils import is_subprocess_alive

from cert.os_utils import make_ports_available

from cert.os_utils import TerminalColor

from cert.gd_device import ACTS_CONTROLLER_CONFIG_NAME as CONTROLLER_CONFIG_NAME

from cert.gd_device import MOBLY_CONTROLLER_CONFIG_NAME as CONTROLLER_CONFIG_NAME

from facade import rootservice_pb2 as facade_rootservice

system/gd/cert/gd_device.py

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ from l2cap.le import facade_pb2_grpc as l2cap_le_facade_pb2_grpc 
from neighbor.facade import facade_pb2_grpc as neighbor_facade_pb2_grpc

from security import facade_pb2_grpc as security_facade_pb2_grpc



ACTS_CONTROLLER_CONFIG_NAME = "GdDevice"

MOBLY_CONTROLLER_CONFIG_NAME = "GdDevice"

ACTS_CONTROLLER_REFERENCE_NAME = "gd_devices"
@@ -93,11 +93,11 @@ def get_instances_with_configs(configs): 
        verbose_mode = bool(config.get('verbose_mode', False))

        if config.get("serial_number"):

            device = GdAndroidDevice(config["grpc_port"], config["grpc_root_server_port"], config["signal_port"],

                                     resolved_cmd, config["label"], ACTS_CONTROLLER_CONFIG_NAME, config["name"],

                                     resolved_cmd, config["label"], MOBLY_CONTROLLER_CONFIG_NAME, config["name"],

                                     config["serial_number"], verbose_mode)

        else:

            device = GdHostOnlyDevice(config["grpc_port"], config["grpc_root_server_port"], config["signal_port"],

                                      resolved_cmd, config["label"], ACTS_CONTROLLER_CONFIG_NAME, config["name"],

                                      resolved_cmd, config["label"], MOBLY_CONTROLLER_CONFIG_NAME, config["name"],

                                      verbose_mode)

        device.setup()

        devices.append(device)
@@ -288,7 +288,7 @@ class GdHostOnlyDevice(GdDeviceBase): 


    def __init__(self, grpc_port: str, grpc_root_server_port: str, signal_port: str, cmd: List[str], label: str,

                 type_identifier: str, name: str, verbose_mode: bool):

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd, label, ACTS_CONTROLLER_CONFIG_NAME, name,

        super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd, label, MOBLY_CONTROLLER_CONFIG_NAME, name,

                         verbose_mode)

        # Enable LLVM code coverage output for host only tests

        self.backing_process_profraw_path = pathlib.Path(self.log_path_base).joinpath(