Skip to content

Commit 20f9f52

Browse files
uvvpaveluvvpavel
committed
updated tests inter-transaction delays
1 parent 65dc55a commit 20f9f52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+218
-183
lines changed

‎tests/conftest.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
},
3535
"default": {
3636
"arch": ["xs3"],
37-
"ep": [1, 2],
38-
"address": [0, 1],
39-
"bus_speed": ["HS", "FS"],
40-
"dummy_threads": [0, 5], # Note, plus 2 for test cores
37+
"ep": [1],
38+
"address": [0],
39+
"bus_speed": ["HS"],
40+
"dummy_threads": [5], # Note, plus 2 for test cores
4141
"core_freq": [600],
4242
},
4343
"smoke": {

‎tests/test_bulk_loopback.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ def test_session(ep, address, bus_speed):
2020
ep_loopback = ep
2121
ep_loopback_kill = ep + 1
2222

23-
interEventDelay = 500
23+
# Rx -> Tx, recieving handshake after OUT -> sending IN tok
24+
ied_in = 21
25+
# Last IN doesn't work with 21 for some reason
26+
ied_in1 = 25
27+
# Tx -> Tx, sending IN handshake -> sending next OUT tok
28+
ied_out = 15
2429

2530
start_length = 10
2631
end_length = 20
@@ -39,7 +44,7 @@ def test_session(ep, address, bus_speed):
3944
endpointType="BULK",
4045
transType="OUT",
4146
dataLength=pktLength,
42-
interEventDelay=interEventDelay,
47+
interEventDelay=ied_out,
4348
)
4449
)
4550
session.add_event(
@@ -50,7 +55,7 @@ def test_session(ep, address, bus_speed):
5055
endpointType="BULK",
5156
transType="IN",
5257
dataLength=pktLength,
53-
interEventDelay=interEventDelay,
58+
interEventDelay=ied_in,
5459
)
5560
)
5661

@@ -65,7 +70,7 @@ def test_session(ep, address, bus_speed):
6570
endpointType="BULK",
6671
transType="OUT",
6772
dataLength=pktLength,
68-
interEventDelay=interEventDelay,
73+
interEventDelay=ied_out,
6974
)
7075
)
7176
session.add_event(
@@ -76,7 +81,7 @@ def test_session(ep, address, bus_speed):
7681
endpointType="BULK",
7782
transType="IN",
7883
dataLength=pktLength,
79-
interEventDelay=interEventDelay,
84+
interEventDelay=ied_in1,
8085
)
8186
)
8287

‎tests/test_bulk_notready.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from usb_session import UsbSession
44
from usb_transaction import UsbTransaction
55
from usb_packet import TokenPacket, TxDataPacket, RxHandshakePacket, USB_PID
6+
from usb_phy import USB_PKT_TIMINGS
67
import pytest
78
from conftest import PARAMS, test_RunUsbSession
89

@@ -11,7 +12,6 @@
1112
def test_session(ep, address, bus_speed):
1213

1314
pktLength = 10
14-
ied = 500
1515

1616
session = UsbSession(
1717
bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -34,6 +34,7 @@ def test_session(ep, address, bus_speed):
3434
pid=USB_PID["IN"],
3535
address=address,
3636
endpoint=ep,
37+
interEventDelay = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
3738
)
3839
)
3940
session.add_event(RxHandshakePacket(pid=USB_PID["NAK"]))
@@ -43,7 +44,7 @@ def test_session(ep, address, bus_speed):
4344
pid=USB_PID["OUT"],
4445
address=address,
4546
endpoint=ep,
46-
interEventDelay=ied,
47+
interEventDelay = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
4748
)
4849
)
4950

‎tests/test_bulk_rx_basic.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ def test_session(ep, address, bus_speed):
1212

1313
start_length = 10
1414
end_length = start_length + 10
15-
interEventDelay = 50
15+
# Rx -> Tx, recieving OUT handshake -> sending OUT tok
16+
# ied_out = 19
17+
ied_out = 100
1618

1719
session = UsbSession(
1820
bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -27,7 +29,7 @@ def test_session(ep, address, bus_speed):
2729
endpointType="BULK",
2830
transType="OUT",
2931
dataLength=pktLength,
30-
interEventDelay=interEventDelay,
32+
interEventDelay=ied_out,
3133
)
3234
)
3335

‎tests/test_bulk_rx_basic_badcrc32.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@
1010
@pytest.fixture
1111
def test_session(ep, address, bus_speed):
1212

13-
# The large inter-event delays are to give the DUT time to do checking on
14-
# the fly
13+
# Rx -> Tx, recieving OUT handshake -> sending OUT tok
14+
ied_out = 19
15+
# one of the OUTs doesn't pass with 19
16+
ied_out1 = 20
17+
# Tx -> Tx, sent bad crc DATA, didn't get ACK -> sending OUT tok
18+
ied_out_badcrc = 8
1519

1620
session = UsbSession(
1721
bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -38,7 +42,7 @@ def test_session(ep, address, bus_speed):
3842
endpointType="BULK",
3943
transType="OUT",
4044
dataLength=11,
41-
interEventDelay=6000,
45+
interEventDelay=ied_out,
4246
)
4347
)
4448

@@ -51,7 +55,7 @@ def test_session(ep, address, bus_speed):
5155
endpointType="BULK",
5256
transType="OUT",
5357
dataLength=12,
54-
interEventDelay=6000,
58+
interEventDelay=ied_out,
5559
badDataCrc=True,
5660
)
5761
)
@@ -66,7 +70,7 @@ def test_session(ep, address, bus_speed):
6670
endpointType="BULK",
6771
transType="OUT",
6872
dataLength=12,
69-
interEventDelay=6000,
73+
interEventDelay=ied_out_badcrc,
7074
)
7175
)
7276

@@ -79,7 +83,7 @@ def test_session(ep, address, bus_speed):
7983
endpointType="BULK",
8084
transType="OUT",
8185
dataLength=13,
82-
interEventDelay=6000,
86+
interEventDelay=ied_out1,
8387
)
8488
)
8589

@@ -91,7 +95,7 @@ def test_session(ep, address, bus_speed):
9195
endpointType="BULK",
9296
transType="OUT",
9397
dataLength=14,
94-
interEventDelay=6000,
98+
interEventDelay=ied_out,
9599
)
96100
)
97101

‎tests/test_bulk_rx_basic_badpidseq.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def test_session(ep, address, bus_speed):
1414
bus_speed=bus_speed, run_enumeration=False, device_address=address
1515
)
1616

17-
# The large inter-frame gap is to give the DUT time to print its output
18-
interEventDelay = 500
17+
# Rx -> Tx, recieving OUT handshake -> sending OUT tok
18+
ied_out = 20
1919

2020
# Valid OUT transaction
2121
session.add_event(
@@ -26,7 +26,6 @@ def test_session(ep, address, bus_speed):
2626
endpointType="BULK",
2727
transType="OUT",
2828
dataLength=10,
29-
interEventDelay=interEventDelay,
3029
)
3130
)
3231

@@ -40,7 +39,7 @@ def test_session(ep, address, bus_speed):
4039
endpointType="BULK",
4140
transType="OUT",
4241
dataLength=11,
43-
interEventDelay=interEventDelay,
42+
interEventDelay=ied_out,
4443
resend=True,
4544
)
4645
)
@@ -54,7 +53,7 @@ def test_session(ep, address, bus_speed):
5453
endpointType="BULK",
5554
transType="OUT",
5655
dataLength=11,
57-
interEventDelay=interEventDelay,
56+
interEventDelay=ied_out,
5857
)
5958
)
6059

@@ -67,7 +66,7 @@ def test_session(ep, address, bus_speed):
6766
endpointType="BULK",
6867
transType="OUT",
6968
dataLength=12,
70-
interEventDelay=interEventDelay,
69+
interEventDelay=ied_out,
7170
)
7271
)
7372

@@ -79,7 +78,7 @@ def test_session(ep, address, bus_speed):
7978
endpointType="BULK",
8079
transType="OUT",
8180
dataLength=13,
82-
interEventDelay=interEventDelay,
81+
interEventDelay=ied_out,
8382
)
8483
)
8584

‎tests/test_bulk_rx_basic_invalidpid.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def test_session(ep, address, bus_speed):
1919
bus_speed=bus_speed, run_enumeration=False, device_address=address
2020
)
2121

22-
# The large inter-frame gap is to give the DUT time to print its output
23-
interEventDelay = 500
22+
# Rx -> Tx, recieving OUT handshake -> sending OUT tok
23+
ied_out = 19
2424

2525
# Valid OUT transaction
2626
session.add_event(
@@ -31,7 +31,6 @@ def test_session(ep, address, bus_speed):
3131
endpointType="BULK",
3232
transType="OUT",
3333
dataLength=10,
34-
interEventDelay=interEventDelay,
3534
)
3635
)
3736

@@ -41,7 +40,7 @@ def test_session(ep, address, bus_speed):
4140
pid=USB_PID["OUT"],
4241
address=address,
4342
endpoint=ep,
44-
interEventDelay=interEventDelay,
43+
interEventDelay=ied_out,
4544
)
4645
)
4746

@@ -61,7 +60,6 @@ def test_session(ep, address, bus_speed):
6160
endpointType="BULK",
6261
transType="OUT",
6362
dataLength=11,
64-
interEventDelay=interEventDelay,
6563
)
6664
)
6765
session.add_event(
@@ -72,7 +70,7 @@ def test_session(ep, address, bus_speed):
7270
endpointType="BULK",
7371
transType="OUT",
7472
dataLength=12,
75-
interEventDelay=interEventDelay,
73+
interEventDelay=ied_out,
7674
)
7775
)
7876
session.add_event(
@@ -83,7 +81,7 @@ def test_session(ep, address, bus_speed):
8381
endpointType="BULK",
8482
transType="OUT",
8583
dataLength=13,
86-
interEventDelay=interEventDelay,
84+
interEventDelay=ied_out,
8785
)
8886
)
8987

‎tests/test_bulk_rx_basic_rxerror.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
@pytest.fixture
1111
def test_session(ep, address, bus_speed):
1212

13-
# Large inter-event delay is to give the DUT time to perform checking
14-
ied = 6000
13+
# Rx -> Tx, recieving OUT handshake -> sending OUT tok
14+
ied = 19
15+
# Tx -> Tx, asserting RxError -> sending OUT tok
16+
# not clear from UTMI if it's the same as normal Tx -> Tx
17+
ied_err = 11
18+
# second one doesn't pass with 11
19+
ied_err1 = 12
1520

1621
session = UsbSession(
1722
bus_speed=bus_speed, run_enumeration=False, device_address=address
@@ -53,7 +58,7 @@ def test_session(ep, address, bus_speed):
5358
endpointType="BULK",
5459
transType="OUT",
5560
dataLength=11,
56-
interEventDelay=ied,
61+
interEventDelay=ied_err,
5762
)
5863
)
5964

@@ -92,7 +97,7 @@ def test_session(ep, address, bus_speed):
9297
endpointType="BULK",
9398
transType="OUT",
9499
dataLength=13,
95-
interEventDelay=ied,
100+
interEventDelay=ied_err1,
96101
)
97102
)
98103

‎tests/test_bulk_rx_multiep.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
from conftest import PARAMS, test_RunUsbSession # noqa F401
88
from usb_session import UsbSession
99
from usb_transaction import UsbTransaction
10+
from usb_phy import USB_PKT_TIMINGS
11+
1012

1113
# EP numbers currently fixed for this test - set in params
1214
PARAMS = deepcopy(PARAMS)
@@ -17,6 +19,8 @@
1719
@pytest.fixture
1820
def test_session(ep, address, bus_speed):
1921

22+
ied = USB_PKT_TIMINGS["RX_TO_TX_PACKET_DELAY"]
23+
2024
session = UsbSession(
2125
bus_speed=bus_speed, run_enumeration=False, device_address=address
2226
)
@@ -31,6 +35,7 @@ def test_session(ep, address, bus_speed):
3135
endpointType="BULK",
3236
transType="OUT",
3337
dataLength=pktLength,
38+
interEventDelay=ied,
3439
)
3540
)
3641
session.add_event(
@@ -41,6 +46,7 @@ def test_session(ep, address, bus_speed):
4146
endpointType="BULK",
4247
transType="OUT",
4348
dataLength=pktLength,
49+
interEventDelay=ied,
4450
)
4551
)
4652
session.add_event(
@@ -51,6 +57,7 @@ def test_session(ep, address, bus_speed):
5157
endpointType="BULK",
5258
transType="OUT",
5359
dataLength=pktLength,
60+
interEventDelay=ied,
5461
)
5562
)
5663
session.add_event(
@@ -61,6 +68,7 @@ def test_session(ep, address, bus_speed):
6168
endpointType="BULK",
6269
transType="OUT",
6370
dataLength=pktLength,
71+
interEventDelay=ied,
6472
)
6573
)
6674

‎tests/test_bulk_rx_multiep_select.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ def test_session(ep, address, bus_speed):
2222
bus_speed=bus_speed, run_enumeration=False, device_address=address
2323
)
2424

25+
interEventDelay = 32
26+
2527
testEpCount = 3
2628
pktLength_start = 10
2729
pktLength_end = 19
28-
interEventDelay = 100
2930
maxEp = ep + testEpCount - 1
3031

3132
pktLength = [pktLength_start] * testEpCount

0 commit comments

Comments
 (0)