From 4be7cd79084235f61d716559791ed8782e19f231 Mon Sep 17 00:00:00 2001 From: v2ray Date: Wed, 16 Dec 2015 16:42:54 +0100 Subject: [PATCH] Fix test flakiness --- testing/scenarios/socks_end_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testing/scenarios/socks_end_test.go b/testing/scenarios/socks_end_test.go index be0ba8952..cc6353525 100644 --- a/testing/scenarios/socks_end_test.go +++ b/testing/scenarios/socks_end_test.go @@ -68,17 +68,21 @@ func TestTCPConnection(t *testing.T) { assert.Error(err).IsNil() assert.Int(nBytes).Equals(len(actualRequest)) + actualResponse := make([]byte, 1024) + nResponse, err := conn.Read(actualResponse) + assert.Error(err).IsNil() + actualRequest = []byte("Request to target server again.") nBytes, err = conn.Write(actualRequest) assert.Error(err).IsNil() assert.Int(nBytes).Equals(len(actualRequest)) + nBytes, err = conn.Read(actualResponse[nResponse:]) + assert.Error(err).IsNil() + nResponse += nBytes conn.CloseWrite() - actualResponse := make([]byte, 1024) - nBytes, err = conn.Read(actualResponse) - assert.Error(err).IsNil() - assert.StringLiteral(string(actualResponse[:nBytes])).Equals("Processed: Request to target server.Request to target server again.") + assert.StringLiteral(string(actualResponse[:nResponse])).Equals("Processed: Request to target server.Processed: Request to target server again.") conn.Close() }