From ce2333acd68c2ae4584830b08ca6b68d42c38ef4 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Mon, 24 Jul 2017 16:31:14 +0700
Subject: [PATCH] fix flaky benchmark test on CIs

The server now waits until the client has completed the handshake. This
way, we should avoid sending too many undecryptable packets.
---
 benchmark_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/benchmark_test.go b/benchmark_test.go
index 697ec8a7..7e4eecb4 100644
--- a/benchmark_test.go
+++ b/benchmark_test.go
@@ -31,6 +31,7 @@ var _ = Describe("Benchmarks", func() {
 				var ln Listener
 
 				serverAddr := make(chan net.Addr)
+				handshakeChan := make(chan struct{})
 				// start the server
 				go func() {
 					defer GinkgoRecover()
@@ -40,6 +41,9 @@ var _ = Describe("Benchmarks", func() {
 					serverAddr <- ln.Addr()
 					sess, err := ln.Accept()
 					Expect(err).ToNot(HaveOccurred())
+					// wait for the client to complete the handshake before sending the data
+					// this should not be necessary, but due to timing issues on the CIs, this is necessary to avoid sending too many undecryptable packets
+					<-handshakeChan
 					str, err := sess.OpenStream()
 					Expect(err).ToNot(HaveOccurred())
 					_, err = str.Write(data)
@@ -52,6 +56,7 @@ var _ = Describe("Benchmarks", func() {
 				addr := <-serverAddr
 				sess, err := DialAddr(addr.String(), &tls.Config{InsecureSkipVerify: true}, nil)
 				Expect(err).ToNot(HaveOccurred())
+				close(handshakeChan)
 				str, err := sess.AcceptStream()
 				Expect(err).ToNot(HaveOccurred())