Speed up routing test and work around the failure of three_node_combi…

…nation test
eclipse-zenoh · Jan 25, 2024 · 251919d · 251919d
1 parent 0d9390f
commit 251919d
Show file tree

Hide file tree

Showing 2 changed files with 243 additions and 151 deletions.
diff --git a/io/zenoh-links/zenoh-link-tcp/src/unicast.rs b/io/zenoh-links/zenoh-link-tcp/src/unicast.rs
@@ -167,14 +167,14 @@ impl LinkUnicastTrait for LinkUnicastTcp {
 
 // WARN assume the drop of TcpStream would clean itself
 // https://docs.rs/tokio/latest/tokio/net/struct.TcpStream.html#method.into_split
-// impl Drop for LinkUnicastTcp {
-//     fn drop(&mut self) {
-//         // Close the underlying TCP socket
-//         ZRuntime::TX.handle().block_on(async {
-//             let _ = self.get_mut_socket().shutdown().await;
-//         });
-//     }
-// }
+impl Drop for LinkUnicastTcp {
+    fn drop(&mut self) {
+        // Close the underlying TCP socket
+        zenoh_runtime::ZRuntime::Transport.block_in_place(async {
+            let _ = self.get_mut_socket().shutdown().await;
+        });
+    }
+}
 
 impl fmt::Display for LinkUnicastTcp {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {