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

Commit 7b4db898 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Cert: Skip LE security test in setup class" am: 483845bb am: 16eb5670 am: 7f8c2d75 

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

Change-Id: Ib73e96092c650e76be4e2c6ed1522717e1a81781
parents 01893d90 7f8c2d75

system/blueberry/tests/gd/security/le_security_test_blueberry.py

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


from blueberry.tests.gd.cert import gd_base_test

from security.cert.le_security_test_lib import LeSecurityTestBase



from mobly import asserts

from mobly import test_runner
@@ -24,10 +26,12 @@ class LeSecurityTestBb(gd_base_test.GdBaseTestClass, LeSecurityTestBase): 
        gd_base_test.GdBaseTestClass.setup_class(self, dut_module='SECURITY', cert_module='SECURITY')



    def setup_test(self):

        asserts.skip("Unhandled race condition - Flaky test")

        gd_base_test.GdBaseTestClass.setup_test(self)

        LeSecurityTestBase.setup_test(self, self.dut, self.cert)



    def teardown_test(self):

        return  # test skipped

        LeSecurityTestBase.teardown_test(self)

        gd_base_test.GdBaseTestClass.teardown_test(self)

system/gd/security/cert/le_security_test.py

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
from cert.gd_base_test import GdBaseTestClass

from security.cert.le_security_test_lib import LeSecurityTestBase



from mobly import asserts





class LeSecurityTest(GdBaseTestClass, LeSecurityTestBase):
@@ -23,9 +25,11 @@ class LeSecurityTest(GdBaseTestClass, LeSecurityTestBase): 
        GdBaseTestClass.setup_class(self, dut_module='SECURITY', cert_module='SECURITY')



    def setup_test(self):

        asserts.skip("Unhandled race condition - Flaky test")

        GdBaseTestClass.setup_test(self)

        LeSecurityTestBase.setup_test(self, self.dut, self.cert)



    def teardown_test(self):

        return  # test skipped

        LeSecurityTestBase.teardown_test(self)

        GdBaseTestClass.teardown_test(self)

system/gd/security/cert/le_security_test_lib.py

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ class LeSecurityTestBase(): 
            address_with_type=self.cert_address)

        self.cert.security.SetLeInitiatorAddressPolicy(cert_privacy_policy)



        asserts.skip("Unhandled race condition - Flaky test")



    def teardown_test(self):

        self.dut_hci.close()

        self.dut_security.close()