UpdateOrdererConfigSession returns without waiting

For consistency with the rest of the *Session functions in the nwo
package, UpdateOrdererConfigSession will return the created command
session without waiting for it to complete.

To prevent the serialized block from getting deleted, the network root
directory was used as the parent of the temp directory for the update
block and the defer statement to remove the temp dir was removed from
the function.

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

Author: sykesm

integration/nwo/configblock.go

@@ -27,7 +27,7 @@ import (
 
 // GetConfigBlock retrieves the current config block for a channel
 func GetConfigBlock(n *Network, peer *Peer, orderer *Orderer, channel string) *common.Block {
-	tempDir, err := ioutil.TempDir("", "getConfigBlock")
+	tempDir, err := ioutil.TempDir(n.RootDir, "getConfigBlock")
 	Expect(err).NotTo(HaveOccurred())
 	defer os.RemoveAll(tempDir)
 
@@ -141,7 +141,7 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 // has completed. If an orderer is not provided, the current config block will
 // be fetched from the peer.
 func CurrentConfigBlockNumber(n *Network, peer *Peer, orderer *Orderer, channel string) uint64 {
-	tempDir, err := ioutil.TempDir("", "currentConfigBlock")
+	tempDir, err := ioutil.TempDir(n.RootDir, "currentConfigBlock")
 	Expect(err).NotTo(HaveOccurred())
 	defer os.RemoveAll(tempDir)
 
@@ -200,7 +200,7 @@ func FetchConfigBlock(n *Network, peer *Peer, orderer *Orderer, channel string,
 // UpdateOrdererConfig computes, signs, and submits a configuration update which requires orderers signature and waits
 // for the update to complete.
 func UpdateOrdererConfig(n *Network, orderer *Orderer, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) {
-	tempDir, err := ioutil.TempDir("", "updateConfig")
+	tempDir, err := ioutil.TempDir(n.RootDir, "updateConfig")
 	Expect(err).NotTo(HaveOccurred())
 	updateFile := filepath.Join(tempDir, "update.pb")
 	defer os.RemoveAll(tempDir)
@@ -230,14 +230,13 @@ func UpdateOrdererConfig(n *Network, orderer *Orderer, channel string, current,
 	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
 }
 
-// UpdateOrdererConfigSession computes, signs, and submits a configuration update which requires orderers signature
-// and waits for the update to complete. The command session is returned to the caller to enable ExitCode and command
-// output assertions.
+// UpdateOrdererConfigSession computes, signs, and submits a configuration
+// update which requires orderer signatures. The caller should wait on the
+// returned seession retrieve the exit code.
 func UpdateOrdererConfigSession(n *Network, orderer *Orderer, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) *gexec.Session {
-	tempDir, err := ioutil.TempDir("", "updateConfig")
+	tempDir, err := ioutil.TempDir(n.RootDir, "updateConfig")
 	Expect(err).NotTo(HaveOccurred())
 	updateFile := filepath.Join(tempDir, "update.pb")
-	defer os.RemoveAll(tempDir)
 
 	ComputeUpdateOrdererConfig(updateFile, n, channel, current, updated, submitter, additionalSigners...)
 
@@ -249,7 +248,6 @@ func UpdateOrdererConfigSession(n *Network, orderer *Orderer, channel string, cu
 		ClientAuth: n.ClientAuthRequired,
 	})
 	Expect(err).NotTo(HaveOccurred())
-	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit())
 	return sess
 }
 

integration/raft/config_test.go

@@ -231,7 +231,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 			}
 
 			sess := nwo.UpdateOrdererConfigSession(network, orderer, channel, config, updatedConfig, peer1org1, orderer)
-			Expect(sess.ExitCode()).NotTo(Equal(0))
+			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
 			Expect(sess.Err).To(gbytes.Say(`invalid new config metdadata: ElectionTick \(10\) must be greater than HeartbeatTick \(10\)`))
 		})
 	})
@@ -819,7 +819,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 			current, updated := nwo.ConsenterRemover(network, peer, o2, network.SystemChannel.Name, certificatesOfOrderers[1].oldCert)
 			Eventually(func() []byte {
 				sess := nwo.UpdateOrdererConfigSession(network, o2, network.SystemChannel.Name, current, updated, peer, o2)
-				Expect(sess.ExitCode()).NotTo(BeZero())
+				Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
 				return sess.Err.Contents()
 			}, network.EventuallyTimeout).Should(ContainSubstring("2 out of 3 nodes are alive, configuration will result in quorum loss"))
 
@@ -837,7 +837,7 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 				},
 			)
 			sess := nwo.UpdateOrdererConfigSession(network, o2, network.SystemChannel.Name, current, updated, peer, o2)
-			Expect(sess.ExitCode()).NotTo(BeZero())
+			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(1))
 			Expect(string(sess.Err.Contents())).To(ContainSubstring("2 out of 3 nodes are alive, configuration will result in quorum loss"))
 		})
 	})

integration/raft/migration_test.go

@@ -1106,7 +1106,7 @@ func checkPeerDeliverRequest(o *nwo.Orderer, submitter *nwo.Peer, network *nwo.N
 
 func updateOrdererConfigFailed(n *nwo.Network, orderer *nwo.Orderer, channel string, current, updated *common.Config, peer *nwo.Peer, additionalSigners ...*nwo.Orderer) {
 	sess := nwo.UpdateOrdererConfigSession(n, orderer, channel, current, updated, peer, additionalSigners...)
-	Expect(sess.ExitCode()).NotTo(Equal(0))
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(1))
 	Expect(sess.Err).NotTo(gbytes.Say("Successfully submitted channel update"))
 }