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

Commit 69b1ee9a authored by Jack He's avatar Jack He
Browse files

GdCert: Kill root-canal process if SIGINT failed 

* Wait for 10 seconds after sending SIGINT to root-canal
* If that doesn't work, send SIGKILL and wait for 10 seconds

Bug: 153274925
Bug: 153275907
Test: gd/cert/run --host
Change-Id: Id62bc95fe30a6b3a6b552b479d85e9a4ed755978
parent f85ffd1a

system/gd/cert/gd_base_test.py

+30 −17
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import signal 
import subprocess



from acts import asserts

from acts import context

from acts.context import get_current_context

from acts.base_test import BaseTestClass

from cert.os_utils import get_gd_root, is_subprocess_alive

from facade import rootservice_pb2 as facade_rootservice
@@ -29,15 +29,14 @@ from facade import rootservice_pb2 as facade_rootservice 


class GdBaseTestClass(BaseTestClass):



    SUBPROCESS_WAIT_TIMEOUT_SECONDS = 10



    def setup_class(self, dut_module, cert_module):

        self.dut_module = dut_module

        self.cert_module = cert_module

        self.log_path_base = get_current_context().get_full_output_path()



        gd_devices = self.controller_configs.get("GdDevice")



        self.log_path_base = context.get_current_context().get_full_output_path(

        )



        # Start root-canal if needed

        self.rootcanal_running = False

        if 'rootcanal' in self.controller_configs:

            self.rootcanal_running = True
@@ -64,24 +63,38 @@ class GdBaseTestClass(BaseTestClass): 
            asserts.assert_true(

                is_subprocess_alive(self.rootcanal_process),

                msg="root-canal stopped immediately after running")

            for gd_device in gd_devices:

                gd_device["rootcanal_port"] = rootcanal_hci_port

            # Modify the device config to include the correct root-canal port

            for gd_device_config in self.controller_configs.get("GdDevice"):

                gd_device_config["rootcanal_port"] = rootcanal_hci_port



        # Parse and construct GD device objects

        self.register_controller(

            importlib.import_module('cert.gd_device'), builtin=True)



        self.dut = self.gd_devices[1]

        self.cert = self.gd_devices[0]



    def teardown_class(self):

        if self.rootcanal_running:

            self.rootcanal_process.send_signal(signal.SIGINT)

            rootcanal_return_code = self.rootcanal_process.wait()

            self.rootcanal_logs.close()

            if rootcanal_return_code != 0 and\

                rootcanal_return_code != -signal.SIGINT:

            stop_signal = signal.SIGINT

            self.rootcanal_process.send_signal(stop_signal)

            try:

                return_code = self.rootcanal_process.wait(

                    timeout=self.SUBPROCESS_WAIT_TIMEOUT_SECONDS)

            except subprocess.TimeoutExpired:

                logging.error(

                    "rootcanal stopped with code: %d" % rootcanal_return_code)

                return False

                    "Failed to interrupt root canal via SIGINT, sending SIGKILL"

                )

                stop_signal = signal.SIGKILL

                self.rootcanal_process.kill()

                try:

                    return_code = self.rootcanal_process.wait(

                        timeout=self.SUBPROCESS_WAIT_TIMEOUT_SECONDS)

                except subprocess.TimeoutExpired:

                    logging.error("Failed to kill root canal")

                    return_code = -65536

            if return_code != 0 and return_code != -stop_signal:

                logging.error("rootcanal stopped with code: %d" % return_code)

            self.rootcanal_logs.close()



    def setup_test(self):

        self.dut.rootservice.StartStack(
@@ -97,5 +110,5 @@ class GdBaseTestClass(BaseTestClass): 
        self.cert.wait_channel_ready()



    def teardown_test(self):

        self.dut.rootservice.StopStack(facade_rootservice.StopStackRequest())

        self.cert.rootservice.StopStack(facade_rootservice.StopStackRequest())

        self.dut.rootservice.StopStack(facade_rootservice.StopStackRequest())