From 8ff0f9a37ba2e403bc4624a63914630814b36ccf Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Mon, 27 Dec 2021 16:02:31 +0000 Subject: [PATCH] fix tests --- actix-server/src/test_server.rs | 2 +- actix-tls/tests/accept-openssl.rs | 2 +- actix-tls/tests/accept-rustls.rs | 2 +- actix-tls/tests/test_connect.rs | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actix-server/src/test_server.rs b/actix-server/src/test_server.rs index 78b415d3..67659948 100644 --- a/actix-server/src/test_server.rs +++ b/actix-server/src/test_server.rs @@ -16,7 +16,7 @@ use crate::{Server, ServerBuilder, ServerHandle, ServerServiceFactory}; /// /// #[actix_rt::main] /// async fn main() { -/// let srv = TestServer::with(|| fn_service( +/// let srv = TestServer::start(|| fn_service( /// |sock| async move { /// println!("New connection: {:?}", sock); /// Ok::<_, ()>(()) diff --git a/actix-tls/tests/accept-openssl.rs b/actix-tls/tests/accept-openssl.rs index 3d195b04..4b6fadf0 100644 --- a/actix-tls/tests/accept-openssl.rs +++ b/actix-tls/tests/accept-openssl.rs @@ -94,7 +94,7 @@ fn rustls_connector(_cert: String, _key: String) -> ClientConfig { async fn accepts_connections() { let (cert, key) = new_cert_and_key(); - let srv = TestServer::with({ + let srv = TestServer::start({ let cert = cert.clone(); let key = key.clone(); diff --git a/actix-tls/tests/accept-rustls.rs b/actix-tls/tests/accept-rustls.rs index 2c922a68..521af7f9 100644 --- a/actix-tls/tests/accept-rustls.rs +++ b/actix-tls/tests/accept-rustls.rs @@ -74,7 +74,7 @@ fn openssl_connector(cert: String, key: String) -> SslConnector { async fn accepts_connections() { let (cert, key) = new_cert_and_key(); - let srv = TestServer::with({ + let srv = TestServer::start({ let cert = cert.clone(); let key = key.clone(); diff --git a/actix-tls/tests/test_connect.rs b/actix-tls/tests/test_connect.rs index 8853f1f7..bdd6b49c 100644 --- a/actix-tls/tests/test_connect.rs +++ b/actix-tls/tests/test_connect.rs @@ -17,7 +17,7 @@ use actix_tls::connect::{ConnectError, ConnectInfo, Connection, Connector, Host} #[cfg(feature = "openssl")] #[actix_rt::test] async fn test_string() { - let srv = TestServer::with(|| { + let srv = TestServer::start(|| { fn_service(|io: TcpStream| async { let mut framed = Framed::new(io, BytesCodec); framed.send(Bytes::from_static(b"test")).await?; @@ -34,7 +34,7 @@ async fn test_string() { #[cfg(feature = "rustls")] #[actix_rt::test] async fn test_rustls_string() { - let srv = TestServer::with(|| { + let srv = TestServer::start(|| { fn_service(|io: TcpStream| async { let mut framed = Framed::new(io, BytesCodec); framed.send(Bytes::from_static(b"test")).await?; @@ -101,7 +101,7 @@ async fn service_factory() { async fn test_openssl_uri() { use std::convert::TryFrom; - let srv = TestServer::with(|| { + let srv = TestServer::start(|| { fn_service(|io: TcpStream| async { let mut framed = Framed::new(io, BytesCodec); framed.send(Bytes::from_static(b"test")).await?; @@ -120,7 +120,7 @@ async fn test_openssl_uri() { async fn test_rustls_uri() { use std::convert::TryFrom; - let srv = TestServer::with(|| { + let srv = TestServer::start(|| { fn_service(|io: TcpStream| async { let mut framed = Framed::new(io, BytesCodec); framed.send(Bytes::from_static(b"test")).await?;