Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 1b72c0e

Browse files
committed
FAB-4244 increase proposal wait time for tests
Change-Id: I28a0b6c74e19efcf9c81b46f979ccbc2f07e8a8b Signed-off-by: rickr <cr22rc@gmail.com>
1 parent d6c88da commit 1b72c0e

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

src/test/java/org/hyperledger/fabric/sdk/testutils/TestConfig.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public class TestConfig {
5555
private static final String GOSSIPWAITTIME = PROPBASE + "GossipWaitTime";
5656
private static final String INVOKEWAITTIME = PROPBASE + "InvokeWaitTime";
5757
private static final String DEPLOYWAITTIME = PROPBASE + "DeployWaitTime";
58+
private static final String PROPOSALWAITTIME = PROPBASE + "ProposalWaitTime";
59+
5860

5961
private static final String INTEGRATIONTESTS_ORG = PROPBASE + "integrationTests.org.";
6062
private static final Pattern orgPat = Pattern.compile("^" + Pattern.quote(INTEGRATIONTESTS_ORG) + "([^\\.]+)\\.mspid$");
@@ -90,6 +92,8 @@ private TestConfig() {
9092
defaultProperty(GOSSIPWAITTIME, "5000");
9193
defaultProperty(INVOKEWAITTIME, "100000");
9294
defaultProperty(DEPLOYWAITTIME, "120000");
95+
defaultProperty(PROPOSALWAITTIME, "120000");
96+
9397

9498
//////
9599
defaultProperty(INTEGRATIONTESTS_ORG + "peerOrg1.mspid", "Org1MSP");
@@ -268,6 +272,15 @@ public int getGossipWaitTime() {
268272
return Integer.parseInt(getProperty(GOSSIPWAITTIME));
269273
}
270274

275+
/**
276+
* Time to wait for proposal to complete
277+
*
278+
* @return
279+
*/
280+
public long getProposalWaitTime() {
281+
return Integer.parseInt(getProperty(PROPOSALWAITTIME));
282+
}
283+
271284
public Collection<SampleOrg> getIntegrationTestsSampleOrgs() {
272285
return Collections.unmodifiableCollection(sampleOrgs.values());
273286
}
@@ -369,4 +382,5 @@ private String getDomainName(final String name) {
369382

370383
}
371384

385+
372386
}

src/test/java/org/hyperledger/fabric/sdkintegration/End2endAndBackAgainIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ void runChannel(HFClient client, Channel channel, SampleOrg sampleOrg, final int
211211
////For GO language and serving just a single user, chaincodeSource is mostly likely the users GOPATH
212212
installProposalRequest.setChaincodeSourceLocation(new File(TEST_FIXTURES_PATH + "/sdkintegration/gocc/sample_11"));
213213
installProposalRequest.setChaincodeVersion(CHAIN_CODE_VERSION_11);
214+
installProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
214215

215216
out("Sending install proposal");
216217

@@ -254,7 +255,7 @@ void runChannel(HFClient client, Channel channel, SampleOrg sampleOrg, final int
254255

255256
UpgradeProposalRequest upgradeProposalRequest = client.newUpgradeProposalRequest();
256257
upgradeProposalRequest.setChaincodeID(chaincodeID_11);
257-
upgradeProposalRequest.setProposalWaitTime(60000);
258+
upgradeProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
258259
upgradeProposalRequest.setFcn("init");
259260
upgradeProposalRequest.setArgs(new String[] {});// no arguments don't change the ledger see chaincode.
260261

@@ -388,6 +389,7 @@ CompletableFuture<BlockEvent.TransactionEvent> moveAmount(HFClient client, Chann
388389
transactionProposalRequest.setChaincodeID(chaincodeID);
389390
transactionProposalRequest.setFcn("invoke");
390391
transactionProposalRequest.setArgs(new String[] {"move", "a", "b", moveAmount});
392+
transactionProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
391393
out("sending transaction proposal to all peers with arguments: move(a,b,%s)", moveAmount);
392394

393395
Collection<ProposalResponse> invokePropResp = channel.sendTransactionProposal(transactionProposalRequest, channel.getPeers());

src/test/java/org/hyperledger/fabric/sdkintegration/End2endIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ void runChannel(HFClient client, Channel channel, boolean installChaincode, Samp
300300
///////////////
301301
//// Instantiate chaincode.
302302
InstantiateProposalRequest instantiateProposalRequest = client.newInstantiationProposalRequest();
303-
instantiateProposalRequest.setProposalWaitTime(60000);
303+
instantiateProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
304304
instantiateProposalRequest.setChaincodeID(chaincodeID);
305305
instantiateProposalRequest.setFcn("init");
306306
instantiateProposalRequest.setArgs(new String[] {"a", "500", "b", "" + (200 + delta)});
@@ -357,6 +357,7 @@ policy OR(Org1MSP.member, Org2MSP.member) meaning 1 signature from someone in ei
357357
TransactionProposalRequest transactionProposalRequest = client.newTransactionProposalRequest();
358358
transactionProposalRequest.setChaincodeID(chaincodeID);
359359
transactionProposalRequest.setFcn("invoke");
360+
transactionProposalRequest.setProposalWaitTime(testConfig.getProposalWaitTime());
360361
transactionProposalRequest.setArgs(new String[] {"move", "a", "b", "100"});
361362

362363
Map<String, byte[]> tm2 = new HashMap<>();

0 commit comments

Comments
 (0)