fix gateway integration tests error (hyperledger#4584)

Signed-off-by: Fedor Partanskiy <pfi79@mail.ru>
C0rWin · Dec 25, 2023 · 4201eb5 · 4201eb5
1 parent 073b570
commit 4201eb5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 0 deletions.
diff --git a/integration/devmode/devmode_test.go b/integration/devmode/devmode_test.go
@@ -232,6 +232,7 @@ func ApproveChaincodeForMyOrg(n *nwo.Network, channel string, orderer *nwo.Order
 				InitRequired:        chaincode.InitRequired,
 				CollectionsConfig:   chaincode.CollectionsConfig,
 				ClientAuth:          n.ClientAuthRequired,
+				WaitForEventTimeout: n.EventuallyTimeout,
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))

diff --git a/integration/e2e/acl_test.go b/integration/e2e/acl_test.go
@@ -148,6 +148,7 @@ var _ = Describe("EndToEndACL", func() {
 			ChannelConfigPolicy: chaincode.ChannelConfigPolicy,
 			InitRequired:        chaincode.InitRequired,
 			CollectionsConfig:   chaincode.CollectionsConfig,
+			WaitForEventTimeout: network.EventuallyTimeout,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit())
@@ -166,6 +167,7 @@ var _ = Describe("EndToEndACL", func() {
 			ChannelConfigPolicy: chaincode.ChannelConfigPolicy,
 			InitRequired:        chaincode.InitRequired,
 			CollectionsConfig:   chaincode.CollectionsConfig,
+			WaitForEventTimeout: network.EventuallyTimeout,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit())
@@ -192,6 +194,7 @@ var _ = Describe("EndToEndACL", func() {
 			InitRequired:        chaincode.InitRequired,
 			CollectionsConfig:   chaincode.CollectionsConfig,
 			PeerAddresses:       []string{network.PeerAddress(org1Peer0, nwo.ListenPort)},
+			WaitForEventTimeout: network.EventuallyTimeout,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit())
@@ -279,6 +282,7 @@ var _ = Describe("EndToEndACL", func() {
 			InitRequired:        chaincode.InitRequired,
 			CollectionsConfig:   chaincode.CollectionsConfig,
 			PeerAddresses:       peerAddresses,
+			WaitForEventTimeout: network.EventuallyTimeout,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit())

diff --git a/integration/e2e/e2e_test.go b/integration/e2e/e2e_test.go
@@ -700,6 +700,7 @@ var _ = Describe("EndToEnd", func() {
 				InitRequired:        chaincode.InitRequired,
 				CollectionsConfig:   chaincode.CollectionsConfig,
 				ClientAuth:          network.ClientAuthRequired,
+				WaitForEventTimeout: network.EventuallyTimeout,
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess.Err, network.EventuallyTimeout).Should(gbytes.Say(`Error: proposal failed with status: 500`))

diff --git a/integration/nwo/commands/peer.go b/integration/nwo/commands/peer.go
@@ -330,6 +330,7 @@ type ChaincodeApproveForMyOrg struct {
 	PeerAddresses       []string
 	WaitForEvent        bool
 	ClientAuth          bool
+	WaitForEventTimeout time.Duration
 }
 
 func (c ChaincodeApproveForMyOrg) SessionName() string {
@@ -367,6 +368,10 @@ func (c ChaincodeApproveForMyOrg) Args() []string {
 		args = append(args, "--peerAddresses", p)
 	}
 
+	if c.WaitForEventTimeout > 30*time.Second {
+		args = append(args, "--waitForEventTimeout", c.WaitForEventTimeout.String())
+	}
+
 	return args
 }
 
@@ -471,6 +476,7 @@ type ChaincodeCommit struct {
 	PeerAddresses       []string
 	WaitForEvent        bool
 	ClientAuth          bool
+	WaitForEventTimeout time.Duration
 }
 
 func (c ChaincodeCommit) SessionName() string {
@@ -502,6 +508,9 @@ func (c ChaincodeCommit) Args() []string {
 	if c.ClientAuth {
 		args = append(args, "--clientauth")
 	}
+	if c.WaitForEventTimeout > 30*time.Second {
+		args = append(args, "--waitForEventTimeout", c.WaitForEventTimeout.String())
+	}
 	return args
 }
 

diff --git a/integration/nwo/deploy.go b/integration/nwo/deploy.go
@@ -182,6 +182,7 @@ func ApproveChaincodeForMyOrg(n *Network, channel string, orderer *Orderer, chai
 				InitRequired:        chaincode.InitRequired,
 				CollectionsConfig:   chaincode.CollectionsConfig,
 				ClientAuth:          n.ClientAuthRequired,
+				WaitForEventTimeout: n.EventuallyTimeout,
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
@@ -238,6 +239,7 @@ func CommitChaincode(n *Network, channel string, orderer *Orderer, chaincode Cha
 		CollectionsConfig:   chaincode.CollectionsConfig,
 		PeerAddresses:       peerAddresses,
 		ClientAuth:          n.ClientAuthRequired,
+		WaitForEventTimeout: n.EventuallyTimeout,
 	})
 	Expect(err).NotTo(HaveOccurred())
 	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))

diff --git a/integration/pvtdata/pvtdata_test.go b/integration/pvtdata/pvtdata_test.go
@@ -997,6 +997,7 @@ func approveChaincodeForMyOrgExpectErr(n *nwo.Network, orderer *nwo.Orderer, cha
 				ChannelConfigPolicy: chaincode.ChannelConfigPolicy,
 				InitRequired:        chaincode.InitRequired,
 				CollectionsConfig:   chaincode.CollectionsConfig,
+				WaitForEventTimeout: n.EventuallyTimeout,
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit())

diff --git a/integration/smartbft/smartbft_test.go b/integration/smartbft/smartbft_test.go
@@ -1783,6 +1783,7 @@ var _ = Describe("EndToEnd Smart BFT configuration test", func() {
 				InitRequired:        chaincode.InitRequired,
 				CollectionsConfig:   chaincode.CollectionsConfig,
 				ClientAuth:          network.ClientAuthRequired,
+				WaitForEventTimeout: network.EventuallyTimeout,
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(0))