Merge "Fix intermittent test failure in acl e2e test" into release-1.4

hyperledger · Jan 15, 2019 · 8f9e8c8 · 8f9e8c8
2 parents d885dec + 3e6641d
commit 8f9e8c8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/integration/nwo/configblock.go b/integration/nwo/configblock.go
@@ -105,9 +105,12 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
 	Expect(sess.Err).To(gbytes.Say("Successfully submitted channel update"))
 
-	// wait for the block to be committed
-	ccb := func() uint64 { return CurrentConfigBlockNumber(n, submitter, orderer, channel) }
-	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
+	// wait for the block to be committed to all peers that
+	// have joined the channel
+	for _, peer := range n.PeersWithChannel(channel) {
+		ccb := func() uint64 { return CurrentConfigBlockNumber(n, peer, orderer, channel) }
+		Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
+	}
 }
 
 // UpdateOrdererConfig computes, signs, and submits a configuration update which requires orderers signature and waits