[FABN-1378] Increase chaincode execute timeout

Increase the chaincode execute timeout on the peer to ensure that the chaincode install operation has plenty of time to build the chaincode into a Docker container. Also, throw the install error, so it's obvious which stage has gone wrong. Signed-off-by: Simon Stone <[email protected]> Change-Id: I461b7df2d9ffdcd1bbd4c928bada20f0f2b89f68
hyperledger · Sep 26, 2019 · 535cb80 · 535cb80
1 parent 7ade43c
commit 535cb80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/fixtures/docker-compose/docker-compose-base.yaml b/test/fixtures/docker-compose/docker-compose-base.yaml
@@ -92,6 +92,8 @@ services:
       # # bridge network as the peers
       # # https://docs.docker.com/compose/networking/
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default
+      # Allow more time for chaincode container to build on install.
+      - CORE_CHAINCODE_EXECUTETIMEOUT=300s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric
     command: peer node start
     volumes:

diff --git a/test/scenario/features/steps/chaincode_steps.js b/test/scenario/features/steps/chaincode_steps.js
@@ -71,7 +71,7 @@ module.exports = function () {
 				const package_id = await chaincode.install(request);
 				testUtil.logMsg(' installed the code with package ID of ' + package_id);
 			} catch (error) {
-				testUtil.logError('Install Error :: ' + error);
+				testUtil.logAndThrow('Install Error :: ' + error);
 			}
 		});