[FAB-4902] Fix to set the GOMAXPROCS in UT

Config "peer.gomaxprocs" is not reflected in some unit tests. They read the config, but apply a fixed value or don't apply it. Thic patch fixes to set the number of maxprocs with "peer.gomaxprocs" rather than a fixed value. Change-Id: If347286cad44bad31b0cca719b23f45e40aa2930 Signed-off-by: Kaiho Fukuchi <kaiho.fukuchi.th@hitachi.com>
hyperledger · Jun 23, 2017 · a062eb8 · a062eb8
1 parent 3bc937e
commit a062eb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -1812,7 +1812,7 @@ func setupTestConfig() {
 
 	// Set the number of maxprocs
 	var numProcsDesired = viper.GetInt("peer.gomaxprocs")
-	chaincodeLogger.Debugf("setting Number of procs to %d, was %d\n", numProcsDesired, runtime.GOMAXPROCS(2))
+	chaincodeLogger.Debugf("setting Number of procs to %d, was %d\n", numProcsDesired, runtime.GOMAXPROCS(numProcsDesired))
 
 	// Init the BCCSP
 	err = factory.InitFactories(nil)

diff --git a/core/endorser/endorser_test.go b/core/endorser/endorser_test.go
@@ -22,6 +22,7 @@ import (
 	"io/ioutil"
 	"net"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 	"time"
@@ -750,7 +751,7 @@ func setupTestConfig() {
 	testutil.SetupTestLogging()
 
 	// Set the number of maxprocs
-	viper.GetInt("peer.gomaxprocs")
+	runtime.GOMAXPROCS(viper.GetInt("peer.gomaxprocs"))
 
 	// Init the BCCSP
 	var bccspConfig *factory.FactoryOpts

diff --git a/core/testutil/config.go b/core/testutil/config.go
@@ -83,7 +83,7 @@ func SetupTestConfig() {
 
 	// Set the number of maxprocs
 	var numProcsDesired = viper.GetInt("peer.gomaxprocs")
-	configLogger.Debugf("setting Number of procs to %d, was %d\n", numProcsDesired, runtime.GOMAXPROCS(2))
+	configLogger.Debugf("setting Number of procs to %d, was %d\n", numProcsDesired, runtime.GOMAXPROCS(numProcsDesired))
 
 	// Init the BCCSP
 	var bccspConfig *factory.FactoryOpts