From d81e72cf063a2a91c81f6ba281a949282dd9c38c Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Mon, 2 Dec 2019 11:30:52 +0600 Subject: [PATCH] remove deprecaed crate --- actix-test-server/Cargo.toml | 60 ------------- actix-test-server/LICENSE-APACHE | 1 - actix-test-server/LICENSE-MIT | 1 - actix-test-server/README.md | 3 - actix-test-server/src/lib.rs | 149 ------------------------------- 5 files changed, 214 deletions(-) delete mode 100644 actix-test-server/Cargo.toml delete mode 120000 actix-test-server/LICENSE-APACHE delete mode 120000 actix-test-server/LICENSE-MIT delete mode 100644 actix-test-server/README.md delete mode 100644 actix-test-server/src/lib.rs diff --git a/actix-test-server/Cargo.toml b/actix-test-server/Cargo.toml deleted file mode 100644 index e0f07bb9..00000000 --- a/actix-test-server/Cargo.toml +++ /dev/null @@ -1,60 +0,0 @@ -[package] -name = "actix-test-server" -version = "0.2.2" -authors = ["Nikolay Kim "] -description = "Actix test server" -keywords = ["network", "framework", "async", "futures"] -homepage = "https://actix.rs" -repository = "https://github.com/actix/actix-net.git" -documentation = "https://docs.rs/actix-test-server/" -categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" -exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] -edition = "2018" -workspace = ".." - -[package.metadata.docs.rs] -features = ["ssl", "tls", "rust-tls"] - -[lib] -name = "actix_test_server" -path = "src/lib.rs" - -[features] -default = [] - -# tls -tls = ["native-tls", "actix-server/tls"] - -# openssl -ssl = ["openssl", "actix-server/ssl"] - -# rustls -rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"] - -[dependencies] -actix-rt = "0.2.1" -actix-server = "0.5.0" -actix-server-config = "0.2.0" -actix-testing = "0.1.0" - -log = "0.4" -net2 = "0.2" -futures = { package = "futures-preview", version = "0.3.0-alpha.18"} -tokio-io = "0.2.0-alpha.4" -tokio-net = "0.2.0-alpha.4" - -# native-tls -native-tls = { version="0.2", optional = true } - -# openssl -openssl = { version="0.10", optional = true } - -#rustls -rustls = { version = "^0.16", optional = true } -tokio-rustls = { version = "^0.12.0-alpha.2", optional = true } -webpki = { version = "0.21", optional = true } -webpki-roots = { version = "0.17", optional = true } - -[dev-dependencies] -actix-service = "0.4.0" diff --git a/actix-test-server/LICENSE-APACHE b/actix-test-server/LICENSE-APACHE deleted file mode 120000 index 965b606f..00000000 --- a/actix-test-server/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-APACHE \ No newline at end of file diff --git a/actix-test-server/LICENSE-MIT b/actix-test-server/LICENSE-MIT deleted file mode 120000 index 76219eb7..00000000 --- a/actix-test-server/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-MIT \ No newline at end of file diff --git a/actix-test-server/README.md b/actix-test-server/README.md deleted file mode 100644 index 61f2773d..00000000 --- a/actix-test-server/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Actix test server (Deprecated) - -Use [actix-testing](https://docs.rs/actix-testing/) instead diff --git a/actix-test-server/src/lib.rs b/actix-test-server/src/lib.rs deleted file mode 100644 index 7a3e0623..00000000 --- a/actix-test-server/src/lib.rs +++ /dev/null @@ -1,149 +0,0 @@ -//! Various helpers for Actix applications to use during testing. -use std::sync::mpsc; -use std::{net, thread}; - -use actix_rt::{Runtime, System}; -use actix_server::{Server, StreamServiceFactory}; -pub use actix_server_config::{Io, ServerConfig}; - -use futures::future::{lazy, Future, IntoFuture}; -use net2::TcpBuilder; -use tokio_reactor::Handle; -use tokio_tcp::TcpStream; - -/// The `TestServer` type. -/// -/// `TestServer` is very simple test server that simplify process of writing -/// integration tests for actix-net applications. -/// -/// # Examples -/// -/// ```rust -/// use actix_service::{service_fn, IntoNewService}; -/// use actix_test_server::TestServer; -/// -/// fn main() { -/// let srv = TestServer::with(|| service_fn( -/// |sock| { -/// println!("New connection: {:?}", sock); -/// Ok::<_, ()>(()) -/// } -/// )); -/// -/// println!("SOCKET: {:?}", srv.connect()); -/// } -/// ``` -pub struct TestServer; - -/// Test server runstime -pub struct TestServerRuntime { - addr: net::SocketAddr, - host: String, - port: u16, - rt: Runtime, -} - -impl TestServer { - /// Start new test server with application factory - pub fn with(factory: F) -> TestServerRuntime { - let (tx, rx) = mpsc::channel(); - - // run server in separate thread - thread::spawn(move || { - let sys = System::new("actix-test-server"); - let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap(); - let local_addr = tcp.local_addr().unwrap(); - - Server::build() - .listen("test", tcp, factory)? - .workers(1) - .disable_signals() - .start(); - - tx.send((System::current(), local_addr)).unwrap(); - sys.run() - }); - - let (system, addr) = rx.recv().unwrap(); - System::set_current(system); - - let rt = Runtime::new().unwrap(); - let host = format!("{}", addr.ip()); - let port = addr.port(); - - TestServerRuntime { - addr, - rt, - host, - port, - } - } - - /// Get firat available unused local address - pub fn unused_addr() -> net::SocketAddr { - let addr: net::SocketAddr = "127.0.0.1:0".parse().unwrap(); - let socket = TcpBuilder::new_v4().unwrap(); - socket.bind(&addr).unwrap(); - socket.reuse_address(true).unwrap(); - let tcp = socket.to_tcp_listener().unwrap(); - tcp.local_addr().unwrap() - } -} - -impl TestServerRuntime { - /// Execute future on current runtime - pub fn block_on(&mut self, fut: F) -> Result - where - F: Future, - { - self.rt.block_on(fut) - } - - /// Runs the provided function, with runtime enabled. - pub fn run_on(&mut self, f: F) -> Result - where - F: FnOnce() -> R, - R: IntoFuture, - { - self.rt.block_on(lazy(|| f().into_future())) - } - - /// Spawn future to the current runtime - pub fn spawn(&mut self, fut: F) - where - F: Future + 'static, - { - self.rt.spawn(fut); - } - - /// Test server host - pub fn host(&self) -> &str { - &self.host - } - - /// Test server port - pub fn port(&self) -> u16 { - self.port - } - - /// Get test server address - pub fn addr(&self) -> net::SocketAddr { - self.addr - } - - /// Stop http server - fn stop(&mut self) { - System::current().stop(); - } - - /// Connect to server, return tokio TcpStream - pub fn connect(&self) -> std::io::Result { - TcpStream::from_std(net::TcpStream::connect(self.addr)?, &Handle::default()) - } -} - -impl Drop for TestServerRuntime { - fn drop(&mut self) { - self.stop() - } -}