Fix concurrent_test

Author: tallclair

pkg/server/server_test.go

@@ -527,10 +527,10 @@ func TestServerProxyConnectionMismatch(t *testing.T) {
 			agentConn.EXPECT().Send(dialReq).Return(nil),
 			agentConn.EXPECT().Send(data).Return(nil),
 		)
-		agentConn.EXPECT().Send(closeReqPkt(firstConnectID)).Return(nil)
 		agentConn.EXPECT().Send(closeReqPkt(secondConnectID)).Return(nil)
-		frontendConn.EXPECT().Send(closeRspPkt(firstConnectID, "mismatched connection IDs")).Return(nil)
+		agentConn.EXPECT().Send(closeReqPkt(firstConnectID)).Return(nil)
 		frontendConn.EXPECT().Send(closeRspPkt(secondConnectID, "mismatched connection IDs")).Return(nil)
+		frontendConn.EXPECT().Send(closeRspPkt(firstConnectID, "mismatched connection IDs")).Return(nil)
 	})
 }
 

tests/concurrent_test.go

@@ -47,16 +47,17 @@ func TestProxy_ConcurrencyGRPC(t *testing.T) {
 	clientset := runAgent(proxy.agent, stopCh)
 	waitForConnectedServerCount(t, 1, clientset)
 
-	// run test client
-	tunnel, err := client.CreateSingleUseGrpcTunnel(ctx, proxy.front, grpc.WithInsecure())
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	var wg sync.WaitGroup
 	verify := func() {
 		defer wg.Done()
 
+		// run test client
+		tunnel, err := client.CreateSingleUseGrpcTunnel(ctx, proxy.front, grpc.WithInsecure())
+		if err != nil {
+			t.Error(err)
+			return
+		}
+
 		c := &http.Client{
 			Transport: &http.Transport{
 				DialContext: tunnel.DialContext,
@@ -66,11 +67,13 @@ func TestProxy_ConcurrencyGRPC(t *testing.T) {
 		r, err := c.Get(server.URL)
 		if err != nil {
 			t.Error(err)
+			return
 		}
 
 		data, err := ioutil.ReadAll(r.Body)
 		if err != nil {
 			t.Error(err)
+			return
 		}
 		defer r.Body.Close()