From d03e9eb43edc965edcd2474758a337a2ae2ac072 Mon Sep 17 00:00:00 2001
From: zedroman <ilgovskiy@mail.ru>
Date: Tue, 26 Apr 2022 11:57:34 +0000
Subject: [PATCH] ducktape: GroupMetricsTest check if leader exists

---
 tests/rptest/tests/group_membership_test.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/rptest/tests/group_membership_test.py b/tests/rptest/tests/group_membership_test.py
index 81c52e88aa73..46b161962afd 100644
--- a/tests/rptest/tests/group_membership_test.py
+++ b/tests/rptest/tests/group_membership_test.py
@@ -326,8 +326,10 @@ def transfer_leadership(new_leader):
                                          partition=0,
                                          target=self.redpanda.idx(new_leader))
             for _ in range(3):  # re-check a few times
-                leader = self.redpanda.get_node(get_group_leader())
-                if leader == new_leader:
+                leader = get_group_leader()
+                self.logger.debug(f"Current leader: {leader}")
+                if leader != -1 and self.redpanda.get_node(
+                        leader) == new_leader:
                     return True
                 time.sleep(1)
             return False