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

Commit 60587b34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cert: make sure we unregister controllers during teardown" am:... 

Merge "Cert: make sure we unregister controllers during teardown" am: a41d5c6c am: 106c3b4a am: c182ad6b

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

Change-Id: I0c8ecb4015abae7aefdf7733870afa622d000ac8
parents 4a35b450 c182ad6b

system/blueberry/tests/gd/cert/gd_base_test.py

+13 −12
Original line number Diff line number Diff line
@@ -126,14 +126,15 @@ class GdBaseTestClass(base_test.BaseTestClass): 
        self.cert.wait_channel_ready()



    def teardown_test(self):

        stack = ""

        try:

            stack = "CERT"

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

        except RpcError as rpc_error:

            asserts.fail("Failed to stop CERT stack, RpcError={!r}".format(rpc_error))

        try:

            stack = "DUT"

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

        except RpcError as rpc_error:

            asserts.fail("Failed to stop DUT stack, RpcError={!r}".format(rpc_error))

            asserts.fail("Failed to stop {} stack, RpcError={!r}".format(stack, rpc_error))

        finally:

            # Destroy GD device objects

            self._controller_manager.unregister_controllers()

            teardown_rootcanal(

system/gd/cert/gd_base_test.py

+12 −11
Original line number Diff line number Diff line
@@ -132,14 +132,15 @@ class GdBaseTestClass(BaseTestClass): 
        self.cert.wait_channel_ready()



    def teardown_test(self):

        stack = ""

        try:

            stack = "CERT"

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

        except RpcError as rpc_error:

            asserts.fail("Failed to stop CERT stack, RpcError={!r}".format(rpc_error))

        try:

            stack = "DUT"

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

        except RpcError as rpc_error:

            asserts.fail("Failed to stop DUT stack, RpcError={!r}".format(rpc_error))

            asserts.fail("Failed to stop {} stack, RpcError={!r}".format(stack, rpc_error))

        finally:

            # Destroy GD device objects

            self._controller_manager.unregister_controllers()

            teardown_rootcanal(