[FAB-9103] Improve test time for comm pkg

Upgrading the grpc-go pkg increased the
overall test time from ~6sec to ~30s.

With a few tweaks the total time is now
~11s

Change-Id: I37a62d7dba36b44e20f56117c2a943090f7a874a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: mastersingh24

core/comm/client_test.go

@@ -26,7 +26,7 @@ import (
 
 var caPEM, certPEM, keyPEM, serverKey, serverPEM []byte
 var testClientCert, testServerCert tls.Certificate
-var testTimeout = 10 * time.Second // conservative
+var testTimeout = 1 * time.Second // conservative
 
 type echoServer struct{}
 

core/comm/connection_test.go

@@ -137,7 +137,6 @@ func TestClientConnections(t *testing.T) {
 
 // utility function to load up our test root certificates from testdata/certs
 func loadRootCAs() [][]byte {
-
 	rootCAs := [][]byte{}
 	for i := 1; i <= numOrgs; i++ {
 		root, err := ioutil.ReadFile(fmt.Sprintf(orgCACert, i))
@@ -157,7 +156,7 @@ func loadRootCAs() [][]byte {
 }
 
 func TestCASupport(t *testing.T) {
-
+	t.Parallel()
 	rootCAs := loadRootCAs()
 	t.Logf("loaded %d root certificates", len(rootCAs))
 	if len(rootCAs) != 6 {
@@ -190,7 +189,7 @@ func TestCASupport(t *testing.T) {
 }
 
 func TestCredentialSupport(t *testing.T) {
-
+	t.Parallel()
 	rootCAs := loadRootCAs()
 	t.Logf("loaded %d root certificates", len(rootCAs))
 	if len(rootCAs) != 6 {
@@ -303,6 +302,7 @@ func newServer(org string, port int) *srv {
 }
 
 func TestImpersonation(t *testing.T) {
+	t.Parallel()
 	// Scenario: We have 2 organizations: orgA, orgB
 	// and each of them are in their respected channels- A, B.
 	// The test would obtain credentials.TransportCredentials by calling GetDeliverServiceCredentials.

core/comm/server_test.go

@@ -109,13 +109,6 @@ func (tss *testServiceServer) EmptyCall(context.Context, *testpb.Empty) (*testpb
 
 //invoke the EmptyCall RPC
 func invokeEmptyCall(address string, dialOptions []grpc.DialOption) (*testpb.Empty, error) {
-
-	//add DialOptions
-	dialOptions = append(
-		dialOptions,
-		grpc.WithDefaultCallOptions(grpc.FailFast(true)),
-		grpc.FailOnNonTempDialError(true),
-		grpc.WithBlock())
 	ctx := context.Background()
 	ctx, _ = context.WithTimeout(ctx, timeout)
 	//create GRPC client conn
@@ -650,7 +643,8 @@ func TestNewSecureGRPCServer(t *testing.T) {
 						RootCAs:    certPool,
 						MinVersion: tlsVersion,
 						MaxVersion: tlsVersion,
-					}))})
+					})),
+					grpc.WithBlock()})
 			t.Logf("TLSVersion [%d] failed with [%s]", tlsVersion, err)
 			assert.Error(t, err, "Should not have been able to connect with TLS version < 1.2")
 			assert.Contains(t, err.Error(), "context deadline exceeded")
@@ -1386,8 +1380,8 @@ func TestKeepaliveNoClientResponse(t *testing.T) {
 	t.Parallel()
 	// set up GRPCServer instance
 	kap := &comm.KeepaliveOptions{
-		ServerInterval: time.Duration(2) * time.Second,
-		ServerTimeout:  time.Duration(1) * time.Second,
+		ServerInterval: 2 * time.Second,
+		ServerTimeout:  1 * time.Second,
 	}
 	testAddress := "localhost:9400"
 	srv, err := comm.NewGRPCServer(testAddress, comm.ServerConfig{KaOpts: kap})
@@ -1417,8 +1411,8 @@ func TestKeepaliveClientResponse(t *testing.T) {
 	t.Parallel()
 	// set up GRPCServer instance
 	kap := &comm.KeepaliveOptions{
-		ServerInterval: time.Duration(2) * time.Second,
-		ServerTimeout:  time.Duration(1) * time.Second,
+		ServerInterval: 1 * time.Second,
+		ServerTimeout:  1 * time.Second,
 	}
 	testAddress := "localhost:9401"
 	srv, err := comm.NewGRPCServer(testAddress, comm.ServerConfig{KaOpts: kap})
@@ -1427,16 +1421,22 @@ func TestKeepaliveClientResponse(t *testing.T) {
 	defer srv.Stop()
 
 	// test that connection does not close with response to ping
-	clientTransport, err := transport.NewClientTransport(
+	connectCtx, cancel := context.WithDeadline(
 		context.Background(),
+		time.Now().Add(1*time.Second))
+	clientTransport, err := transport.NewClientTransport(
+		connectCtx,
 		context.Background(),
 		transport.TargetInfo{Addr: testAddress},
 		transport.ConnectOptions{},
 		func() {})
+	if err != nil {
+		cancel()
+	}
 	assert.NoError(t, err, "Unexpected error creating client transport")
 	defer clientTransport.Close()
 	// sleep past keepalive timeout
-	time.Sleep(4 * time.Second)
+	time.Sleep(1500 * time.Millisecond)
 	// try to create a stream
 	_, err = clientTransport.NewStream(context.Background(), &transport.CallHdr{})
 	assert.NoError(t, err, "Unexpected error creating stream")
@@ -1480,7 +1480,8 @@ func TestUpdateTLSCert(t *testing.T) {
 		_, err = invokeEmptyCall("localhost:8333",
 			[]grpc.DialOption{grpc.WithTransportCredentials(
 				credentials.NewTLS(&tls.Config{
-					RootCAs: certPool}))})
+					RootCAs: certPool})),
+				grpc.WithBlock()})
 		return err
 	}