Merge commit 'e03b0c0ec4716c0500b4fcdaceb89570381011b0'

Author: yellowhatter

.github/workflows/release.yml

@@ -55,7 +55,7 @@ jobs:
           live-run: ${{ inputs.live-run || false }}
           version: ${{ steps.create-release-branch.outputs.version }}
           branch: ${{ steps.create-release-branch.outputs.branch }}
-          bump-deps-pattern: zenoh.*
+          bump-deps-pattern: "zenoh(?!-test).*"
           bump-deps-version: ${{ steps.create-release-branch.outputs.version }}
           github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }}
 
@@ -91,7 +91,7 @@ jobs:
       repo: ${{ github.repository }}
       live-run: ${{ inputs.live-run || false }}
       branch: ${{ needs.tag.outputs.branch }}
-      unpublished-deps-patterns: "zenoh.*"
+      unpublished-deps-patterns: "zenoh(?!-test).*"
     secrets: inherit
 
   debian:

Cargo.lock

@@ -256,7 +256,7 @@ zenoh-shm = { version = "=1.9.0", path = "commons/zenoh-shm" }
 zenoh-stats = { version = "=1.9.0", path = "commons/zenoh-stats" }
 zenoh-sync = { version = "=1.9.0", path = "commons/zenoh-sync" }
 zenoh-task = { version = "=1.9.0", path = "commons/zenoh-task" }
-zenoh-test = { version = "=1.9.0", path = "commons/zenoh-test" }
+zenoh-test = { path = "commons/zenoh-test" }
 zenoh-transport = { version = "=1.9.0", path = "io/zenoh-transport", default-features = false }
 zenoh-uring = { version = "=1.9.0", path = "commons/zenoh-uring" }
 zenoh-util = { version = "=1.9.0", path = "commons/zenoh-util" }

Cargo.toml

@@ -63,6 +63,7 @@ serde_json = { workspace = true }
 
 [dev-dependencies]
 clap = { workspace = true }
+zenoh-test = { workspace = true }
 
 [[example]]
 name = "z_serve_sse"

plugins/zenoh-plugin-rest/Cargo.toml

@@ -572,36 +572,21 @@ mod tests {
     use futures::{FutureExt, StreamExt};
     use tokio::time::timeout;
     use tower::ServiceExt;
-    use zenoh::{bytes::Encoding, sample::SampleKind, Config, Session, Wait};
+    use zenoh::{bytes::Encoding, sample::SampleKind, Session, Wait};
+    use zenoh_test::TestSessions;
 
     use crate::app;
 
-    const TEST_PORTS: [u16; 3] = [42000, 42001, 42002];
-
-    async fn setup(port: u16) -> (Session, Session) {
-        let mut config1 = Config::default();
-        config1.scouting.multicast.set_enabled(Some(false)).unwrap();
-        config1
-            .listen
-            .endpoints
-            .set(vec![format!("tcp/127.0.0.1:{}", port).parse().unwrap()])
-            .unwrap();
-
-        let mut config2 = Config::default();
-        config2.scouting.multicast.set_enabled(Some(false)).unwrap();
-        config2
-            .connect
-            .endpoints
-            .set(vec![format!("tcp/127.0.0.1:{}", port).parse().unwrap()])
-            .unwrap();
-        let (s1, s2) = tokio::try_join!(zenoh::open(config1), zenoh::open(config2)).unwrap();
+    async fn setup() -> (TestSessions, Session, Session) {
+        let mut test_sessions = TestSessions::new();
+        let (s1, s2) = test_sessions.open_pairs().await;
         tokio::time::sleep(Duration::from_secs(1)).await;
-        (s1, s2)
+        (test_sessions, s1, s2)
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn publish() {
-        let (pub_session, sub_session) = setup(TEST_PORTS[0]).await;
+        let (mut test_sessions, pub_session, sub_session) = setup().await;
         let subscriber = sub_session.declare_subscriber("test/**").await.unwrap();
         tokio::time::sleep(Duration::from_secs(1)).await;
         for method in [Method::PUT, Method::PATCH] {
@@ -639,11 +624,13 @@ mod tests {
         let sample = subscriber.try_recv().unwrap().unwrap();
         assert_eq!(sample.kind(), SampleKind::Delete);
         assert_eq!(sample.key_expr().as_str(), "test/publish");
+
+        test_sessions.close().await;
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn subscribe() {
-        let (pub_session, sub_session) = setup(TEST_PORTS[1]).await;
+        let (mut test_sessions, pub_session, sub_session) = setup().await;
         let response = app(sub_session.clone())
             .oneshot(
                 Request::builder()
@@ -685,11 +672,13 @@ mod tests {
                 }),
             );
         }
+
+        test_sessions.close().await;
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
     async fn query() {
-        let (get_session, queryable_session) = setup(TEST_PORTS[2]).await;
+        let (mut test_sessions, get_session, queryable_session) = setup().await;
         let _queryable = queryable_session
             .declare_queryable("test/**")
             .callback(|q| {
@@ -746,5 +735,7 @@ mod tests {
                 .unwrap();
             check(body);
         }
+
+        test_sessions.close().await;
     }
 }