Skip to content

Commit

Permalink
fix FAB-17146
Browse files Browse the repository at this point in the history 
Signed-off-by: baidang201 <jinrishouji@sina.com>
  • Loading branch information
@baidang201 @mastersingh24
baidang201 authored and mastersingh24 committed Nov 29, 2019
1 parent 4cec60e commit db73af2
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 25 deletions.
19 changes: 11 additions & 8 deletions core/handlers/validation/builtin/v12/validation_logic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2272,10 +2272,14 @@ var mockMSPIDGetter = func(cid string) []string {
}

func TestMain(m *testing.M) {
code := -1
defer func() {
os.Exit(code)
}()
testDir, err := ioutil.TempDir("", "v1.2-validation")
if err != nil {
fmt.Printf("Could not create temp dir: %s", err)
os.Exit(-1)
return
}
defer os.RemoveAll(testDir)
ccprovider.SetChaincodesPath(testDir)
Expand All @@ -2286,20 +2290,19 @@ func TestMain(m *testing.M) {
cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
if err != nil {
fmt.Printf("Initialize cryptoProvider bccsp failed: %s", cryptoProvider)
os.Exit(-1)
return
}

id, err = mspmgmt.GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
if err != nil {
fmt.Printf("GetSigningIdentity failed with err %s", err)
os.Exit(-1)
return
}

sid, err = id.Serialize()
if err != nil {
fmt.Printf("Serialize failed with err %s", err)
os.Exit(-1)
return
}

// determine the MSP identifier for the first MSP in the default chain
Expand All @@ -2308,11 +2311,11 @@ func TestMain(m *testing.M) {
msps, err := mspMgr.GetMSPs()
if err != nil {
fmt.Printf("Could not retrieve the MSPs for the chain manager, err %s", err)
os.Exit(-1)
return
}
if len(msps) == 0 {
fmt.Printf("At least one MSP was expected")
os.Exit(-1)
return
}
for _, m := range msps {
msp = m
Expand All @@ -2321,13 +2324,13 @@ func TestMain(m *testing.M) {
mspid, err = msp.GetIdentifier()
if err != nil {
fmt.Printf("Failure getting the msp identifier, err %s", err)
os.Exit(-1)
return
}

// also set the MSP for the "test" chain
mspmgmt.XXXSetMSPManager("mycc", mspmgmt.GetManagerForChain("testchannelid"))

os.Exit(m.Run())
code = m.Run()
}

func TestInValidCollectionName(t *testing.T) {
Expand Down
21 changes: 12 additions & 9 deletions core/handlers/validation/builtin/v13/validation_logic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2246,10 +2246,15 @@ var mockMSPIDGetter = func(cid string) []string {
}

func TestMain(m *testing.M) {
code := -1
defer func() {
os.Exit(code)
}()

testDir, err := ioutil.TempDir("", "v1.3-validation")
if err != nil {
fmt.Printf("Could not create temp dir: %s", err)
os.Exit(-1)
return
}
defer os.RemoveAll(testDir)
ccprovider.SetChaincodesPath(testDir)
Expand All @@ -2260,20 +2265,19 @@ func TestMain(m *testing.M) {
cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
if err != nil {
fmt.Printf("Initialize cryptoProvider bccsp failed: %s", err)
os.Exit(-1)
return
}

id, err = mspmgmt.GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
if err != nil {
fmt.Printf("GetSigningIdentity failed with err %s", err)
os.Exit(-1)
return
}

sid, err = id.Serialize()
if err != nil {
fmt.Printf("Serialize failed with err %s", err)
os.Exit(-1)
return
}

// determine the MSP identifier for the first MSP in the default chain
Expand All @@ -2282,11 +2286,11 @@ func TestMain(m *testing.M) {
msps, err := mspMgr.GetMSPs()
if err != nil {
fmt.Printf("Could not retrieve the MSPs for the chain manager, err %s", err)
os.Exit(-1)
return
}
if len(msps) == 0 {
fmt.Printf("At least one MSP was expected")
os.Exit(-1)
return
}
for _, m := range msps {
msp = m
Expand All @@ -2295,13 +2299,12 @@ func TestMain(m *testing.M) {
mspid, err = msp.GetIdentifier()
if err != nil {
fmt.Printf("Failure getting the msp identifier, err %s", err)
os.Exit(-1)
return
}

// also set the MSP for the "test" chain
mspmgmt.XXXSetMSPManager("mycc", mspmgmt.GetManagerForChain("testchannelid"))

os.Exit(m.Run())
code = m.Run()
}

func TestInValidCollectionName(t *testing.T) {
Expand Down
19 changes: 11 additions & 8 deletions core/handlers/validation/builtin/v20/validation_logic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,14 @@ func (c *mockPolicyChecker) CheckPolicyNoChannel(policyName string, signedProp *
}

func TestMain(m *testing.M) {
code := -1
defer func() {
os.Exit(code)
}()
testDir, err := ioutil.TempDir("", "v1.3-validation")
if err != nil {
fmt.Printf("Could not create temp dir: %s", err)
os.Exit(-1)
return
}
defer os.RemoveAll(testDir)
ccprovider.SetChaincodesPath(testDir)
Expand All @@ -256,20 +260,19 @@ func TestMain(m *testing.M) {
cryptoProvider, err := sw.NewDefaultSecurityLevelWithKeystore(sw.NewDummyKeyStore())
if err != nil {
fmt.Printf("Initialize cryptoProvider bccsp failed: %s", err)
os.Exit(-1)
return
}

id, err = mspmgmt.GetLocalMSP(cryptoProvider).GetDefaultSigningIdentity()
if err != nil {
fmt.Printf("GetSigningIdentity failed with err %s", err)
os.Exit(-1)
return
}

sid, err = id.Serialize()
if err != nil {
fmt.Printf("Serialize failed with err %s", err)
os.Exit(-1)
return
}

// determine the MSP identifier for the first MSP in the default chain
Expand All @@ -278,11 +281,11 @@ func TestMain(m *testing.M) {
msps, err := mspMgr.GetMSPs()
if err != nil {
fmt.Printf("Could not retrieve the MSPs for the chain manager, err %s", err)
os.Exit(-1)
return
}
if len(msps) == 0 {
fmt.Printf("At least one MSP was expected")
os.Exit(-1)
return
}
for _, m := range msps {
msp = m
Expand All @@ -291,11 +294,11 @@ func TestMain(m *testing.M) {
mspid, err = msp.GetIdentifier()
if err != nil {
fmt.Printf("Failure getting the msp identifier, err %s", err)
os.Exit(-1)
return
}

// also set the MSP for the "test" chain
mspmgmt.XXXSetMSPManager("mycc", mspmgmt.GetManagerForChain("testchannelid"))

os.Exit(m.Run())
code = m.Run()
}

0 comments on commit db73af2

Please sign in to comment.