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

Commit 2f5f9467 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "PTSL2cap: Reverse bit rot"

parents bdc23836 cd53edbd
Loading
Loading
Loading
Loading
+58 −58
Original line number Diff line number Diff line
@@ -54,12 +54,12 @@ class PTSL2capTest(PTSBaseTestClass):
    def _dut_connection_close_stream(self):
        return EventStream(self.device_under_test.l2cap.FetchConnectionClose(empty_pb2.Empty()))

    def _assert_connection_complete(self, due_connection_stream, timeout=30):
        due_connection_stream.assert_event_occurs(
    def _assert_connection_complete(self, dut_connection_stream, timeout=30):
        dut_connection_stream.assert_event_occurs(
            lambda device: device.remote.address == self.pts_address.address, timeout=timedelta(seconds=timeout))

    def _assert_connection_close(self, due_connection_close_stream, timeout=30):
        due_connection_close_stream.assert_event_occurs(
    def _assert_connection_close(self, dut_connection_close_stream, timeout=30):
        dut_connection_close_stream.assert_event_occurs(
            lambda device: device.remote.address == self.pts_address.address, timeout=timedelta(seconds=timeout))

    def test_L2CAP_IEX_BV_01_C(self):
@@ -120,7 +120,7 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_CMC_BV_02_C(self):
        """
@@ -133,7 +133,7 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_01_C(self):
        """
@@ -147,14 +147,14 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_02_C(self):
        """
@@ -167,8 +167,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_03_C(self):
        """
@@ -180,8 +180,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_05_C(self):
        """
@@ -197,12 +197,12 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_06_C(self):
        """
@@ -218,12 +218,12 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_08_C(self):
        """
@@ -236,10 +236,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_09_C(self):
        """
@@ -253,8 +253,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_10_C(self):
        """
@@ -267,10 +267,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_13_C(self):
        """
@@ -283,12 +283,12 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_16_C(self):
        """
@@ -302,8 +302,8 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream, timeout=60)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream, timeout=60)

    def test_L2CAP_ERM_BV_18_C(self):
        """
@@ -317,10 +317,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_19_C(self):
        """
@@ -334,10 +334,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BV_20_C(self):
        """
@@ -351,10 +351,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_01_C(self):
        """
@@ -367,10 +367,10 @@ class PTSL2capTest(PTSBaseTestClass):
            psm = 1
            self.device_under_test.l2cap.OpenChannel(
                l2cap_facade_pb2.OpenChannelRequest(remote=self.pts_address, psm=psm))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)

            self.device_under_test.l2cap.CloseChannel(l2cap_facade_pb2.CloseChannelRequest(psm=psm))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_03_C(self):
        """
@@ -383,11 +383,11 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)

            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc' * 34))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_04_C(self):
        """
@@ -400,10 +400,10 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            time.sleep(2)
            self.device_under_test.l2cap.CloseChannel(l2cap_facade_pb2.CloseChannelRequest(psm=psm))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_05_C(self):
        """
@@ -416,8 +416,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_07_C(self):
        """
@@ -430,8 +430,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_08_C(self):
        """
@@ -457,8 +457,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BV_11_C(self):
        """
@@ -471,8 +471,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CED_BI_01_C(self):
        """
@@ -485,7 +485,7 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            time.sleep(5)

    def test_L2CAP_COS_CFD_BV_03_C(self):
@@ -500,7 +500,7 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.BASIC
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_COS_CFD_BV_08_C(self):
        """
@@ -514,9 +514,9 @@ class PTSL2capTest(PTSBaseTestClass):

            self.device_under_test.l2cap.OpenChannel(
                l2cap_facade_pb2.OpenChannelRequest(remote=self.pts_address, psm=psm))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.CloseChannel(l2cap_facade_pb2.CloseChannelRequest(psm=psm))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BI_01_C(self):
        """
@@ -530,8 +530,8 @@ class PTSL2capTest(PTSBaseTestClass):
            retransmission_mode = l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(psm=psm, retransmission_mode=retransmission_mode))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_complete(dut_connection_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BI_03_C(self):
        """
@@ -544,12 +544,12 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BI_04_C(self):
        """
@@ -563,12 +563,12 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)

    def test_L2CAP_ERM_BI_05_C(self):
        """
@@ -582,9 +582,9 @@ class PTSL2capTest(PTSBaseTestClass):
            self.device_under_test.l2cap.SetDynamicChannel(
                l2cap_facade_pb2.SetEnableDynamicChannelRequest(
                    psm=psm, retransmission_mode=l2cap_facade_pb2.RetransmissionFlowControlMode.ERTM))
            self._assert_connection_complete(due_connection_stream)
            self._assert_connection_complete(dut_connection_stream)
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self.device_under_test.l2cap.SendDynamicChannelPacket(
                l2cap_facade_pb2.DynamicChannelPacket(psm=psm, payload=b'abc'))
            self._assert_connection_close(due_connection_close_stream)
            self._assert_connection_close(dut_connection_close_stream)