[FAB-10335] InstallChaincode installs and verifies

Change-Id: I7aede95bf931940154c591009e7866bee5eca061
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

integration/helpers/gexec.go

@@ -0,0 +1,23 @@
+/*
+Copyright IBM Corp All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package helpers
+
+import (
+	"fmt"
+	"os/exec"
+
+	"github.com/onsi/ginkgo"
+	"github.com/onsi/gomega/gexec"
+)
+
+func StartSession(cmd *exec.Cmd, name, ansiColorCode string) (*gexec.Session, error) {
+	return gexec.Start(
+		cmd,
+		gexec.NewPrefixedWriter(fmt.Sprintf("\x1b[32m[o]\x1b[%s[%s]\x1b[0m ", ansiColorCode, name), ginkgo.GinkgoWriter),
+		gexec.NewPrefixedWriter(fmt.Sprintf("\x1b[91m[e]\x1b[%s[%s]\x1b[0m ", ansiColorCode, name), ginkgo.GinkgoWriter),
+	)
+}

integration/runner/peer.go

@@ -10,7 +10,12 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"time"
 
+	"github.com/hyperledger/fabric/integration/helpers"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/gbytes"
+	"github.com/onsi/gomega/gexec"
 	"github.com/tedsuo/ifrit/ginkgomon"
 )
 
@@ -154,17 +159,21 @@ func (p *Peer) UpdateChannel(transactionFile string, channel string, orderer str
 	return r
 }
 
-func (p *Peer) InstallChaincode(name string, version string, path string) *ginkgomon.Runner {
+func (p *Peer) InstallChaincode(name, version, path string) {
 	cmd := exec.Command(p.Path, "chaincode", "install", "-n", name, "-v", version, "-p", path)
 	p.setupEnvironment(cmd)
 
-	r := ginkgomon.New(ginkgomon.Config{
-		Name:          "install",
-		AnsiColorCode: "4;34m",
-		Command:       cmd,
-	})
+	sess, err := helpers.StartSession(cmd, "install", "4;34m")
+	ExpectWithOffset(1, err).NotTo(HaveOccurred())
+	EventuallyWithOffset(1, sess, time.Minute).Should(gexec.Exit(0))
 
-	return r
+	cmd = exec.Command(p.Path, "chaincode", "list", "--installed")
+	p.setupEnvironment(cmd)
+
+	sess, err = helpers.StartSession(cmd, "list", "4;33m")
+	ExpectWithOffset(1, err).NotTo(HaveOccurred())
+	EventuallyWithOffset(1, sess, time.Minute).Should(gexec.Exit(0))
+	Expect(sess).To(gbytes.Say(fmt.Sprintf("Name: %s, Version: %s,", name, version)))
 }
 
 func (p *Peer) InstantiateChaincode(name string, version string, orderer string, channel string, args string, policy string) *ginkgomon.Runner {

integration/runner/peer_test.go

@@ -180,11 +180,7 @@ var _ = Describe("Peer", func() {
 		installCC.ConfigDir = tempDir
 		installCC.LogLevel = "debug"
 		installCC.MSPConfigPath = filepath.Join(cryptoDir, "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		installCC.ExecPath = os.Getenv("PATH")
-		iRunner := installCC.InstallChaincode("mytest", "1.0", "github.com/hyperledger/fabric/integration/chaincode/simple/cmd")
-		err = execute(iRunner)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(iRunner.Err()).To(gbytes.Say(`\QInstalled remotely response:<status:200 payload:"OK" >\E`))
+		installCC.InstallChaincode("mytest", "1.0", "github.com/hyperledger/fabric/integration/chaincode/simple/cmd")
 		Expect(peerRunner.Err()).To(gbytes.Say(`\QInstalled Chaincode [mytest] Version [1.0] to peer\E`))
 
 		By("list installed chaincode")

integration/world/config.go

@@ -418,9 +418,7 @@ func (w *World) SetupChannel(d Deployment, peers []string) error {
 
 		p.ExecPath = d.Chaincode.ExecPath
 		p.GoPath = d.Chaincode.GoPath
-		adminRunner = p.InstallChaincode(d.Chaincode.Name, d.Chaincode.Version, d.Chaincode.Path)
-		execute(adminRunner)
-		Expect(adminRunner.Err()).To(gbytes.Say(`\QInstalled remotely response:<status:200 payload:"OK" >\E`))
+		p.InstallChaincode(d.Chaincode.Name, d.Chaincode.Version, d.Chaincode.Path)
 	}
 
 	p = w.Components.Peer()