From b0ee1f1e9e2c616f675e13cd031b3d65cedd6d4e Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Thu, 12 Nov 2020 21:34:43 -0800 Subject: [PATCH] Add read_own_addres to PyHal Bug: 171749953 Tag: #gd-refactor Test: gd/cert/run --host Change-Id: I333524dcc50d7f9cc586ab66514cab04908686ab --- gd/cert/py_hal.py | 6 ++++++ gd/hci/cert/direct_hci_test.py | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gd/cert/py_hal.py b/gd/cert/py_hal.py index fe36fcb85..59841bbcd 100644 --- a/gd/cert/py_hal.py +++ b/gd/cert/py_hal.py @@ -80,6 +80,12 @@ class PyHal(Closable): def send_acl_first(self, handle, data): self.send_acl(handle, PacketBoundaryFlag.FIRST_NON_AUTOMATICALLY_FLUSHABLE, BroadcastFlag.POINT_TO_POINT, data) + def read_own_address(self): + self.send_hci_command(hci_packets.ReadBdAddrBuilder()) + read_bd_addr = HciCaptures.ReadBdAddrCompleteCapture() + assertThat(self.hci_event_stream).emits(read_bd_addr) + return read_bd_addr.get().GetBdAddr() + def enable_inquiry_and_page_scan(self): self.send_hci_command(WriteScanEnableBuilder(ScanEnable.INQUIRY_AND_PAGE_SCAN)) diff --git a/gd/hci/cert/direct_hci_test.py b/gd/hci/cert/direct_hci_test.py index 98552d063..c0e6a0417 100644 --- a/gd/hci/cert/direct_hci_test.py +++ b/gd/hci/cert/direct_hci_test.py @@ -326,14 +326,8 @@ class DirectHciTest(GdBaseTestClass): def test_connection_dut_connects(self): self.dut_hci.send_command_with_complete(WritePageTimeoutBuilder(0x4000)) - # CERT Enables scans and gets its address - self.cert_hal.send_hci_command(ReadBdAddrBuilder()) - - cert_read_bd_addr_capture = HalCaptures.ReadBdAddrCompleteCapture() - assertThat(self.cert_hal.get_hci_event_stream()).emits(cert_read_bd_addr_capture) - address = cert_read_bd_addr_capture.get().GetBdAddr() - self.cert_hal.enable_inquiry_and_page_scan() + address = self.cert_hal.read_own_address() self.dut_hci.initiate_connection(address) cert_acl = self.cert_hal.accept_connection() -- 2.11.0