From 9d3f15b943d116afbe5190de37f99c45c09f7fce Mon Sep 17 00:00:00 2001
From: Matthew Sykes <sykesmat@us.ibm.com>
Date: Sat, 19 May 2018 23:10:47 -0400
Subject: [PATCH] [FAB-10232] Setup and teardown in Before/AfterEach

Change-Id: I9487d30e8d961dd114f4fb1b76d30c5f36c0283b
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
---
 integration/runner/idemixgen_test.go | 84 ++++++++++++++++------------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/integration/runner/idemixgen_test.go b/integration/runner/idemixgen_test.go
index 715384fc2f3..367c04b5120 100644
--- a/integration/runner/idemixgen_test.go
+++ b/integration/runner/idemixgen_test.go
@@ -16,18 +16,20 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/tedsuo/ifrit"
+	"github.com/tedsuo/ifrit/ginkgomon"
 )
 
 var _ = Describe("Idemixgen", func() {
-	var idemixgen *runner.Idemixgen
-	var tempDir string
-	var err error
-	tempDir, err = ioutil.TempDir("", "idemix")
-	if err != nil {
-		Fail("Failed to create test directory")
-	}
+	var (
+		idemixgen *runner.Idemixgen
+		tempDir   string
+	)
 
 	BeforeEach(func() {
+		var err error
+		tempDir, err = ioutil.TempDir("", "idemix")
+		Expect(err).NotTo(HaveOccurred())
+
 		idemixgen = &runner.Idemixgen{
 			Path:     components.Paths["idemixgen"],
 			EnrollID: "IdeMixUser1",
@@ -36,43 +38,53 @@ var _ = Describe("Idemixgen", func() {
 		}
 	})
 
-	It("creates a runner that calls idemixgen ca-keygen", func() {
-		igRunner := idemixgen.CAKeyGen()
-		process := ifrit.Invoke(igRunner)
-		Eventually(process.Ready()).Should(BeClosed())
-		Eventually(process.Wait()).Should(Receive(BeNil()))
-		Expect(igRunner.ExitCode()).To(Equal(0))
-
-		Expect(filepath.Join(tempDir, "ca")).To(BeADirectory())
-		Expect(filepath.Join(tempDir, "msp")).To(BeADirectory())
+	AfterEach(func() {
+		os.RemoveAll(tempDir)
 	})
 
-	Context("when idemixgen ca-keygen fails", func() {
-		It("returns an error", func() {
-			igRunner := idemixgen.CAKeyGen("bogus")
+	Describe("CAKeyGen", func() {
+		It("creates a runner that calls idemixgen ca-keygen", func() {
+			igRunner := idemixgen.CAKeyGen()
 			process := ifrit.Invoke(igRunner)
-			Eventually(process.Wait()).Should(Receive(HaveOccurred()))
-		})
-	})
+			Eventually(process.Ready()).Should(BeClosed())
+			Eventually(process.Wait()).Should(Receive(BeNil()))
+			Expect(igRunner.ExitCode()).To(Equal(0))
 
-	It("creates a runner that calls idemixgen signerconfig", func() {
-		igRunner := idemixgen.SignerConfig()
-		process := ifrit.Invoke(igRunner)
-		Eventually(process.Ready()).Should(BeClosed())
-		Eventually(process.Wait()).Should(Receive(BeNil()))
-		Expect(igRunner.ExitCode()).To(Equal(0))
+			Expect(filepath.Join(tempDir, "ca")).To(BeADirectory())
+			Expect(filepath.Join(tempDir, "msp")).To(BeADirectory())
+		})
 
-		Expect(filepath.Join(tempDir, "user")).To(BeADirectory())
+		Context("when idemixgen ca-keygen fails", func() {
+			It("returns an error", func() {
+				igRunner := idemixgen.CAKeyGen("bogus")
+				process := ifrit.Invoke(igRunner)
+				Eventually(process.Wait()).Should(Receive(HaveOccurred()))
+			})
+		})
 	})
 
-	Context("when idemixgen signerconfig fails", func() {
-		It("returns an error", func() {
-			igRunner := idemixgen.SignerConfig("bogus")
+	Describe("SignerConfig", func() {
+		BeforeEach(func() {
+			keygen := ginkgomon.Invoke(idemixgen.CAKeyGen())
+			Eventually(keygen.Wait()).Should(Receive(BeNil()))
+		})
+
+		It("creates a runner that calls idemixgen signerconfig", func() {
+			igRunner := idemixgen.SignerConfig()
 			process := ifrit.Invoke(igRunner)
-			Eventually(process.Wait()).Should(Receive(HaveOccurred()))
+			Eventually(process.Ready()).Should(BeClosed())
+			Eventually(process.Wait()).Should(Receive(BeNil()))
+			Expect(igRunner.ExitCode()).To(Equal(0))
+
+			Expect(filepath.Join(tempDir, "user")).To(BeADirectory())
 		})
-	})
 
-	// cleanup
-	os.RemoveAll(tempDir)
+		Context("when idemixgen signerconfig fails", func() {
+			It("returns an error", func() {
+				igRunner := idemixgen.SignerConfig("bogus")
+				process := ifrit.Invoke(igRunner)
+				Eventually(process.Wait()).Should(Receive(HaveOccurred()))
+			})
+		})
+	})
 })