commit ffa80637f01e266fb1b5d437b74048ae5c9617f0
author Hansong Zhang <hsz@google.com> Tue Feb 04 11:15:40 2020 -0800
committer Hansong Zhang <hsz@google.com> Tue Feb 04 11:20:14 2020 -0800
tree 747f4f5bd0c34799f3a6e9e71bb3eca1f317cba3
parent 7638adea1e4b7cd617dab1b76a0d2012b2085d3f

DeviceCert: Fix AclManagerTest

Test: cert/run_device_cert.sh
Change-Id: I79348c8227bce6697166923e1a47df3101019c64

system/gd/hci/cert/acl_manager_test.py

diff --git a/system/gd/hci/cert/acl_manager_test.py b/system/gd/hci/cert/acl_manager_test.py
index 8299dad..8e13cb2 100644
--- a/system/gd/hci/cert/acl_manager_test.py
+++ b/system/gd/hci/cert/acl_manager_test.py
@@ -78,6 +78,8 @@
     def test_dut_connects(self):
         self.register_for_event(hci_packets.EventCode.CONNECTION_REQUEST)
         self.register_for_event(hci_packets.EventCode.CONNECTION_COMPLETE)
+        self.register_for_event(
+            hci_packets.EventCode.CONNECTION_PACKET_TYPE_CHANGED)
         with EventCallbackStream(self.cert_device.hci.FetchEvents(empty_proto.Empty())) as cert_hci_event_stream, \
             EventCallbackStream(self.cert_device.hci.FetchAclPackets(empty_proto.Empty())) as cert_acl_data_stream, \
             EventCallbackStream(self.device_under_test.hci_acl_manager.FetchAclData(empty_proto.Empty())) as acl_data_stream:
@@ -185,6 +187,8 @@
     def test_recombination_l2cap_packet(self):
         self.register_for_event(hci_packets.EventCode.CONNECTION_REQUEST)
         self.register_for_event(hci_packets.EventCode.CONNECTION_COMPLETE)
+        self.register_for_event(
+            hci_packets.EventCode.CONNECTION_PACKET_TYPE_CHANGED)
         with EventCallbackStream(self.cert_device.hci.FetchEvents(empty_proto.Empty())) as cert_hci_event_stream, \
             EventCallbackStream(self.cert_device.hci.FetchAclPackets(empty_proto.Empty())) as cert_acl_data_stream, \
             EventCallbackStream(self.device_under_test.hci_acl_manager.FetchAclData(empty_proto.Empty())) as acl_data_stream:
@@ -277,7 +281,7 @@
                     cert_handle, hci_packets.PacketBoundaryFlag.
                     FIRST_AUTOMATICALLY_FLUSHABLE,
                     hci_packets.BroadcastFlag.POINT_TO_POINT,
-                    bytes(b'\x88\x13\x07\x00' + b'Hello' * 1000))
+                    bytes(b'\xe8\x03\x07\x00' + b'Hello' * 200))
 
                 # DUT gets a connection complete event and sends and receives
                 connection_event_asserts.assert_event_occurs(get_handle)
@@ -285,4 +289,4 @@
                 acl_data_asserts.assert_event_occurs(
                     lambda packet: b'Hello!' in packet.payload)
                 acl_data_asserts.assert_event_occurs(
-                    lambda packet: b'Hello' * 1000 in packet.payload)
+                    lambda packet: b'Hello' * 200 in packet.payload)