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

Commit 29b28c3b authored by David Liem's avatar David Liem
Browse files

Fix ACTs/Mobly conflicts 

GDCert Real device tests were failing due to unknown command
"ensure-root".  This problem was due to unexpected mobly references
while running ACTs tests.  This was caused by the Blueberry instances of
the GDCert tests included in the acts directory.
Test: gd/cert/run
Bug: 193076304
Tag: #feature

Change-Id: I8768166abb2a5f204be2b9841902f580fec68040
parent 543402eb

system/blueberry/tests/gd/cert/cert_self_test.py→system/blueberry/tests/gd/cert/cert_self_test_blueberry.py

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ from mobly import base_test 
from cert.cert_self_test_lib import *





class CertSelfTest(base_test.BaseTestClass):

class CertSelfTestBb(base_test.BaseTestClass):



    def setup_test(self):

        return True

system/blueberry/tests/gd/hal/simple_hal_test.py→system/blueberry/tests/gd/hal/simple_hal_test_blueberry.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from mobly import test_runner 
_GRPC_TIMEOUT = 10





class SimpleHalTest(gd_base_test.GdBaseTestClass, SimpleHalTestBase):

class SimpleHalTestBb(gd_base_test.GdBaseTestClass, SimpleHalTestBase):



    def setup_class(self):

        gd_base_test.GdBaseTestClass.setup_class(self, dut_module='HAL', cert_module='HAL')

system/blueberry/tests/gd/hci/acl_manager_test.py→system/blueberry/tests/gd/hci/acl_manager_test_blueberry.py

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from hci.cert.acl_manager_test_lib import AclManagerTestBase 
from mobly import test_runner





class AclManagerTest(gd_base_test.GdBaseTestClass, AclManagerTestBase):

class AclManagerTestBb(gd_base_test.GdBaseTestClass, AclManagerTestBase):



    def setup_class(self):

        gd_base_test.GdBaseTestClass.setup_class(self, dut_module='HCI_INTERFACES', cert_module='HCI')

system/blueberry/tests/gd/hci/controller_test.py→system/blueberry/tests/gd/hci/controller_test_blueberry.py

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from hci.cert.controller_test_lib import ControllerTestBase 
from mobly import test_runner





class ControllerTest(gd_base_test.GdBaseTestClass, ControllerTestBase):

class ControllerTestBb(gd_base_test.GdBaseTestClass, ControllerTestBase):



    def setup_class(self):

        gd_base_test.GdBaseTestClass.setup_class(self, dut_module='HCI_INTERFACES', cert_module='HCI_INTERFACES')

system/blueberry/tests/gd/hci/direct_hci_test.py→system/blueberry/tests/gd/hci/direct_hci_test_blueberry.py

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from hci.cert.direct_hci_test_lib import DirectHciTestBase 
from mobly import test_runner





class DirectHciTest(gd_base_test.GdBaseTestClass, DirectHciTestBase):

class DirectHciTestBb(gd_base_test.GdBaseTestClass, DirectHciTestBase):



    def setup_class(self):

        gd_base_test.GdBaseTestClass.setup_class(self, dut_module='HCI', cert_module='HAL')