Skip to content

Commit 816653f

Browse files
committed
[FAB-10334] make unit-test fails locally on master
When running 'make unit-test' locally using the lastest master, the peer/chaincode package fails. This is due to TestInstall relying on chaincode devmode being enabled by another test instead of explicitly setting it. Change-Id: If5618846c97b1a0c9b49d9b0901cf3eeeb3289b8 Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
1 parent e9c51c1 commit 816653f

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

peer/chaincode/install_test.go

+9-14
Original file line numberDiff line numberDiff line change
@@ -145,25 +145,20 @@ func TestInstallFromBadPackage(t *testing.T) {
145145
t.Fatal("expected error installing bad package")
146146
}
147147
}
148+
func installEx02(t *testing.T) error {
149+
defer viper.Reset()
150+
viper.Set("chaincode.mode", "dev")
148151

149-
func installEx02() error {
150-
signer, err := common.GetDefaultSigner()
151-
if err != nil {
152-
return fmt.Errorf("Get default signer error: %v", err)
153-
}
152+
fsPath := "/tmp/installtest"
153+
cmd, mockCF := initInstallTest(fsPath, t)
154+
defer cleanupInstallTest(fsPath)
154155

155156
mockResponse := &pb.ProposalResponse{
156157
Response: &pb.Response{Status: 200},
157158
Endorsement: &pb.Endorsement{},
158159
}
159-
mockEndorserClients := []pb.EndorserClient{common.GetMockEndorserClient(mockResponse, nil)}
160-
mockCF := &ChaincodeCmdFactory{
161-
EndorserClients: mockEndorserClients,
162-
Signer: signer,
163-
}
164-
165-
cmd := installCmd(mockCF)
166-
addFlags(cmd)
160+
mockEndorserClient := common.GetMockEndorserClient(mockResponse, nil)
161+
mockCF.EndorserClients = []pb.EndorserClient{mockEndorserClient}
167162

168163
args := []string{"-n", "example02", "-p", "github.com/hyperledger/fabric/examples/chaincode/go/example02/cmd", "-v", "anotherversion"}
169164
cmd.SetArgs(args)
@@ -177,7 +172,7 @@ func installEx02() error {
177172

178173
func TestInstall(t *testing.T) {
179174
InitMSP()
180-
if err := installEx02(); err != nil {
175+
if err := installEx02(t); err != nil {
181176
t.Fatalf("Install failed with error: %v", err)
182177
}
183178
}

0 commit comments

Comments
 (0)