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

Commit 455c1b0a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "DeviceCert: Add timeout for some test cases" am: 6f5b0edb am: a1ec6543 am: b341cc62 

Change-Id: I128351c7be44f96c2502a388a2a096a093a9220b
parents d4bdf8e8 b341cc62

system/gd/hal/cert/simple_hal_test.py

+4 −2
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ class SimpleHalTest(GdFacadeOnlyBaseTestClass): 


            # LeConnectionComplete

            cert_hci_event_asserts.assert_event_occurs(

                lambda packet: b'\x3e\x13\x01\x00' in packet.payload)

                lambda packet: b'\x3e\x13\x01\x00' in packet.payload,

                timeout=timedelta(seconds=20))

            hci_event_asserts.assert_event_occurs(

                lambda packet: b'\x3e\x13\x01\x00' in packet.payload)
 
                lambda packet: b'\x3e\x13\x01\x00' in packet.payload,

                timeout=timedelta(seconds=20))

system/gd/hci/cert/direct_hci_test.py

+5 −1
Original line number Diff line number Diff line
@@ -457,7 +457,8 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass): 


            # LeConnectionComplete

            cert_hci_event_asserts.assert_event_occurs(

                lambda packet: b'\x3e\x13\x01\x00' in packet.payload)

                lambda packet: b'\x3e\x13\x01\x00' in packet.payload,

                timeout=timedelta(seconds=20))

            le_event_asserts.assert_event_occurs(

                lambda packet: b'\x3e\x13\x01\x00' in packet.event)
@@ -465,6 +466,8 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass): 
        self.register_for_event(hci_packets.EventCode.CONNECTION_COMPLETE)

        self.register_for_event(

            hci_packets.EventCode.CONNECTION_PACKET_TYPE_CHANGED)

        self.enqueue_hci_command(

            hci_packets.WritePageTimeoutBuilder(0x4000), True)

        with EventCallbackStream(self.device_under_test.hci.FetchEvents(empty_proto.Empty())) as hci_event_stream, \

            EventCallbackStream(self.device_under_test.hci.FetchAclPackets(empty_proto.Empty())) as acl_data_stream, \

            EventCallbackStream(self.cert_device.hal.FetchHciEvent(empty_proto.Empty())) as cert_hci_event_stream, \
@@ -586,6 +589,7 @@ class DirectHciTest(GdFacadeOnlyBaseTestClass): 
        self.register_for_event(

            hci_packets.EventCode.CONNECTION_PACKET_TYPE_CHANGED)

        self.register_for_event(hci_packets.EventCode.CONNECTION_REQUEST)

        self.send_hal_hci_command(hci_packets.WritePageTimeoutBuilder(0x4000))

        with EventCallbackStream(self.device_under_test.hci.FetchEvents(empty_proto.Empty())) as hci_event_stream, \

            EventCallbackStream(self.device_under_test.hci.FetchAclPackets(empty_proto.Empty())) as acl_data_stream, \

            EventCallbackStream(self.cert_device.hal.FetchHciEvent(empty_proto.Empty())) as cert_hci_event_stream, \