[FAB-6762] Update endorser test cc startup timeout

This CR updates the chaincode startup timeout value to a larger value to avoid timeout failures. It also updates a chaincode test timeout value to keep tests that create and deploy docker images consistent. Change-Id: If4b62f9b700ea79e480fc234a2e047bee63313f2 Signed-off-by: Will Lahti <[email protected]>
stiartsly · Oct 26, 2017 · 117cf98 · 117cf98
1 parent aa69bc7
commit 117cf98
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -102,7 +102,7 @@ func initPeer(chainIDs ...string) (net.Listener, error) {
 		return &pb.PeerEndpoint{Id: &pb.PeerID{Name: "testpeer"}, Address: peerAddress}, nil
 	}
 
-	ccStartupTimeout := time.Duration(60) * time.Second
+	ccStartupTimeout := time.Duration(3) * time.Minute
 	ca, _ := accesscontrol.NewCA()
 	pb.RegisterChaincodeSupportServer(grpcServer, NewChaincodeSupport(getPeerEndpoint, false, ccStartupTimeout, ca))
 

diff --git a/core/endorser/endorser_test.go b/core/endorser/endorser_test.go
@@ -99,7 +99,7 @@ func initPeer(chainID string) (*testEnvironment, error) {
 		return &pb.PeerEndpoint{Id: &pb.PeerID{Name: "testpeer"}, Address: peerAddress}, nil
 	}
 
-	ccStartupTimeout := time.Duration(30000) * time.Millisecond
+	ccStartupTimeout := time.Duration(3) * time.Minute
 	ca, _ := accesscontrol.NewCA()
 	pb.RegisterChaincodeSupportServer(grpcServer, chaincode.NewChaincodeSupport(getPeerEndpoint, false, ccStartupTimeout, ca))
 

diff --git a/core/endorser/endorser_test.yaml b/core/endorser/endorser_test.yaml
@@ -387,7 +387,7 @@ chaincode:
 
     # timeout in millisecs for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests
-    startuptimeout: 300000
+    startuptimeout: 1800000
 
     #timeout in millisecs for deploying chaincode from a remote repository.
     deploytimeout: 30000