File: fix_integration_tests.patch

package info (click to toggle)
rust-tokio-native-tls 0.3.1-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 220 kB
  • sloc: sh: 41; makefile: 2
file content (86 lines) | stat: -rw-r--r-- 2,999 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
--- a/tests/google.rs
+++ b/tests/google.rs
@@ -46,54 +46,7 @@
     }
 }
 
-#[tokio::test]
-async fn fetch_google() {
-    drop(env_logger::try_init());
-
-    // First up, resolve google.com
-    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
-
-    let socket = TcpStream::connect(&addr).await.unwrap();
-
-    // Send off the request by first negotiating an SSL handshake, then writing
-    // of our request, then flushing, then finally read off the response.
-    let builder = TlsConnector::builder();
-    let connector = t!(builder.build());
-    let connector = tokio_native_tls::TlsConnector::from(connector);
-    let mut socket = t!(connector.connect("google.com", socket).await);
-    t!(socket.write_all(b"GET / HTTP/1.0\r\n\r\n").await);
-    let mut data = Vec::new();
-    t!(socket.read_to_end(&mut data).await);
-
-    // any response code is fine
-    assert!(data.starts_with(b"HTTP/1.0 "));
-
-    let data = String::from_utf8_lossy(&data);
-    let data = data.trim_end();
-    assert!(data.ends_with("</html>") || data.ends_with("</HTML>"));
-}
-
 fn native2io(e: native_tls::Error) -> io::Error {
     io::Error::new(io::ErrorKind::Other, e)
 }
 
-// see comment in bad.rs for ignore reason
-#[cfg_attr(all(target_os = "macos", feature = "force-openssl"), ignore)]
-#[tokio::test]
-async fn wrong_hostname_error() {
-    drop(env_logger::try_init());
-
-    let addr = t!("google.com:443".to_socket_addrs()).next().unwrap();
-
-    let socket = t!(TcpStream::connect(&addr).await);
-    let builder = TlsConnector::builder();
-    let connector = t!(builder.build());
-    let connector = tokio_native_tls::TlsConnector::from(connector);
-    let res = connector
-        .connect("rust-lang.org", socket)
-        .await
-        .map_err(native2io);
-
-    assert!(res.is_err());
-    assert_bad_hostname_error(&res.err().unwrap());
-}
--- a/tests/smoke.rs
+++ b/tests/smoke.rs
@@ -1,7 +1,7 @@
 use futures::join;
 use lazy_static::lazy_static;
 use native_tls::{Certificate, Identity};
-use std::{fs, io::Error, path::PathBuf, process::Command};
+use std::{io::Error, path::PathBuf, process::Command};
 use tokio::{
     io::{AsyncReadExt, AsyncWrite, AsyncWriteExt},
     net::{TcpListener, TcpStream},
@@ -135,13 +135,13 @@
 }
 
 fn context() -> (TlsAcceptor, TlsConnector) {
-    let pkcs12 = fs::read(CERT_DIR.join("identity.p12")).unwrap();
-    let der = fs::read(CERT_DIR.join("root-ca.der")).unwrap();
+    let pkcs12 = include_bytes!("identity.p12");
+    let der = include_bytes!("root-ca.der");
 
-    let identity = Identity::from_pkcs12(&pkcs12, "mypass").unwrap();
+    let identity = Identity::from_pkcs12(pkcs12, "mypass").unwrap();
     let acceptor = native_tls::TlsAcceptor::builder(identity).build().unwrap();
 
-    let cert = Certificate::from_der(&der).unwrap();
+    let cert = Certificate::from_der(der).unwrap();
     let connector = native_tls::TlsConnector::builder()
         .add_root_certificate(cert)
         .build()