diff options
| author | Manuel Schölling <[email protected]> | 2015-03-12 19:24:16 +0100 |
|---|---|---|
| committer | Manuel Schölling <[email protected]> | 2015-04-06 12:22:50 +0200 |
| commit | efbd4eee05d7f21ce2ffd1b1beaae1cde1de36ba (patch) | |
| tree | 41ac0fc7290d65a552c3cfc3b84b4fa86219479f /openssl/src/ssl/tests.rs | |
| parent | Fix travis test setup for DTLS (diff) | |
| download | rust-openssl-efbd4eee05d7f21ce2ffd1b1beaae1cde1de36ba.tar.xz rust-openssl-efbd4eee05d7f21ce2ffd1b1beaae1cde1de36ba.zip | |
Fix portability issue and typo
Diffstat (limited to 'openssl/src/ssl/tests.rs')
| -rw-r--r-- | openssl/src/ssl/tests.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs index 5a0ff9b5..dcdc3c05 100644 --- a/openssl/src/ssl/tests.rs +++ b/openssl/src/ssl/tests.rs @@ -31,6 +31,7 @@ use std::net::UdpSocket; const PROTOCOL:SslMethod = Sslv23; +#[cfg(test)] mod udp { static mut udp_port:u16 = 15410; @@ -57,10 +58,8 @@ macro_rules! run_test( use std::path::Path; use std::net::UdpSocket; use std::net::TcpStream; - use ssl::SslMethod::Sslv23; use ssl; - #[cfg(feature="dtlsv1")] - use ssl::SslMethod::Dtlsv1; + use ssl::SslMethod; use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::connected_socket::Connect; use ssl::SslVerifyMode::SSL_VERIFY_PEER; @@ -72,7 +71,7 @@ macro_rules! run_test( #[test] fn sslv23() { let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); - $blk(Sslv23, stream); + $blk(SslMethod::Sslv23, stream); } #[test] @@ -81,7 +80,7 @@ macro_rules! run_test( let sock = UdpSocket::bind("127.0.0.1:0").unwrap(); let stream = sock.connect(udp::next_server().as_slice()).unwrap(); - $blk(Dtlsv1, stream); + $blk(SslMethod::Dtlsv1, stream); } } ); |