Fix travis test setup for DTLS

2 files changed, 36 insertions, 8 deletions

diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index 4d78e182..5a0ff9b5 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -58,8 +58,8 @@ macro_rules! run_test(
             use std::net::UdpSocket;
             use std::net::TcpStream;
             use ssl::SslMethod::Sslv23;
-            #[cfg(feature="dtlsv1")]
             use ssl;
+            #[cfg(feature="dtlsv1")]
             use ssl::SslMethod::Dtlsv1;
             use ssl::{SslContext, SslStream, VerifyCallback};
             use ssl::connected_socket::Connect;
@@ -288,13 +288,28 @@ run_test!(clear_ctx_options, |method, _| {
     assert!(!opts.contains(ssl::SSL_OP_ALL));
 });
 
-run_test!(write, |method, stream| {
-    let mut s = SslStream::new(&SslContext::new(method).unwrap(), stream).unwrap();
-    s.write_all("hello".as_bytes()).unwrap();
-    s.flush().unwrap();
-    s.write_all(" there".as_bytes()).unwrap();
-    s.flush().unwrap();
-});
+#[test]
+fn test_write() {
+    let stream = TcpStream::connect("127.0.0.1:15418").unwrap();
+    let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap();
+    stream.write_all("hello".as_bytes()).unwrap();
+    stream.flush().unwrap();
+    stream.write_all(" there".as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
+
+#[test]
+#[cfg(feature = "dtlsv1")]
+fn test_write_dtlsv1() {
+    let sock = UdpSocket::bind("127.0.0.1:0").unwrap();
+    let stream = sock.connect("127.0.0.1:15410").unwrap();
+
+    let mut stream = SslStream::new(&SslContext::new(Dtlsv1).unwrap(), stream).unwrap();
+    stream.write_all("hello".as_bytes()).unwrap();
+    stream.flush().unwrap();
+    stream.write_all(" there".as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
 
 #[test]
 fn test_read() {
diff --git a/openssl/test/test.sh b/openssl/test/test.sh
new file mode 100755
index 00000000..3d035905
--- /dev/null
+++ b/openssl/test/test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
+
+openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &
+
+for port in `seq 15411 15430`; do
+	echo hello | openssl s_server -accept $port -dtls1 -cert openssl/test/cert.pem \
+	  -key openssl/test/key.pem 2>&1 >/dev/null &
+done
+# the server for the test ssl::tests::test_write_dtlsv1 must wait to receive
+# data from the client
+openssl s_server -accept 15410 -dtls1 -cert openssl/test/cert.pem \
+  -key openssl/test/key.pem 2>&1 >/dev/null