From f91e885e5c13f49886fb71d27a56c818f23abd20 Mon Sep 17 00:00:00 2001 From: Oussama Teffahi Date: Wed, 29 May 2024 16:25:20 +0200 Subject: [PATCH] Change port numbers to allow tests to run concurrently --- zenoh/tests/acl.rs | 6 +++--- zenoh/tests/authentication.rs | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/zenoh/tests/acl.rs b/zenoh/tests/acl.rs index 1889a9f9fa..56e51a070c 100644 --- a/zenoh/tests/acl.rs +++ b/zenoh/tests/acl.rs @@ -42,7 +42,7 @@ mod test { async fn get_basic_router_config() -> Config { let mut config = config::default(); config.set_mode(Some(WhatAmI::Router)).unwrap(); - config.listen.endpoints = vec!["tcp/127.0.0.1:7447".parse().unwrap()]; + config.listen.endpoints = vec!["tcp/127.0.0.1:27447".parse().unwrap()]; config.scouting.multicast.set_enabled(Some(false)).unwrap(); config } @@ -54,9 +54,9 @@ mod test { async fn get_client_sessions() -> (Session, Session) { println!("Opening client sessions"); - let config = config::client(["tcp/127.0.0.1:7447".parse::().unwrap()]); + let config = config::client(["tcp/127.0.0.1:27447".parse::().unwrap()]); let s01 = ztimeout!(zenoh::open(config)).unwrap(); - let config = config::client(["tcp/127.0.0.1:7447".parse::().unwrap()]); + let config = config::client(["tcp/127.0.0.1:27447".parse::().unwrap()]); let s02 = ztimeout!(zenoh::open(config)).unwrap(); (s01, s02) } diff --git a/zenoh/tests/authentication.rs b/zenoh/tests/authentication.rs index e6995ecaa0..bec7aac262 100644 --- a/zenoh/tests/authentication.rs +++ b/zenoh/tests/authentication.rs @@ -240,7 +240,7 @@ client2name:client2passwd"; async fn get_basic_router_config_tls() -> Config { let mut config = config::default(); config.set_mode(Some(WhatAmI::Router)).unwrap(); - config.listen.endpoints = vec!["tls/127.0.0.1:7447".parse().unwrap()]; + config.listen.endpoints = vec!["tls/127.0.0.1:37447".parse().unwrap()]; config.scouting.multicast.set_enabled(Some(false)).unwrap(); config .insert_json5( @@ -266,7 +266,7 @@ client2name:client2passwd"; async fn get_basic_router_config_quic() -> Config { let mut config = config::default(); config.set_mode(Some(WhatAmI::Router)).unwrap(); - config.listen.endpoints = vec!["quic/127.0.0.1:7447".parse().unwrap()]; + config.listen.endpoints = vec!["quic/127.0.0.1:37447".parse().unwrap()]; config.scouting.multicast.set_enabled(Some(false)).unwrap(); config .insert_json5( @@ -293,7 +293,7 @@ client2name:client2passwd"; async fn get_basic_router_config_usrpswd() -> Config { let mut config = config::default(); config.set_mode(Some(WhatAmI::Router)).unwrap(); - config.listen.endpoints = vec!["tcp/127.0.0.1:7447".parse().unwrap()]; + config.listen.endpoints = vec!["tcp/127.0.0.1:37447".parse().unwrap()]; config.scouting.multicast.set_enabled(Some(false)).unwrap(); config .insert_json5( @@ -318,7 +318,7 @@ client2name:client2passwd"; async fn get_client_sessions_tls() -> (Session, Session) { println!("Opening client sessions"); - let mut config = config::client(["tls/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["tls/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport", @@ -339,7 +339,7 @@ client2name:client2passwd"; ) .unwrap(); let s01 = ztimeout!(zenoh::open(config)).unwrap(); - let mut config = config::client(["tls/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["tls/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport", @@ -365,7 +365,7 @@ client2name:client2passwd"; async fn get_client_sessions_quic() -> (Session, Session) { println!("Opening client sessions"); - let mut config = config::client(["quic/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["quic/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport", @@ -386,7 +386,7 @@ client2name:client2passwd"; ) .unwrap(); let s01 = ztimeout!(zenoh::open(config)).unwrap(); - let mut config = config::client(["quic/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["quic/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport", @@ -412,7 +412,7 @@ client2name:client2passwd"; async fn get_client_sessions_usrpswd() -> (Session, Session) { println!("Opening client sessions"); - let mut config = config::client(["tcp/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["tcp/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport", @@ -427,7 +427,7 @@ client2name:client2passwd"; ) .unwrap(); let s01 = ztimeout!(zenoh::open(config)).unwrap(); - let mut config = config::client(["tcp/127.0.0.1:7447".parse::().unwrap()]); + let mut config = config::client(["tcp/127.0.0.1:37447".parse::().unwrap()]); config .insert_json5( "transport",