From 0d72b9039a54f5ee8dda7da040c9f9463b2a84de Mon Sep 17 00:00:00 2001
From: Facundo Medica <14063057+facundomedica@users.noreply.github.com>
Date: Mon, 23 Jan 2023 17:04:32 -0300
Subject: [PATCH] test: fix flaky test TestTxLeaveGroup (#14738)

---
 tests/e2e/group/tx.go | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tests/e2e/group/tx.go b/tests/e2e/group/tx.go
index bd54fc9b2b..6b6265c6c7 100644
--- a/tests/e2e/group/tx.go
+++ b/tests/e2e/group/tx.go
@@ -2173,14 +2173,27 @@ func (s *E2ETestSuite) TestTxLeaveGroup() {
 		),
 	)
 	s.Require().NoError(err, out.String())
-	s.Require().NoError(s.network.WaitForNextBlock())
 
-	out, err = clitestutil.ExecTestCLICmd(clientCtx, client.QueryGroupPoliciesByGroupCmd(), []string{groupID, fmt.Sprintf("--%s=json", flags.FlagOutput)})
+	err = s.network.RetryForBlocks(func() error {
+		out, err = clitestutil.ExecTestCLICmd(clientCtx, client.QueryGroupPoliciesByGroupCmd(), []string{groupID, fmt.Sprintf("--%s=json", flags.FlagOutput)})
+		if err != nil {
+			return err
+		}
+
+		var resp group.QueryGroupPoliciesByGroupResponse
+		err = clientCtx.Codec.UnmarshalJSON(out.Bytes(), &resp)
+		if err != nil {
+			return err
+		}
+
+		if len(resp.GroupPolicies) != 1 {
+			return fmt.Errorf("expected 1 group policy, got %d", len(resp.GroupPolicies))
+		}
+
+		return nil
+	}, 3)
+
 	s.Require().NoError(err, out.String())
-	s.Require().NotNil(out)
-	var resp group.QueryGroupPoliciesByGroupResponse
-	s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &resp))
-	s.Require().Len(resp.GroupPolicies, 1)
 
 	testCases := []struct {
 		name         string