From b3af43b27fa8f0d40ce213db451d84ad5c331d2e Mon Sep 17 00:00:00 2001
From: naisila <nicypp@gmail.com>
Date: Mon, 13 Nov 2023 10:52:53 +0300
Subject: [PATCH] Remove coordinator removal from add_coordinator test

Use remove_coordinator_from_metadata test where needed
---
 src/test/regress/citus_tests/run_test.py      |  9 +++++-
 .../multi_tenant_isolation_nonblocking.out    | 31 -------------------
 .../multi_tenant_isolation_nonblocking.sql    |  6 ----
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/src/test/regress/citus_tests/run_test.py b/src/test/regress/citus_tests/run_test.py
index 20ed65e6e..db35c8b59 100755
--- a/src/test/regress/citus_tests/run_test.py
+++ b/src/test/regress/citus_tests/run_test.py
@@ -203,7 +203,14 @@ DEPS = {
     ),
     "multi_tenant_isolation_nonblocking": TestDeps(
         "minimal_schedule",
-        ["multi_data_types"],
+        ["multi_data_types", "remove_coordinator_from_metadata"],
+    ),
+    "citus_split_shard_columnar_partitioned": TestDeps(
+        "minimal_schedule",
+        ["remove_coordinator_from_metadata"],
+    ),
+    "add_coordinator": TestDeps(
+        "minimal_schedule", ["remove_coordinator_from_metadata"], repeatable=False
     ),
 }
 
diff --git a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out
index 0ee1b5319..3daac7dac 100644
--- a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out
+++ b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out
@@ -11,13 +11,6 @@ CREATE SCHEMA "Tenant Isolation";
 SET search_path to "Tenant Isolation";
 CREATE ROLE mx_isolation_role_ent WITH LOGIN;
 GRANT ALL ON SCHEMA "Tenant Isolation", public TO mx_isolation_role_ent;
-\c - postgres - :master_port
-SELECT 1 FROM master_remove_node('localhost', :master_port);
- ?column?
----------------------------------------------------------------------
-        1
-(1 row)
-
 -- connect with this new role
 \c - mx_isolation_role_ent - :master_port
 SET search_path to "Tenant Isolation";
@@ -1289,27 +1282,3 @@ SELECT public.wait_for_resource_cleanup();
 
 (1 row)
 
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$);
- result
----------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
-
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$);
- result
----------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
-
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);
- result
----------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
-
diff --git a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql
index e209c9271..994f29f0a 100644
--- a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql
+++ b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql
@@ -16,9 +16,6 @@ SET search_path to "Tenant Isolation";
 CREATE ROLE mx_isolation_role_ent WITH LOGIN;
 GRANT ALL ON SCHEMA "Tenant Isolation", public TO mx_isolation_role_ent;
 
-\c - postgres - :master_port
-SELECT 1 FROM master_remove_node('localhost', :master_port);
-
 -- connect with this new role
 \c - mx_isolation_role_ent - :master_port
 SET search_path to "Tenant Isolation";
@@ -613,6 +610,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placem
 
 -- make sure we don't have any replication objects leftover on the nodes
 SELECT public.wait_for_resource_cleanup();
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$);
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$);
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);