Skip to content

Commit d7f163c

Browse files
affluxafflux
committed
tests: relax some more
1 parent 7788a55 commit d7f163c

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

‎tests/test_sd.py

+12-11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import ipaddress
44
import itertools
55
import logging
6+
import math
67
import os
78
import socket
89
import struct
@@ -1034,7 +1035,7 @@ async def asyncSetUp(self): # noqa: N802
10341035
INITIAL_DELAY_MAX=ticks(2),
10351036
REPETITIONS_BASE_DELAY=ticks(1),
10361037
REPETITIONS_MAX=3,
1037-
FIND_TTL=5,
1038+
FIND_TTL=math.ceil(ticks(25)),
10381039
)
10391040
mock_sd.log = logging.getLogger("someip.sd")
10401041
self._mock_send_sd = mock_sd.send_sd = unittest.mock.Mock()
@@ -1057,7 +1058,7 @@ async def test_send_find(self):
10571058
service_id=0x5566,
10581059
instance_id=0xFFFF,
10591060
major_version=0xFF,
1060-
ttl=5,
1061+
ttl=math.ceil(ticks(25)),
10611062
minver_or_counter=0xFFFFFFFF,
10621063
)
10631064

@@ -1081,7 +1082,7 @@ async def test_send_no_finds_after_early_offer(self):
10811082
service_id=0x5566,
10821083
instance_id=0x7788,
10831084
major_version=1,
1084-
ttl=1,
1085+
ttl=math.ceil(ticks(5)),
10851086
minver_or_counter=0xDEADBEEF,
10861087
options_1=(
10871088
hdr.IPv4EndpointOption(
@@ -1110,7 +1111,7 @@ async def test_send_no_finds_after_late_offer(self):
11101111
service_id=0x5566,
11111112
instance_id=0x7788,
11121113
major_version=1,
1113-
ttl=1,
1114+
ttl=math.ceil(ticks(5)),
11141115
minver_or_counter=0xDEADBEEF,
11151116
options_1=(
11161117
hdr.IPv4EndpointOption(
@@ -1130,7 +1131,7 @@ async def test_send_no_finds_after_late_offer(self):
11301131
service_id=0x5566,
11311132
instance_id=0xFFFF,
11321133
major_version=0xFF,
1133-
ttl=5,
1134+
ttl=math.ceil(ticks(25)),
11341135
minver_or_counter=0xFFFFFFFF,
11351136
)
11361137

@@ -1157,7 +1158,7 @@ async def test_send_multiple_services_one_offer_early(self):
11571158
service_id=0x4433,
11581159
instance_id=0x7788,
11591160
major_version=1,
1160-
ttl=int(ticks(10)),
1161+
ttl=math.ceil(ticks(10)),
11611162
minver_or_counter=0xDEADBEEF,
11621163
options_1=(
11631164
hdr.IPv4EndpointOption(
@@ -1177,7 +1178,7 @@ async def test_send_multiple_services_one_offer_early(self):
11771178
service_id=0x5566,
11781179
instance_id=0xFFFF,
11791180
major_version=0xFF,
1180-
ttl=5,
1181+
ttl=math.ceil(ticks(25)),
11811182
minver_or_counter=0xFFFFFFFF,
11821183
)
11831184

@@ -1211,7 +1212,7 @@ async def test_find_subscribe(self):
12111212
service_id=0x5566,
12121213
instance_id=0x7788,
12131214
major_version=1,
1214-
ttl=ticks(10),
1215+
ttl=math.ceil(ticks(10)),
12151216
minver_or_counter=0xDEADBEEF,
12161217
options_1=(
12171218
hdr.IPv4EndpointOption(
@@ -1233,7 +1234,7 @@ async def test_find_subscribe(self):
12331234
service_id=0x5566,
12341235
instance_id=0xFFFF,
12351236
major_version=0xFF,
1236-
ttl=5,
1237+
ttl=math.ceil(ticks(25)),
12371238
minver_or_counter=0xFFFFFFFF,
12381239
)
12391240
evgrp = cfg.Eventgroup(
@@ -2075,7 +2076,7 @@ async def test_sd_multiple_listener(self):
20752076

20762077

20772078
class TestSDSubscriptionTTL1(_BaseSDSubscriptionTest):
2078-
TTL = 1
2079+
TTL = math.floor(ticks(5))
20792080

20802081
test_sd_reject_subscription = _BaseSDSubscriptionTest._test_sd_reject_subscription
20812082
test_sd_disconnect = _BaseSDSubscriptionTest._test_sd_disconnect
@@ -2156,7 +2157,7 @@ async def test_sd(self):
21562157

21572158
self.reset_mock()
21582159

2159-
await asyncio.sleep(1.2)
2160+
await asyncio.sleep(ticks(5.1))
21602161

21612162
self.assertEqual(
21622163
self.mock.method_calls,

‎tests/test_service.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import asyncio
44
import logging
55
import ipaddress
6+
import math
67
import os
78
import typing
89
import unittest
@@ -21,7 +22,7 @@
2122
logging.getLogger("someip").setLevel(logging.WARNING)
2223

2324

24-
PRECISION = 0.4 if os.environ.get("CI") == "true" else 0.2 # in seconds
25+
PRECISION = 0.8 if os.environ.get("CI") == "true" else 0.2 # in seconds
2526

2627

2728
def ticks(n):
@@ -410,7 +411,7 @@ async def test_subscribe_eventgroup(self):
410411
major_version=self.prot.version_major,
411412
id=1,
412413
counter=0,
413-
ttl=ticks(3),
414+
ttl=math.ceil(ticks(3)),
414415
endpoints=frozenset({self.endpoint}),
415416
)
416417
self.prot.client_subscribed(sub, self.fake_addr)
@@ -478,7 +479,7 @@ async def test_subscribe_eventgroup_two_clients(self):
478479
major_version=self.prot.version_major,
479480
id=1,
480481
counter=0,
481-
ttl=ticks(3),
482+
ttl=math.ceil(ticks(3)),
482483
endpoints=frozenset({self.endpoint}),
483484
)
484485
self.prot.client_subscribed(sub1, self.fake_addr)
@@ -496,7 +497,7 @@ async def test_subscribe_eventgroup_two_clients(self):
496497
major_version=self.prot.version_major,
497498
id=1,
498499
counter=0,
499-
ttl=ticks(3),
500+
ttl=math.ceil(ticks(3)),
500501
endpoints=frozenset({endpoint2}),
501502
)
502503
self.prot.client_subscribed(sub2, fake_addr2)
@@ -572,7 +573,7 @@ def test_unsubscribe_unknown(self):
572573
major_version=self.prot.version_major,
573574
id=1,
574575
counter=0,
575-
ttl=ticks(3),
576+
ttl=math.ceil(ticks(3)),
576577
endpoints=frozenset({self.endpoint}),
577578
)
578579

@@ -589,7 +590,7 @@ def test_nak_subscription(self):
589590
major_version=self.prot.version_major,
590591
id=1,
591592
counter=0,
592-
ttl=ticks(3),
593+
ttl=math.ceil(ticks(3)),
593594
endpoints=frozenset({self.endpoint}),
594595
)
595596

@@ -612,7 +613,7 @@ def test_nak_malformed(self):
612613
major_version=self.prot.version_major,
613614
id=1,
614615
counter=0,
615-
ttl=ticks(3),
616+
ttl=math.ceil(ticks(3)),
616617
endpoints=frozenset({self.endpoint, endpoint2}),
617618
)
618619

@@ -639,7 +640,7 @@ async def test_eventgroup_manual(self):
639640
major_version=self.prot.version_major,
640641
id=evgrp.id,
641642
counter=0,
642-
ttl=ticks(3),
643+
ttl=math.ceil(ticks(3)),
643644
endpoints=frozenset({self.endpoint}),
644645
)
645646
self.prot.client_subscribed(sub, self.fake_addr)

0 commit comments

Comments
 (0)