diff options
author | Carl Lerche <me@carllerche.com> | 2018-02-06 07:26:21 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 07:26:21 -0800 |
commit | f0ea9d6f4c0a734ac4c235630f3d8cc51fb48f51 (patch) | |
tree | 011aae238269ce6ba1cf29013126e4e45fea4cd4 /tests | |
parent | 567887cc75170437f75f19f5966f2b32bf49ab72 (diff) |
Switch back to futures from crates.io (#113)
Doing so requires copying the `current_thread` executor from GitHub into
the repo.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/buffered.rs | 3 | ||||
-rw-r--r-- | tests/chain.rs | 3 | ||||
-rw-r--r-- | tests/drop-core.rs | 8 | ||||
-rw-r--r-- | tests/echo.rs | 3 | ||||
-rw-r--r-- | tests/global.rs | 3 | ||||
-rw-r--r-- | tests/limit.rs | 3 | ||||
-rw-r--r-- | tests/line-frames.rs | 16 | ||||
-rw-r--r-- | tests/pipe-hup.rs | 4 | ||||
-rw-r--r-- | tests/stream-buffered.rs | 3 | ||||
-rw-r--r-- | tests/tcp.rs | 7 | ||||
-rw-r--r-- | tests/udp.rs | 13 |
11 files changed, 29 insertions, 37 deletions
diff --git a/tests/buffered.rs b/tests/buffered.rs index 60b574f6..2ba16b04 100644 --- a/tests/buffered.rs +++ b/tests/buffered.rs @@ -8,7 +8,6 @@ use std::thread; use std::io::{Read, Write, BufReader, BufWriter}; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio_io::io::copy; use tokio::net::TcpListener; @@ -55,7 +54,7 @@ fn echo_server() { copy(a, b) }); - let (amt, _, _) = t!(blocking(copied).wait()); + let (amt, _, _) = t!(copied.wait()); let (expected, t2) = t.join().unwrap(); let actual = t2.join().unwrap(); diff --git a/tests/chain.rs b/tests/chain.rs index cd271258..b9ac4818 100644 --- a/tests/chain.rs +++ b/tests/chain.rs @@ -7,7 +7,6 @@ use std::thread; use std::io::{Write, Read}; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio_io::io::read_to_end; use tokio::net::TcpListener; @@ -43,7 +42,7 @@ fn chain_clients() { read_to_end(a.chain(b).chain(c), Vec::new()) }); - let (_, data) = t!(blocking(copied).wait()); + let (_, data) = t!(copied.wait()); t.join().unwrap(); assert_eq!(data, b"foo bar baz"); diff --git a/tests/drop-core.rs b/tests/drop-core.rs index 503e81ef..75ac9b7e 100644 --- a/tests/drop-core.rs +++ b/tests/drop-core.rs @@ -4,7 +4,7 @@ extern crate futures; use std::thread; use std::net; -use futures::{future, stream}; +use futures::future; use futures::prelude::*; use futures::sync::oneshot; use tokio::net::TcpListener; @@ -17,7 +17,7 @@ fn tcp_doesnt_block() { let listener = net::TcpListener::bind("127.0.0.1:0").unwrap(); let listener = TcpListener::from_std(listener, &handle).unwrap(); drop(core); - assert!(stream::blocking(listener.incoming()).next().unwrap().is_err()); + assert!(listener.incoming().wait().next().unwrap().is_err()); } #[test] @@ -34,9 +34,9 @@ fn drop_wakes() { drop(tx); future::ok(()) }); - assert!(future::blocking(new_socket.join(drop_tx)).wait().is_err()); + assert!(new_socket.join(drop_tx).wait().is_err()); }); - drop(future::blocking(rx).wait()); + drop(rx.wait()); drop(core); t.join().unwrap(); } diff --git a/tests/echo.rs b/tests/echo.rs index 778bdeb9..d5bdae81 100644 --- a/tests/echo.rs +++ b/tests/echo.rs @@ -8,7 +8,6 @@ use std::net::TcpStream; use std::thread; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio::net::TcpListener; use tokio_io::AsyncRead; @@ -45,7 +44,7 @@ fn echo_server() { let halves = client.map(|s| s.split()); let copied = halves.and_then(|(a, b)| copy(a, b)); - let (amt, _, _) = t!(blocking(copied).wait()); + let (amt, _, _) = t!(copied.wait()); t.join().unwrap(); assert_eq!(amt, msg.len() as u64 * 1024); diff --git a/tests/global.rs b/tests/global.rs index 4702fc11..bf5682fa 100644 --- a/tests/global.rs +++ b/tests/global.rs @@ -3,7 +3,6 @@ extern crate tokio; use std::thread; -use futures::future::blocking; use futures::prelude::*; use tokio::net::{TcpStream, TcpListener}; @@ -24,7 +23,7 @@ fn hammer() { let theirs = srv.incoming().into_future() .map(|(s, _)| s.unwrap()) .map_err(|(s, _)| s); - let (mine, theirs) = t!(blocking(mine.join(theirs)).wait()); + let (mine, theirs) = t!(mine.join(theirs).wait()); assert_eq!(t!(mine.local_addr()), t!(theirs.peer_addr())); assert_eq!(t!(theirs.local_addr()), t!(mine.peer_addr())); diff --git a/tests/limit.rs b/tests/limit.rs index 053f4385..7055ce9b 100644 --- a/tests/limit.rs +++ b/tests/limit.rs @@ -7,7 +7,6 @@ use std::thread; use std::io::{Write, Read}; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio_io::io::read_to_end; use tokio::net::TcpListener; @@ -37,7 +36,7 @@ fn limit() { read_to_end(a.take(4), Vec::new()) }); - let (_, data) = t!(blocking(copied).wait()); + let (_, data) = t!(copied.wait()); t.join().unwrap(); assert_eq!(data, b"foo "); diff --git a/tests/line-frames.rs b/tests/line-frames.rs index 27f1d195..3785dfef 100644 --- a/tests/line-frames.rs +++ b/tests/line-frames.rs @@ -10,7 +10,7 @@ use std::net::Shutdown; use bytes::{BytesMut, BufMut}; use futures::{Future, Stream, Sink}; -use futures::future::{blocking, Executor}; +use futures::future::Executor; use futures_cpupool::CpuPool; use tokio::net::{TcpListener, TcpStream}; use tokio_io::codec::{Encoder, Decoder}; @@ -68,20 +68,20 @@ fn echo() { pool.execute(srv.map_err(|e| panic!("srv error: {}", e))).unwrap(); let client = TcpStream::connect(&addr); - let client = blocking(client).wait().unwrap(); - let (client, _) = blocking(write_all(client, b"a\n")).wait().unwrap(); - let (client, buf, amt) = blocking(read(client, vec![0; 1024])).wait().unwrap(); + let client = client.wait().unwrap(); + let (client, _) = write_all(client, b"a\n").wait().unwrap(); + let (client, buf, amt) = read(client, vec![0; 1024]).wait().unwrap(); assert_eq!(amt, 2); assert_eq!(&buf[..2], b"a\n"); - let (client, _) = blocking(write_all(client, b"\n")).wait().unwrap(); - let (client, buf, amt) = blocking(read(client, buf)).wait().unwrap(); + let (client, _) = write_all(client, b"\n").wait().unwrap(); + let (client, buf, amt) = read(client, buf).wait().unwrap(); assert_eq!(amt, 1); assert_eq!(&buf[..1], b"\n"); - let (client, _) = blocking(write_all(client, b"b")).wait().unwrap(); + let (client, _) = write_all(client, b"b").wait().unwrap(); client.shutdown(Shutdown::Write).unwrap(); - let (_client, buf, amt) = blocking(read(client, buf)).wait().unwrap(); + let (_client, buf, amt) = read(client, buf).wait().unwrap(); assert_eq!(amt, 1); assert_eq!(&buf[..1], b"b"); } diff --git a/tests/pipe-hup.rs b/tests/pipe-hup.rs index c0406487..0a09fa21 100644 --- a/tests/pipe-hup.rs +++ b/tests/pipe-hup.rs @@ -13,12 +13,12 @@ use std::os::unix::io::{AsRawFd, FromRawFd}; use std::thread; use std::time::Duration; -use futures::future::blocking; use mio::event::Evented; use mio::unix::{UnixReady, EventedFd}; use mio::{PollOpt, Ready, Token}; use tokio::reactor::{Handle, PollEvented}; use tokio_io::io::read_to_end; +use futures::Future; macro_rules! t { ($e:expr) => (match $e { @@ -81,7 +81,7 @@ fn hup() { let source = PollEvented::new(MyFile::new(read), &handle).unwrap(); let reader = read_to_end(source, Vec::new()); - let (_, content) = t!(blocking(reader).wait()); + let (_, content) = t!(reader.wait()); assert_eq!(&b"Hello!\nGood bye!\n"[..], &content[..]); t.join().unwrap(); } diff --git a/tests/stream-buffered.rs b/tests/stream-buffered.rs index 64786902..78fe1c37 100644 --- a/tests/stream-buffered.rs +++ b/tests/stream-buffered.rs @@ -8,7 +8,6 @@ use std::net::TcpStream; use std::thread; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio_io::io::copy; use tokio_io::AsyncRead; @@ -49,7 +48,7 @@ fn echo_server() { .take(2) .collect(); - t!(blocking(future).wait()); + t!(future.wait()); t.join().unwrap(); } diff --git a/tests/tcp.rs b/tests/tcp.rs index a1cefacd..83cc425c 100644 --- a/tests/tcp.rs +++ b/tests/tcp.rs @@ -7,7 +7,6 @@ use std::sync::mpsc::channel; use std::thread; use futures::Future; -use futures::future::blocking; use futures::stream::Stream; use tokio::net::{TcpListener, TcpStream}; @@ -28,7 +27,7 @@ fn connect() { }); let stream = TcpStream::connect(&addr); - let mine = t!(blocking(stream).wait()); + let mine = t!(stream.wait()); let theirs = t.join().unwrap(); assert_eq!(t!(mine.local_addr()), t!(theirs.peer_addr())); @@ -51,7 +50,7 @@ fn accept() { net::TcpStream::connect(&addr).unwrap() }); - let (mine, _remaining) = t!(blocking(client).wait()); + let (mine, _remaining) = t!(client.wait()); let mine = mine.unwrap(); let theirs = t.join().unwrap(); @@ -76,7 +75,7 @@ fn accept2() { }).into_future().map_err(|e| e.0); assert!(rx.try_recv().is_err()); - let (mine, _remaining) = t!(blocking(client).wait()); + let (mine, _remaining) = t!(client.wait()); mine.unwrap(); t.join().unwrap(); } diff --git a/tests/udp.rs b/tests/udp.rs index 42b8906d..f0a47d37 100644 --- a/tests/udp.rs +++ b/tests/udp.rs @@ -7,7 +7,6 @@ use std::io; use std::net::SocketAddr; use futures::{Future, Poll, Stream, Sink}; -use futures::future::blocking; use tokio::net::{UdpSocket, UdpCodec}; macro_rules! t { @@ -26,7 +25,7 @@ fn send_messages<S: SendFn + Clone, R: RecvFn + Clone>(send: S, recv: R) { { let send = SendMessage::new(a, send.clone(), b_addr, b"1234"); let recv = RecvMessage::new(b, recv.clone(), a_addr, b"1234"); - let (sendt, received) = t!(blocking(send.join(recv)).wait()); + let (sendt, received) = t!(send.join(recv).wait()); a = sendt; b = received; } @@ -34,7 +33,7 @@ fn send_messages<S: SendFn + Clone, R: RecvFn + Clone>(send: S, recv: R) { { let send = SendMessage::new(a, send, b_addr, b""); let recv = RecvMessage::new(b, recv, a_addr, b""); - t!(blocking(send.join(recv)).wait()); + t!(send.join(recv).wait()); } } @@ -173,7 +172,7 @@ fn send_dgrams() { { let send = a.send_dgram(&b"4321"[..], &b_addr); let recv = b.recv_dgram(&mut buf[..]); - let (sendt, received) = t!(blocking(send.join(recv)).wait()); + let (sendt, received) = t!(send.join(recv).wait()); assert_eq!(received.2, 4); assert_eq!(&received.1[..4], b"4321"); a = sendt.0; @@ -183,7 +182,7 @@ fn send_dgrams() { { let send = a.send_dgram(&b""[..], &b_addr); let recv = b.recv_dgram(&mut buf[..]); - let received = t!(blocking(send.join(recv)).wait()).1; + let received = t!(send.join(recv).wait()).1; assert_eq!(received.2, 0); } } @@ -226,7 +225,7 @@ fn send_framed() { let send = a.send(&b"4567"[..]); let recv = b.into_future().map_err(|e| e.0); - let (sendt, received) = t!(blocking(send.join(recv)).wait()); + let (sendt, received) = t!(send.join(recv).wait()); assert_eq!(received.0, Some(())); a_soc = sendt.into_inner(); @@ -239,7 +238,7 @@ fn send_framed() { let send = a.send(&b""[..]); let recv = b.into_future().map_err(|e| e.0); - let received = t!(blocking(send.join(recv)).wait()).1; + let received = t!(send.join(recv).wait()).1; assert_eq!(received.0, Some(())); } } |