From 364a385a2fa6af0e41e3b2a8e635d87b65b2176c Mon Sep 17 00:00:00 2001 From: benoit Date: Tue, 19 Dec 2023 16:56:52 +0100 Subject: [PATCH] Fix cluster_has_leader in archive recovery tests Since replication states are also over-ridden for standby_leaders since the commit fixing cluster_node_count, the tests had to be adapted. --- tests/test_cluster_has_leader.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/test_cluster_has_leader.py b/tests/test_cluster_has_leader.py index 1421ec5..f152c0d 100644 --- a/tests/test_cluster_has_leader.py +++ b/tests/test_cluster_has_leader.py @@ -122,11 +122,18 @@ def cluster_has_leader_ko_standby_leader_archiving( @pytest.mark.usefixtures("cluster_has_leader_ko_standby_leader_archiving") def test_cluster_has_leader_ko_standby_leader_archiving( - runner: CliRunner, patroni_api: PatroniAPI + runner: CliRunner, patroni_api: PatroniAPI, old_replica_state: bool ) -> None: result = runner.invoke(main, ["-e", patroni_api.endpoint, "cluster_has_leader"]) - assert ( - result.stdout - == "CLUSTERHASLEADER WARNING - The cluster has no running leader or the standby leader is in archive recovery. | has_leader=1;;@0 is_leader=0 is_standby_leader=1 is_standby_leader_in_arc_rec=1;@1:1\n" - ) - assert result.exit_code == 1 + if old_replica_state: + assert ( + result.stdout + == "CLUSTERHASLEADER OK - The cluster has a running leader. | has_leader=1;;@0 is_leader=0 is_standby_leader=1 is_standby_leader_in_arc_rec=0;@1:1\n" + ) + assert result.exit_code == 0 + else: + assert ( + result.stdout + == "CLUSTERHASLEADER WARNING - The cluster has no running leader or the standby leader is in archive recovery. | has_leader=1;;@0 is_leader=0 is_standby_leader=1 is_standby_leader_in_arc_rec=1;@1:1\n" + ) + assert result.exit_code == 1