[FAB-11065] Fix panic in integration test

Change-Id: I313da39f7ced675e4ab863ca0982ee4815bafb76 Signed-off-by: Bob Stasyszyn <[email protected]>
hyperledger · Jul 5, 2018 · 5af6829 · 5af6829
1 parent a2264e7
commit 5af6829
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test/integration/orgs/multiple_orgs_minconfig_test.go b/test/integration/orgs/multiple_orgs_minconfig_test.go
@@ -121,7 +121,7 @@ func discoverPeers(t *testing.T, sdk *fabsdk.FabricSDK) []fab.Peer {
 				t.Logf("%d- [%s] - MSP [%s]", i, p.URL(), p.MSPID())
 			}
 			if len(peers) < expectedPeers {
-				return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), err.Error(), nil)
+				return nil, status.New(status.TestStatus, status.GenericTransient.ToInt32(), "didn't get expected number of peers", nil)
 			}
 			return peers, nil
 		},

diff --git a/test/integration/orgs/multiple_orgs_test.go b/test/integration/orgs/multiple_orgs_test.go
@@ -436,7 +436,7 @@ func verifyErrorFromCC(chClientOrg1User *channel.Client, t *testing.T, ccName st
 }
 
 func queryInstalledCC(t *testing.T, orgID string, resMgmt *resmgmt.Client, ccName, ccVersion string, peers []fab.Peer) bool {
-	installed, _ := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
+	installed, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
 		func() (interface{}, error) {
 			ok := isCCInstalled(t, orgID, resMgmt, ccName, ccVersion, peers)
 			if !ok {
@@ -446,6 +446,7 @@ func queryInstalledCC(t *testing.T, orgID string, resMgmt *resmgmt.Client, ccNam
 		},
 	)
 
+	require.NoErrorf(t, err, "Got error checking if chaincode was installed")
 	return *(installed).(*bool)
 }
 
@@ -477,7 +478,7 @@ func queryInstantiatedCC(t *testing.T, orgID string, resMgmt *resmgmt.Client, ch
 	require.Truef(t, len(peers) > 0, "Expecting one or more peers")
 	t.Logf("Querying [%s] peers to see if chaincode [%s] was instantiated on channel [%s]", orgID, ccName, channelID)
 
-	instantiated, _ := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
+	instantiated, err := retry.NewInvoker(retry.New(retry.TestRetryOpts)).Invoke(
 		func() (interface{}, error) {
 			ok := isCCInstantiated(t, resMgmt, channelID, ccName, ccVersion, peers)
 			if !ok {
@@ -486,6 +487,7 @@ func queryInstantiatedCC(t *testing.T, orgID string, resMgmt *resmgmt.Client, ch
 			return &ok, nil
 		},
 	)
+	require.NoErrorf(t, err, "Got error checking if chaincode was instantiated")
 	return *(instantiated).(*bool)
 }