@@ -242,7 +242,7 @@ fn multiaddr_to_path(addr: &Multiaddr) -> Result<PathBuf, ()> {
242
242
}
243
243
}
244
244
245
- #[ cfg( all( test, feature = "async-std " ) ) ]
245
+ #[ cfg( all( test, feature = "tokio " ) ) ]
246
246
mod tests {
247
247
use std:: { borrow:: Cow , path:: Path } ;
248
248
@@ -252,8 +252,9 @@ mod tests {
252
252
transport:: { DialOpts , ListenerId , PortUse } ,
253
253
Endpoint , Transport ,
254
254
} ;
255
+ use tokio:: io:: { AsyncReadExt , AsyncWriteExt } ;
255
256
256
- use super :: { multiaddr_to_path, UdsConfig } ;
257
+ use super :: { multiaddr_to_path, TokioUdsConfig } ;
257
258
258
259
#[ test]
259
260
fn multiaddr_to_path_conversion ( ) {
@@ -271,8 +272,8 @@ mod tests {
271
272
) ;
272
273
}
273
274
274
- #[ test]
275
- fn communicating_between_dialer_and_listener ( ) {
275
+ #[ tokio :: test]
276
+ async fn communicating_between_dialer_and_listener ( ) {
276
277
let temp_dir = tempfile:: tempdir ( ) . unwrap ( ) ;
277
278
let socket = temp_dir. path ( ) . join ( "socket" ) ;
278
279
let addr = Multiaddr :: from ( Protocol :: Unix ( Cow :: Owned (
@@ -281,8 +282,8 @@ mod tests {
281
282
282
283
let ( tx, rx) = oneshot:: channel ( ) ;
283
284
284
- async_std :: task :: spawn ( async move {
285
- let mut transport = UdsConfig :: new ( ) . boxed ( ) ;
285
+ let listener = async move {
286
+ let mut transport = TokioUdsConfig :: new ( ) . boxed ( ) ;
286
287
transport. listen_on ( ListenerId :: next ( ) , addr) . unwrap ( ) ;
287
288
288
289
let listen_addr = transport
@@ -303,10 +304,10 @@ mod tests {
303
304
let mut buf = [ 0u8 ; 3 ] ;
304
305
sock. read_exact ( & mut buf) . await . unwrap ( ) ;
305
306
assert_eq ! ( buf, [ 1 , 2 , 3 ] ) ;
306
- } ) ;
307
+ } ;
307
308
308
- async_std :: task :: block_on ( async move {
309
- let mut uds = UdsConfig :: new ( ) ;
309
+ let dialer = async move {
310
+ let mut uds = TokioUdsConfig :: new ( ) ;
310
311
let addr = rx. await . unwrap ( ) ;
311
312
let mut socket = uds
312
313
. dial (
@@ -320,13 +321,15 @@ mod tests {
320
321
. await
321
322
. unwrap ( ) ;
322
323
let _ = socket. write ( & [ 1 , 2 , 3 ] ) . await . unwrap ( ) ;
323
- } ) ;
324
+ } ;
325
+
326
+ tokio:: join!( listener, dialer) ;
324
327
}
325
328
326
329
#[ test]
327
330
#[ ignore] // TODO: for the moment unix addresses fail to parse
328
331
fn larger_addr_denied ( ) {
329
- let mut uds = UdsConfig :: new ( ) ;
332
+ let mut uds = TokioUdsConfig :: new ( ) ;
330
333
331
334
let addr = "/unix//foo/bar" . parse :: < Multiaddr > ( ) . unwrap ( ) ;
332
335
assert ! ( uds. listen_on( ListenerId :: next( ) , addr) . is_err( ) ) ;
0 commit comments