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

Commit 31924c54 authored by Jizheng Chu's avatar Jizheng Chu Committed by Automerger Merge Worker
Browse files

Merge "Remove _Bb/_blueberry suffix from gd test names" am: 7f6a78a2 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1897835

Change-Id: I23f1656738a7c6b042158cf59a2fc21a7fb73014
parents 88448fc8 7f6a78a2

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ class ObjectWithBehaviors(IHasBehaviors): 
        self.unhandled_count += 1

        self.unhandled_count += 1









class CertSelfTestBb(base_test.BaseTestClass):

class CertSelfTest(base_test.BaseTestClass):





    def setup_test(self):

    def setup_test(self):

        return True

        return True

system/blueberry/tests/gd/gd_all_tests.py

+22 −23
Original line number Original line Diff line number Diff line
@@ -14,33 +14,32 @@ 
#   See the License for the specific language governing permissions and

#   See the License for the specific language governing permissions and

#   limitations under the License.

#   limitations under the License.





from blueberry.tests.gd.cert.cert_self_test_blueberry import CertSelfTestBb

from blueberry.tests.gd.cert.cert_self_test import CertSelfTest

from blueberry.tests.gd.hal.simple_hal_test_blueberry import SimpleHalTestBb

from blueberry.tests.gd.hal.simple_hal_test import SimpleHalTest

from blueberry.tests.gd.hci.acl_manager_test_blueberry import AclManagerTestBb

from blueberry.tests.gd.hci.acl_manager_test import AclManagerTest

from blueberry.tests.gd.hci.controller_test_blueberry import ControllerTestBb

from blueberry.tests.gd.hci.controller_test import ControllerTest

from blueberry.tests.gd.hci.direct_hci_test_blueberry import DirectHciTestBb

from blueberry.tests.gd.hci.direct_hci_test import DirectHciTest

from blueberry.tests.gd.hci.le_acl_manager_test_blueberry import LeAclManagerTestBb

from blueberry.tests.gd.hci.le_acl_manager_test import LeAclManagerTest

from blueberry.tests.gd.hci.le_advertising_manager_test_blueberry import LeAdvertisingManagerTestBb

from blueberry.tests.gd.hci.le_advertising_manager_test import LeAdvertisingManagerTest

from blueberry.tests.gd.hci.le_scanning_manager_test_blueberry import LeScanningManagerTestBb

from blueberry.tests.gd.hci.le_scanning_manager_test import LeScanningManagerTest

from blueberry.tests.gd.hci.le_scanning_with_security_test_blueberry import LeScanningWithSecurityTestBb

from blueberry.tests.gd.hci.le_scanning_with_security_test import LeScanningWithSecurityTest

from blueberry.tests.gd.iso.le_iso_test_blueberry import LeIsoTestBb

from blueberry.tests.gd.iso.le_iso_test import LeIsoTest

from blueberry.tests.gd.l2cap.classic.l2cap_performance_test_blueberry import L2capPerformanceTestBb

from blueberry.tests.gd.l2cap.classic.l2cap_performance_test import L2capPerformanceTest

from blueberry.tests.gd.l2cap.classic.l2cap_test_blueberry import L2capTestBb

from blueberry.tests.gd.l2cap.classic.l2cap_test import L2capTest

from blueberry.tests.gd.l2cap.le.dual_l2cap_test_blueberry import DualL2capTestBb

from blueberry.tests.gd.l2cap.le.dual_l2cap_test import DualL2capTest

from blueberry.tests.gd.l2cap.le.le_l2cap_test_blueberry import LeL2capTestBb

from blueberry.tests.gd.l2cap.le.le_l2cap_test import LeL2capTest

from blueberry.tests.gd.neighbor.neighbor_test_blueberry import NeighborTestBb

from blueberry.tests.gd.neighbor.neighbor_test import NeighborTest

from blueberry.tests.gd.security.le_security_test_blueberry import LeSecurityTestBb

from blueberry.tests.gd.security.le_security_test import LeSecurityTest

from blueberry.tests.gd.security.security_test_blueberry import SecurityTestBb

from blueberry.tests.gd.security.security_test import SecurityTest

from blueberry.tests.gd.shim.shim_test_blueberry import ShimTestBb

from blueberry.tests.gd.shim.shim_test import ShimTest

from blueberry.tests.gd.shim.stack_test_blueberry import StackTestBb

from blueberry.tests.gd.shim.stack_test import StackTest





from mobly import suite_runner

from mobly import suite_runner





ALL_TESTS = {

ALL_TESTS = {

    CertSelfTestBb, SimpleHalTestBb, AclManagerTestBb, ControllerTestBb, DirectHciTestBb, LeAclManagerTestBb,

    CertSelfTest, SimpleHalTest, AclManagerTest, ControllerTest, DirectHciTest, LeAclManagerTest,

    LeAdvertisingManagerTestBb, LeScanningManagerTestBb, LeScanningWithSecurityTestBb, LeIsoTestBb,

    LeAdvertisingManagerTest, LeScanningManagerTest, LeScanningWithSecurityTest, LeIsoTest, L2capPerformanceTest,

    L2capPerformanceTestBb, L2capTestBb, DualL2capTestBb, LeL2capTestBb, NeighborTestBb, LeSecurityTestBb,

    L2capTest, DualL2capTest, LeL2capTest, NeighborTest, LeSecurityTest, SecurityTest, ShimTest, StackTest

    SecurityTestBb, ShimTestBb, StackTestBb

}

}





DISABLED_TESTS = set()

DISABLED_TESTS = set()

system/blueberry/tests/gd/gd_presubmit_tests.py

+6 −6
Original line number Original line Diff line number Diff line
@@ -19,21 +19,21 @@ from blueberry.tests.gd.gd_all_tests import ALL_TESTS 
from mobly import suite_runner

from mobly import suite_runner





# TODO(b/194723246): Investigate failures to re-activate the test class.

# TODO(b/194723246): Investigate failures to re-activate the test class.

from blueberry.tests.gd.hci.le_scanning_manager_test_blueberry import LeScanningManagerTestBb

from blueberry.tests.gd.hci.le_scanning_manager_test_blueberry import LeScanningManagerTest





# TODO(b/194723246): Investigate failures to re-activate the test class.

# TODO(b/194723246): Investigate failures to re-activate the test class.

from blueberry.tests.gd.l2cap.classic.l2cap_test_blueberry import L2capTestBb

from blueberry.tests.gd.l2cap.classic.l2cap_test_blueberry import L2capTest





# TODO(b/194723246): Investigate failures to re-activate the test class.

# TODO(b/194723246): Investigate failures to re-activate the test class.

from blueberry.tests.gd.l2cap.le.le_l2cap_test_blueberry import LeL2capTestBb

from blueberry.tests.gd.l2cap.le.le_l2cap_test_blueberry import LeL2capTest





# TODO(b/194723246): Investigate failures to re-activate the test class.

# TODO(b/194723246): Investigate failures to re-activate the test class.

from blueberry.tests.gd.security.le_security_test_blueberry import LeSecurityTestBb

from blueberry.tests.gd.security.le_security_test_blueberry import LeSecurityTest





# TODO(b/194723246): Investigate failures to re-activate the test class.

# TODO(b/194723246): Investigate failures to re-activate the test class.

from blueberry.tests.gd.security.security_test_blueberry import SecurityTestBb

from blueberry.tests.gd.security.security_test_blueberry import SecurityTest





DISABLED_TESTS = {LeScanningManagerTestBb, L2capTestBb, LeL2capTestBb, LeSecurityTestBb, SecurityTestBb}

DISABLED_TESTS = {LeScanningManagerTest, L2capTest, LeL2capTest, LeSecurityTest, SecurityTest}





ENABLED_TESTS = list(ALL_TESTS - DISABLED_TESTS)

ENABLED_TESTS = list(ALL_TESTS - DISABLED_TESTS)

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

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

_GRPC_TIMEOUT = 10









class SimpleHalTestBb(gd_base_test.GdBaseTestClass):

class SimpleHalTest(gd_base_test.GdBaseTestClass):





    def setup_class(self):

    def setup_class(self):

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

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ from neighbor.facade import facade_pb2 as neighbor_facade 
from mobly import test_runner

from mobly import test_runner









class AclManagerTestBb(gd_base_test.GdBaseTestClass):

class AclManagerTest(gd_base_test.GdBaseTestClass):





    def setup_class(self):

    def setup_class(self):

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

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