remove test-server and Cargo.toml dev-dependencies changes

actix-files/Cargo.toml

@@ -32,4 +32,4 @@ percent-encoding = "1.0"
 v_htmlescape = "0.4"
 
 [dev-dependencies]
-actix-web = { version = "1.0.2", features = ["flate2-zlib"] }
+actix-web = { version = "1.0.2", features=["ssl"] }

actix-framed/Cargo.toml

@@ -32,5 +32,7 @@ futures = "0.1.25"
 log = "0.4"
 
 [dev-dependencies]
-actix-http-test = "0.2.4"
+actix-server = { version = "0.6.0", features=["ssl"] }
+actix-connect = { version = "0.2.0", features=["ssl"] }
+actix-http-test = { version = "0.2.4", features=["ssl"] }
 actix-utils = "0.4.4"

actix-http/Cargo.toml

@@ -100,6 +100,10 @@ chrono = "0.4.6"
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-server = "0.6.0"
+actix-server = { version = "0.6.0", features=["ssl"] }
-actix-http-test = { version = "0.2.4", features = ["rust-tls", "ssl"] }
+actix-connect = { version = "0.2.0", features=["ssl"] }
+actix-http-test = { version = "0.2.4", features=["ssl"] }
 env_logger = "0.6"
+serde_derive = "1.0"
+openssl = { version="0.10" }
+tokio-tcp = "0.1"

actix-identity/Cargo.toml

@@ -25,5 +25,6 @@ serde_json = "1.0"
 time = "0.1.42"
 
 [dev-dependencies]
+actix-rt = "0.2.2"
 actix-http = "0.2.3"
 bytes = "0.4"

actix-multipart/Cargo.toml

@@ -30,4 +30,5 @@ time = "0.1"
 twoway = "0.2"
 
 [dev-dependencies]
+actix-rt = "0.2.2"
 actix-http = "0.2.4"

actix-session/Cargo.toml

@@ -33,3 +33,6 @@ hashbrown = "0.5.0"
 serde = "1.0"
 serde_json = "1.0"
 time = "0.1.42"
+
+[dev-dependencies]
+actix-rt = "0.2.2"

actix-web-actors/Cargo.toml

@@ -26,4 +26,5 @@ bytes = "0.4"
 futures = "0.1.25"
 
 [dev-dependencies]
-actix-http-test = "0.2.4"
+env_logger = "0.6"
+actix-http-test = { version = "0.2.4", features=["ssl"] }

actix-web-codegen/Cargo.toml

@@ -16,7 +16,7 @@ quote = "0.6.12"
 syn = { version = "0.15.34", features = ["full", "parsing", "extra-traits"] }
 
 [dev-dependencies]
-actix-web = "1.0.0"
+actix-web = { version = "1.0.0" }
-actix-http = "0.2.4"
+actix-http = { version = "0.2.4", features=["ssl"] }
-actix-http-test = "0.2.0"
+actix-http-test = { version = "0.2.0", features=["ssl"] }
-futures = "0.1"
+futures = { version = "0.1" }

awc/Cargo.toml

@@ -62,9 +62,15 @@ rustls = { version = "0.15.2", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.2.2"
-actix-web = "1.0.0"
+actix-web = { version = "1.0.0", features=["ssl"] }
-actix-http-test = { version = "0.2.4", features = ["ssl", "rust-tls"] }
+actix-http = { version = "0.2.4", features=["ssl"] }
-actix-server = "0.6.0"
+actix-http-test = { version = "0.2.0", features=["ssl"] }
-brotli2 = "0.3.2"
+actix-utils = "0.4.1"
-flate2 = "1.0.2"
+actix-server = { version = "0.6.0", features=["ssl", "rust-tls"] }
+brotli2 = { version="0.3.2" }
+flate2 = { version="1.0.2" }
+env_logger = "0.6"
+rand = "0.7"
+tokio-tcp = "0.1"
 webpki = "0.19"
+rustls = { version = "0.15.2", features = ["dangerous_configuration"] }

test-server/Cargo.toml

@@ -27,18 +27,16 @@ path = "src/lib.rs"
 default = []
 
 # openssl
-ssl = ["openssl", "actix-server/ssl", "awc/ssl", "actix-http/ssl"]
+ssl = ["openssl", "actix-server/ssl", "awc/ssl"]
-rust-tls = ["rustls", "webpki", "actix-server/rust-tls", "awc/rust-tls", "actix-http/rust-tls"]
 
 [dependencies]
 actix-codec = "0.1.2"
-actix-connect = "0.2"
+actix-rt = "0.2.2"
-actix-rt = "0.2.4"
 actix-service = "0.4.1"
 actix-server = "0.6.0"
 actix-utils = "0.4.1"
-actix-http = "0.2.8"
 awc = "0.2.2"
+actix-connect = "0.2.2"
 
 base64 = "0.10"
 bytes = "0.4"
@@ -56,8 +54,7 @@ time = "0.1"
 tokio-tcp = "0.1"
 tokio-timer = "0.2"
 openssl = { version="0.10", optional = true }
-rustls = { version = "0.15.2", optional = true, features = ["dangerous_configuration"] }
-webpki = { version = "0.19", optional = true }
 
 [dev-dependencies]
 actix-web = "1.0.0"
+actix-http = "0.2.4"

test-server/src/lib.rs

@@ -69,23 +69,6 @@ where
     RT.with(move |rt| rt.borrow_mut().get_mut().block_on(lazy(f)))
 }
 
-#[cfg(feature = "rust-tls")]
-mod danger {
-    pub struct NoCertificateVerification {}
-
-    impl rustls::ServerCertVerifier for NoCertificateVerification {
-        fn verify_server_cert(
-            &self,
-            _roots: &rustls::RootCertStore,
-            _presented_certs: &[rustls::Certificate],
-            _dns_name: webpki::DNSNameRef<'_>,
-            _ocsp: &[u8],
-        ) -> Result<rustls::ServerCertVerified, rustls::TLSError> {
-            Ok(rustls::ServerCertVerified::assertion())
-        }
-    }
-}
-
 /// The `TestServer` type.
 ///
 /// `TestServer` is very simple test server that simplify process of writing
@@ -168,25 +151,7 @@ impl TestServer {
                             .ssl(builder.build())
                             .finish()
                     }
-                    #[cfg(all(not(feature = "ssl"), feature = "rust-tls"))]
+                    #[cfg(not(feature = "ssl"))]
-                    {
-                        use rustls::ClientConfig;
-                        use std::sync::Arc;
-
-                        let mut config = ClientConfig::new();
-                        let protos = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
-                        config.set_protocols(&protos);
-                        config.dangerous().set_certificate_verifier(Arc::new(
-                            danger::NoCertificateVerification {},
-                        ));
-
-                        Connector::new()
-                            .conn_lifetime(time::Duration::from_secs(0))
-                            .timeout(time::Duration::from_millis(500))
-                            .rustls(Arc::new(config))
-                            .finish()
-                    }
-                    #[cfg(not(any(feature = "ssl", feature = "rust-tls")))]
                     {
                         Connector::new()
                             .conn_lifetime(time::Duration::from_secs(0))
@@ -201,7 +166,7 @@ impl TestServer {
         rt.block_on(lazy(
             || Ok::<_, ()>(actix_connect::start_default_resolver()),
         ))
-        .unwrap();
+            .unwrap();
         System::set_current(system);
         TestServerRuntime { addr, rt, client }
     }