Test failure fix

src/test/regress/expected/multi_cluster_management.out

@@ -1258,40 +1258,3 @@ SELECT bool_and(hasmetadata) AND bool_and(metadatasynced) FROM pg_dist_node WHER
  t
 (1 row)
 
--- Remove extra nodes added, this causes GetLocalNodeId() to behave incorrectly in other tests.
-SELECT master_remove_node('localhost', 8887);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT master_remove_node('localhost', 9995);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT master_remove_node('localhost', 9992);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT master_remove_node('localhost', 9998);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT master_remove_node('localhost', 9997);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT master_remove_node('localhost', 8888);
- master_remove_node
----------------------------------------------------------------------
-
-(1 row)
-

src/test/regress/expected/worker_split_binary_copy_test.out

@@ -3,6 +3,43 @@ SET search_path TO worker_split_binary_copy_test;
 SET citus.shard_count TO 1;
 SET citus.shard_replication_factor TO 1;
 SET citus.next_shard_id TO 81060000;
+-- Remove extra nodes added, otherwise GetLocalNodeId() does not bahave correctly.
+SELECT citus_remove_node('localhost', 8887);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT citus_remove_node('localhost', 9995);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT citus_remove_node('localhost', 9992);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT citus_remove_node('localhost', 9998);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT citus_remove_node('localhost', 9997);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT citus_remove_node('localhost', 8888);
+ citus_remove_node
+---------------------------------------------------------------------
+
+(1 row)
+
 -- BEGIN: Create distributed table and insert data.
 CREATE TABLE worker_split_binary_copy_test.shard_to_split_copy (
 	l_orderkey bigint not null,

src/test/regress/sql/multi_cluster_management.sql

@@ -511,11 +511,3 @@ SELECT start_metadata_sync_to_all_nodes();
 
 -- verify that at the end of this file, all primary nodes have metadata synced
 SELECT bool_and(hasmetadata) AND bool_and(metadatasynced) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary';
-
--- Remove extra nodes added, this causes GetLocalNodeId() to behave incorrectly in other tests.
-SELECT master_remove_node('localhost', 8887);
-SELECT master_remove_node('localhost', 9995);
-SELECT master_remove_node('localhost', 9992);
-SELECT master_remove_node('localhost', 9998);
-SELECT master_remove_node('localhost', 9997);
-SELECT master_remove_node('localhost', 8888);

src/test/regress/sql/worker_split_binary_copy_test.sql

@@ -4,6 +4,14 @@ SET citus.shard_count TO 1;
 SET citus.shard_replication_factor TO 1;
 SET citus.next_shard_id TO 81060000;
 
+-- Remove extra nodes added, otherwise GetLocalNodeId() does not bahave correctly.
+SELECT citus_remove_node('localhost', 8887);
+SELECT citus_remove_node('localhost', 9995);
+SELECT citus_remove_node('localhost', 9992);
+SELECT citus_remove_node('localhost', 9998);
+SELECT citus_remove_node('localhost', 9997);
+SELECT citus_remove_node('localhost', 8888);
+
 -- BEGIN: Create distributed table and insert data.
 CREATE TABLE worker_split_binary_copy_test.shard_to_split_copy (
 	l_orderkey bigint not null,