Skip to content

Commit 2d94725

Browse files
yellowhatteryellowhatter
authored
Test ports (#1715)
* - remove port collision in tests - fix ephmeral port usage * change authenticator_quic test port
1 parent 7bc230c commit 2d94725

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎io/zenoh-transport/tests/unicast_authenticator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ R+IdLiXcyIkg0m9N8I17p0ljCSkbrgGMD3bbePRTfg==
890890
-----END CERTIFICATE-----";
891891

892892
// Define the locator
893-
let mut endpoint: EndPoint = format!("quic/localhost:{}", 8040).parse().unwrap();
893+
let mut endpoint: EndPoint = format!("quic/localhost:{}", 8041).parse().unwrap();
894894
endpoint
895895
.config_mut()
896896
.extend_from_iter(

‎zenoh-ext/tests/advanced.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ async fn test_advanced_retransmission_heartbeat() {
724724
const SLEEP: Duration = Duration::from_secs(1);
725725
const RECONNECT_SLEEP: Duration = Duration::from_secs(5);
726726
const HEARTBEAT_PERIOD: Duration = Duration::from_secs(4);
727-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47456";
727+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27457";
728728

729729
const ADVANCED_RETRANSMISSION_KEYEXPR: &str = "test/advanced/retransmission/heartbeat";
730730

‎zenoh-ext/tests/liveliness.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async fn test_liveliness_querying_subscriber_brokered() {
107107

108108
const TIMEOUT: Duration = Duration::from_secs(60);
109109
const SLEEP: Duration = Duration::from_secs(1);
110-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47448";
110+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27449";
111111

112112
const LIVELINESS_KEYEXPR_1: &str = "test/liveliness/querying-subscriber/brokered/1";
113113
const LIVELINESS_KEYEXPR_2: &str = "test/liveliness/querying-subscriber/brokered/2";

‎zenoh/tests/liveliness.rs

+36-36
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async fn test_liveliness_subscriber_clique() {
2323
use zenoh_config::EndPoint;
2424
const TIMEOUT: Duration = Duration::from_secs(60);
2525
const SLEEP: Duration = Duration::from_secs(1);
26-
const PEER1_ENDPOINT: &str = "tcp/localhost:47447";
26+
const PEER1_ENDPOINT: &str = "tcp/localhost:27347";
2727
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/clique";
2828

2929
zenoh_util::init_log_from_env_or("error");
@@ -86,7 +86,7 @@ async fn test_liveliness_query_clique() {
8686
use zenoh_link::EndPoint;
8787
const TIMEOUT: Duration = Duration::from_secs(60);
8888
const SLEEP: Duration = Duration::from_secs(1);
89-
const PEER1_ENDPOINT: &str = "tcp/localhost:47448";
89+
const PEER1_ENDPOINT: &str = "tcp/localhost:27348";
9090
const LIVELINESS_KEYEXPR: &str = "test/liveliness/query/clique";
9191

9292
zenoh_util::init_log_from_env_or("error");
@@ -143,7 +143,7 @@ async fn test_liveliness_subscriber_brokered() {
143143

144144
const TIMEOUT: Duration = Duration::from_secs(60);
145145
const SLEEP: Duration = Duration::from_secs(1);
146-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47449";
146+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27350";
147147
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/brokered";
148148

149149
zenoh_util::init_log_from_env_or("error");
@@ -220,7 +220,7 @@ async fn test_liveliness_query_brokered() {
220220
use zenoh_link::EndPoint;
221221
const TIMEOUT: Duration = Duration::from_secs(60);
222222
const SLEEP: Duration = Duration::from_secs(1);
223-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47450";
223+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27451";
224224
const LIVELINESS_KEYEXPR: &str = "test/liveliness/query/brokered";
225225

226226
zenoh_util::init_log_from_env_or("error");
@@ -365,7 +365,7 @@ async fn test_liveliness_after_close() {
365365
use zenoh_config::EndPoint;
366366
const TIMEOUT: Duration = Duration::from_secs(60);
367367
const SLEEP: Duration = Duration::from_secs(1);
368-
const PEER1_ENDPOINT: &str = "tcp/localhost:47451";
368+
const PEER1_ENDPOINT: &str = "tcp/localhost:27452";
369369
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/clique";
370370

371371
zenoh_util::init_log_from_env_or("error");
@@ -425,7 +425,7 @@ async fn test_liveliness_subscriber_double_client_before() {
425425

426426
const TIMEOUT: Duration = Duration::from_secs(60);
427427
const SLEEP: Duration = Duration::from_secs(1);
428-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47452";
428+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27453";
429429
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/before";
430430

431431
zenoh_util::init_log_from_env_or("error");
@@ -519,7 +519,7 @@ async fn test_liveliness_subscriber_double_client_middle() {
519519

520520
const TIMEOUT: Duration = Duration::from_secs(60);
521521
const SLEEP: Duration = Duration::from_secs(1);
522-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47453";
522+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27454";
523523
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/middle";
524524

525525
zenoh_util::init_log_from_env_or("error");
@@ -616,7 +616,7 @@ async fn test_liveliness_subscriber_double_client_after() {
616616

617617
const TIMEOUT: Duration = Duration::from_secs(60);
618618
const SLEEP: Duration = Duration::from_secs(1);
619-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47454";
619+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27354";
620620
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/after";
621621

622622
zenoh_util::init_log_from_env_or("error");
@@ -715,7 +715,7 @@ async fn test_liveliness_subscriber_double_client_history_before() {
715715

716716
const TIMEOUT: Duration = Duration::from_secs(60);
717717
const SLEEP: Duration = Duration::from_secs(1);
718-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47455";
718+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27455";
719719
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/history/before";
720720

721721
zenoh_util::init_log_from_env_or("error");
@@ -817,7 +817,7 @@ async fn test_liveliness_subscriber_double_client_history_middle() {
817817

818818
const TIMEOUT: Duration = Duration::from_secs(60);
819819
const SLEEP: Duration = Duration::from_secs(1);
820-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47456";
820+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27456";
821821
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/history/middle";
822822

823823
zenoh_util::init_log_from_env_or("error");
@@ -919,7 +919,7 @@ async fn test_liveliness_subscriber_double_client_history_after() {
919919

920920
const TIMEOUT: Duration = Duration::from_secs(60);
921921
const SLEEP: Duration = Duration::from_secs(1);
922-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47457";
922+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27357";
923923
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/client/history/after";
924924

925925
zenoh_util::init_log_from_env_or("error");
@@ -1023,7 +1023,7 @@ async fn test_liveliness_subscriber_double_peer_before() {
10231023

10241024
const TIMEOUT: Duration = Duration::from_secs(60);
10251025
const SLEEP: Duration = Duration::from_secs(1);
1026-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47458";
1026+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27458";
10271027
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/before";
10281028

10291029
zenoh_util::init_log_from_env_or("error");
@@ -1111,7 +1111,7 @@ async fn test_liveliness_subscriber_double_peer_middle() {
11111111

11121112
const TIMEOUT: Duration = Duration::from_secs(60);
11131113
const SLEEP: Duration = Duration::from_secs(1);
1114-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47459";
1114+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27459";
11151115
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/middle";
11161116

11171117
zenoh_util::init_log_from_env_or("error");
@@ -1202,7 +1202,7 @@ async fn test_liveliness_subscriber_double_peer_after() {
12021202

12031203
const TIMEOUT: Duration = Duration::from_secs(60);
12041204
const SLEEP: Duration = Duration::from_secs(1);
1205-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47460";
1205+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27460";
12061206
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/after";
12071207

12081208
zenoh_util::init_log_from_env_or("error");
@@ -1295,7 +1295,7 @@ async fn test_liveliness_subscriber_double_peer_history_before() {
12951295

12961296
const TIMEOUT: Duration = Duration::from_secs(60);
12971297
const SLEEP: Duration = Duration::from_secs(1);
1298-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47461";
1298+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27461";
12991299
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/history/before";
13001300

13011301
zenoh_util::init_log_from_env_or("error");
@@ -1397,7 +1397,7 @@ async fn test_liveliness_subscriber_double_peer_history_middle() {
13971397

13981398
const TIMEOUT: Duration = Duration::from_secs(60);
13991399
const SLEEP: Duration = Duration::from_secs(1);
1400-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47462";
1400+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27462";
14011401
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/history/middle";
14021402

14031403
zenoh_util::init_log_from_env_or("error");
@@ -1499,7 +1499,7 @@ async fn test_liveliness_subscriber_double_peer_history_after() {
14991499

15001500
const TIMEOUT: Duration = Duration::from_secs(60);
15011501
const SLEEP: Duration = Duration::from_secs(1);
1502-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47463";
1502+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27463";
15031503
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/peer/history/after";
15041504

15051505
zenoh_util::init_log_from_env_or("error");
@@ -1702,8 +1702,8 @@ async fn test_liveliness_subscriber_double_router_middle() {
17021702

17031703
const TIMEOUT: Duration = Duration::from_secs(60);
17041704
const SLEEP: Duration = Duration::from_secs(1);
1705-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47466";
1706-
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:47467";
1705+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27466";
1706+
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:27467";
17071707
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/router/middle";
17081708

17091709
zenoh_util::init_log_from_env_or("error");
@@ -1804,8 +1804,8 @@ async fn test_liveliness_subscriber_double_router_after() {
18041804

18051805
const TIMEOUT: Duration = Duration::from_secs(60);
18061806
const SLEEP: Duration = Duration::from_secs(1);
1807-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47468";
1808-
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:47469";
1807+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27468";
1808+
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:27469";
18091809
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/router/after";
18101810

18111811
zenoh_util::init_log_from_env_or("error");
@@ -1908,8 +1908,8 @@ async fn test_liveliness_subscriber_double_router_history_before() {
19081908

19091909
const TIMEOUT: Duration = Duration::from_secs(60);
19101910
const SLEEP: Duration = Duration::from_secs(1);
1911-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47470";
1912-
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:47471";
1911+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27470";
1912+
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:27471";
19131913
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/router/history/before";
19141914

19151915
zenoh_util::init_log_from_env_or("error");
@@ -2015,8 +2015,8 @@ async fn test_liveliness_subscriber_double_router_history_middle() {
20152015

20162016
const TIMEOUT: Duration = Duration::from_secs(60);
20172017
const SLEEP: Duration = Duration::from_secs(1);
2018-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47472";
2019-
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:47473";
2018+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27472";
2019+
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:27473";
20202020
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/router/history/middle";
20212021

20222022
zenoh_util::init_log_from_env_or("error");
@@ -2122,8 +2122,8 @@ async fn test_liveliness_subscriber_double_router_history_after() {
21222122

21232123
const TIMEOUT: Duration = Duration::from_secs(60);
21242124
const SLEEP: Duration = Duration::from_secs(1);
2125-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47474";
2126-
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:47475";
2125+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27474";
2126+
const ROUTER_SUB_ENDPOINT: &str = "tcp/localhost:27475";
21272127
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/router/history/after";
21282128

21292129
zenoh_util::init_log_from_env_or("error");
@@ -2231,8 +2231,8 @@ async fn test_liveliness_subscriber_double_clientviapeer_before() {
22312231

22322232
const TIMEOUT: Duration = Duration::from_secs(60);
22332233
const SLEEP: Duration = Duration::from_secs(1);
2234-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47476";
2235-
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:47477";
2234+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27476";
2235+
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:27477";
22362236
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/clientviapeer/before";
22372237

22382238
zenoh_util::init_log_from_env_or("error");
@@ -2344,8 +2344,8 @@ async fn test_liveliness_subscriber_double_clientviapeer_middle() {
23442344

23452345
const TIMEOUT: Duration = Duration::from_secs(60);
23462346
const SLEEP: Duration = Duration::from_secs(1);
2347-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47478";
2348-
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:47479";
2347+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27478";
2348+
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:27479";
23492349
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/clientviapeer/middle";
23502350

23512351
zenoh_util::init_log_from_env_or("error");
@@ -2460,8 +2460,8 @@ async fn test_liveliness_subscriber_double_clientviapeer_after() {
24602460

24612461
const TIMEOUT: Duration = Duration::from_secs(60);
24622462
const SLEEP: Duration = Duration::from_secs(1);
2463-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47480";
2464-
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:47481";
2463+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27480";
2464+
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:27481";
24652465
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subscriber/double/clientviapeer/after";
24662466

24672467
zenoh_util::init_log_from_env_or("error");
@@ -2578,8 +2578,8 @@ async fn test_liveliness_subscriber_double_clientviapeer_history_before() {
25782578

25792579
const TIMEOUT: Duration = Duration::from_secs(60);
25802580
const SLEEP: Duration = Duration::from_secs(1);
2581-
const ROUTER_ENDPOINT: &str = "tcp/localhost:47482";
2582-
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:47483";
2581+
const ROUTER_ENDPOINT: &str = "tcp/localhost:27482";
2582+
const PEER_DUMMY_ENDPOINT: &str = "tcp/localhost:27483";
25832583
const LIVELINESS_KEYEXPR: &str =
25842584
"test/liveliness/subscriber/double/clientviapeer/history/before";
25852585

@@ -3719,7 +3719,7 @@ async fn test_liveliness_subget_router_before() {
37193719
const TIMEOUT: Duration = Duration::from_secs(60);
37203720
const SLEEP: Duration = Duration::from_secs(1);
37213721
const ROUTER_ENDPOINT: &str = "tcp/localhost:30496";
3722-
const ROUTER_SUBGET_ENDPOINT: &str = "tcp/localhost:47497";
3722+
const ROUTER_SUBGET_ENDPOINT: &str = "tcp/localhost:27497";
37233723
const LIVELINESS_KEYEXPR: &str = "test/liveliness/subget/router/before";
37243724

37253725
zenoh_util::init_log_from_env_or("error");

0 commit comments

Comments
 (0)