tests inter-transaction delays

tests/test_bulk_loopback.py

@@ -20,7 +20,12 @@ def test_session(ep, address, bus_speed):
     ep_loopback = ep
     ep_loopback_kill = ep + 1
 
-    interEventDelay = 500
+    # Rx -> Tx, recieving handshake after OUT -> sending IN tok
+    ied_in = 21
+    # Last IN doesn't work with 21 for some reason
+    ied_in1 = 25
+    # Tx -> Tx, sending IN handshake -> sending next OUT tok
+    ied_out = 15
 
     start_length = 10
     end_length = 20
@@ -39,7 +44,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
-                interEventDelay=interEventDelay,
+                interEventDelay=ied_out,
             )
         )
         session.add_event(
@@ -50,7 +55,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="IN",
                 dataLength=pktLength,
-                interEventDelay=interEventDelay,
+                interEventDelay=ied_in,
             )
         )
 
@@ -65,7 +70,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=pktLength,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
     session.add_event(
@@ -76,7 +81,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="IN",
             dataLength=pktLength,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_in1,
         )
     )
 

tests/test_bulk_notready.py

@@ -3,6 +3,7 @@
 from usb_session import UsbSession
 from usb_transaction import UsbTransaction
 from usb_packet import TokenPacket, TxDataPacket, RxHandshakePacket, USB_PID
+from usb_phy import USB_PKT_TIMINGS
 import pytest
 from conftest import PARAMS, test_RunUsbSession
 
@@ -11,7 +12,6 @@
 def test_session(ep, address, bus_speed):
 
     pktLength = 10
-    ied = 500
 
     session = UsbSession(
         bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -34,6 +34,7 @@ def test_session(ep, address, bus_speed):
             pid=USB_PID["IN"],
             address=address,
             endpoint=ep,
+            interEventDelay = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
         )
     )
     session.add_event(RxHandshakePacket(pid=USB_PID["NAK"]))
@@ -43,7 +44,7 @@ def test_session(ep, address, bus_speed):
             pid=USB_PID["OUT"],
             address=address,
             endpoint=ep,
-            interEventDelay=ied,
+            interEventDelay = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
         )
     )
 

tests/test_bulk_rx_basic.py

@@ -12,7 +12,9 @@ def test_session(ep, address, bus_speed):
 
     start_length = 10
     end_length = start_length + 10
-    interEventDelay = 50
+    # Rx -> Tx, recieving OUT handshake -> sending OUT tok
+    # ied_out = 19
+    ied_out = 100
 
     session = UsbSession(
         bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -27,7 +29,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
-                interEventDelay=interEventDelay,
+                interEventDelay=ied_out,
             )
         )
 

tests/test_bulk_rx_basic_badcrc32.py

@@ -10,8 +10,12 @@
 @pytest.fixture
 def test_session(ep, address, bus_speed):
 
-    # The large inter-event delays are to give the DUT time to do checking on
-    # the fly
+    # Rx -> Tx, recieving OUT handshake -> sending OUT tok
+    ied_out = 19
+    # one of the OUTs doesn't pass with 19
+    ied_out1 = 20
+    # Tx -> Tx, sent bad crc DATA, didn't get ACK -> sending OUT tok
+    ied_out_badcrc = 8
 
     session = UsbSession(
         bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -38,7 +42,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=11,
-            interEventDelay=6000,
+            interEventDelay=ied_out,
         )
     )
 
@@ -51,7 +55,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=12,
-            interEventDelay=6000,
+            interEventDelay=ied_out,
             badDataCrc=True,
         )
     )
@@ -66,7 +70,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=12,
-            interEventDelay=6000,
+            interEventDelay=ied_out_badcrc,
         )
     )
 
@@ -79,7 +83,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=13,
-            interEventDelay=6000,
+            interEventDelay=ied_out1,
         )
     )
 
@@ -91,7 +95,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=14,
-            interEventDelay=6000,
+            interEventDelay=ied_out,
         )
     )
 

tests/test_bulk_rx_basic_badpidseq.py

@@ -14,8 +14,8 @@ def test_session(ep, address, bus_speed):
         bus_speed=bus_speed, run_enumeration=False, device_address=address
     )
 
-    # The large inter-frame gap is to give the DUT time to print its output
-    interEventDelay = 500
+    # Rx -> Tx, recieving OUT handshake -> sending OUT tok
+    ied_out = 20
 
     # Valid OUT transaction
     session.add_event(
@@ -26,7 +26,6 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=10,
-            interEventDelay=interEventDelay,
         )
     )
 
@@ -40,7 +39,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=11,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
             resend=True,
         )
     )
@@ -54,7 +53,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=11,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
 
@@ -67,7 +66,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=12,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
 
@@ -79,7 +78,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=13,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
 

tests/test_bulk_rx_basic_invalidpid.py

@@ -19,8 +19,8 @@ def test_session(ep, address, bus_speed):
         bus_speed=bus_speed, run_enumeration=False, device_address=address
     )
 
-    # The large inter-frame gap is to give the DUT time to print its output
-    interEventDelay = 500
+    # Rx -> Tx, recieving OUT handshake -> sending OUT tok
+    ied_out = 19
 
     # Valid OUT transaction
     session.add_event(
@@ -31,7 +31,6 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=10,
-            interEventDelay=interEventDelay,
         )
     )
 
@@ -41,7 +40,7 @@ def test_session(ep, address, bus_speed):
             pid=USB_PID["OUT"],
             address=address,
             endpoint=ep,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
 
@@ -61,7 +60,6 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=11,
-            interEventDelay=interEventDelay,
         )
     )
     session.add_event(
@@ -72,7 +70,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=12,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
     session.add_event(
@@ -83,7 +81,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=13,
-            interEventDelay=interEventDelay,
+            interEventDelay=ied_out,
         )
     )
 

tests/test_bulk_rx_basic_rxerror.py

@@ -10,8 +10,13 @@
 @pytest.fixture
 def test_session(ep, address, bus_speed):
 
-    # Large inter-event delay is to give the DUT time to perform checking
-    ied = 6000
+    # Rx -> Tx, recieving OUT handshake -> sending OUT tok
+    ied = 19
+    # Tx -> Tx, asserting RxError -> sending OUT tok
+    # not clear from UTMI if it's the same as normal Tx -> Tx
+    ied_err = 11
+    # second one doesn't pass with 11
+    ied_err1 = 12 
 
     session = UsbSession(
         bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -53,7 +58,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=11,
-            interEventDelay=ied,
+            interEventDelay=ied_err,
         )
     )
 
@@ -92,7 +97,7 @@ def test_session(ep, address, bus_speed):
             endpointType="BULK",
             transType="OUT",
             dataLength=13,
-            interEventDelay=ied,
+            interEventDelay=ied_err1,
         )
     )
 

tests/test_bulk_rx_multiep.py

@@ -7,6 +7,8 @@
 from conftest import PARAMS, test_RunUsbSession  # noqa F401
 from usb_session import UsbSession
 from usb_transaction import UsbTransaction
+from usb_phy import USB_PKT_TIMINGS
+
 
 # EP numbers currently fixed for this test - set in params
 PARAMS = deepcopy(PARAMS)
@@ -17,6 +19,8 @@
 @pytest.fixture
 def test_session(ep, address, bus_speed):
 
+    ied = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
+
     session = UsbSession(
         bus_speed=bus_speed, run_enumeration=False, device_address=address
     )
@@ -31,6 +35,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
+                interEventDelay=ied,
             )
         )
         session.add_event(
@@ -41,6 +46,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
+                interEventDelay=ied,
             )
         )
         session.add_event(
@@ -51,6 +57,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
+                interEventDelay=ied,
             )
         )
         session.add_event(
@@ -61,6 +68,7 @@ def test_session(ep, address, bus_speed):
                 endpointType="BULK",
                 transType="OUT",
                 dataLength=pktLength,
+                interEventDelay=ied,
             )
         )
 

tests/test_bulk_rx_multiep_select.py

@@ -22,10 +22,11 @@ def test_session(ep, address, bus_speed):
         bus_speed=bus_speed, run_enumeration=False, device_address=address
     )
 
+    interEventDelay = 32
+
     testEpCount = 3
     pktLength_start = 10
     pktLength_end = 19
-    interEventDelay = 100
     maxEp = ep + testEpCount - 1
 
     pktLength = [pktLength_start] * testEpCount

tests/test_bulk_rx_traffic.py

@@ -5,13 +5,13 @@
 from conftest import PARAMS, test_RunUsbSession  # noqa F401
 from usb_session import UsbSession
 from usb_transaction import UsbTransaction
-from usb_phy import USB_MAX_EP_ADDRESS
+from usb_phy import USB_MAX_EP_ADDRESS, USB_PKT_TIMINGS
 
 
 @pytest.fixture
 def test_session(ep, address, bus_speed):
 
-    ied = 500
+    ied = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
 
     trafficAddress1 = (address + 1) % 128
     trafficAddress2 = (address + 127) % 128