diff options
Diffstat (limited to 'blueberry')
| -rw-r--r-- | blueberry/tests/gd/cert/gd_base_test.py | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/blueberry/tests/gd/cert/gd_base_test.py b/blueberry/tests/gd/cert/gd_base_test.py index 31907743a..37e2d2e3b 100644 --- a/blueberry/tests/gd/cert/gd_base_test.py +++ b/blueberry/tests/gd/cert/gd_base_test.py @@ -23,11 +23,11 @@ from grpc import RpcError from cert.gd_base_test_lib import setup_rootcanal from cert.gd_base_test_lib import teardown_rootcanal -from cert.gd_base_test_lib import setup_test_core -from cert.gd_base_test_lib import teardown_test_core from cert.gd_base_test_lib import dump_crashes_core from cert.gd_device_lib import generate_coverage_report_for_host +from facade import rootservice_pb2 as facade_rootservice + from blueberry.tests.gd.cert.context import get_current_context from blueberry.tests.gd.cert.gd_device import MOBLY_CONTROLLER_CONFIG_NAME as CONTROLLER_CONFIG_NAME from blueberry.tests.gd.cert.tracelogger import TraceLogger @@ -109,10 +109,30 @@ class GdBaseTestClass(base_test.BaseTestClass): self.cert_coverage_info, new_cert_coverage_info)) self.cert_coverage_info = new_cert_coverage_info - setup_test_core(dut=self.dut, cert=self.cert, dut_module=self.dut_module, cert_module=self.cert_module) + try: + self.dut.rootservice.StartStack( + facade_rootservice.StartStackRequest( + module_under_test=facade_rootservice.BluetoothModule.Value(self.dut_module))) + except RpcError as rpc_error: + asserts.fail("Failed to start DUT stack, RpcError={!r}".format(rpc_error)) + try: + self.cert.rootservice.StartStack( + facade_rootservice.StartStackRequest( + module_under_test=facade_rootservice.BluetoothModule.Value(self.cert_module))) + except RpcError as rpc_error: + asserts.fail("Failed to start CERT stack, RpcError={!r}".format(rpc_error)) + self.dut.wait_channel_ready() + self.cert.wait_channel_ready() def teardown_test(self): - teardown_test_core(cert=self.cert, dut=self.dut) + try: + 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: + self.dut.rootservice.StopStack(facade_rootservice.StopStackRequest()) + except RpcError as rpc_error: + asserts.fail("Failed to stop DUT stack, RpcError={!r}".format(rpc_error)) # Destroy GD device objects self._controller_manager.unregister_controllers() teardown_rootcanal( |