citus_non_blocking_split_shard_cleanup, citus_non_blocking_split_shards and logical_replication ARE NOT FLAKY

src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out

@@ -113,8 +113,6 @@ SELECT public.wait_for_resource_cleanup();
 
 (1 row)
 
--- try to get flaky result
-SET search_path TO "citus_split_test_schema";
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";
 -- Replication slots should be cleaned up

src/test/regress/expected/citus_non_blocking_split_shards.out

@@ -611,29 +611,26 @@ SELECT COUNT(*) FROM colocated_dist_table;
 --BEGIN : Cleanup
 \c - postgres - :master_port
 -- make sure we don't have any replication objects leftover on the workers
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$);
- result
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_replication_slots$$);
+ run_command_on_workers
 ---------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
+ (localhost,57637,t,0)
+ (localhost,57638,t,0)
+(2 rows)
 
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$);
- result
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_publication$$);
+ run_command_on_workers
 ---------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
+ (localhost,57637,t,0)
+ (localhost,57638,t,0)
+(2 rows)
 
-SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);
- result
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_subscription$$);
+ run_command_on_workers
 ---------------------------------------------------------------------
- 0
- 0
- 0
-(3 rows)
+ (localhost,57637,t,0)
+ (localhost,57638,t,0)
+(2 rows)
 
 ALTER SYSTEM RESET citus.defer_shard_delete_interval;
 SELECT pg_reload_conf();

src/test/regress/expected/logical_replication.out

@@ -93,8 +93,6 @@ SELECT public.wait_for_resource_cleanup();
 
 (1 row)
 
--- try to get flaky result
-SET search_path TO logical_replication;
 -- the subscription is still there, as there is no cleanup record for it
 -- we have created it manually
 SELECT subname from pg_subscription;

src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql

@@ -80,8 +80,6 @@ SELECT pg_catalog.citus_split_shard_by_split_points(
     'force_logical');
 
 SELECT public.wait_for_resource_cleanup();
--- try to get flaky result
-SET search_path TO "citus_split_test_schema";
 
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";

src/test/regress/sql/citus_non_blocking_split_shards.sql

@@ -311,9 +311,9 @@ SELECT COUNT(*) FROM colocated_dist_table;
 --BEGIN : Cleanup
 \c - postgres - :master_port
 -- make sure we don't have any replication objects leftover on the workers
-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$$);
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_replication_slots$$);
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_publication$$);
+SELECT run_command_on_workers($$SELECT count(*) FROM pg_subscription$$);
 
 ALTER SYSTEM RESET citus.defer_shard_delete_interval;
 SELECT pg_reload_conf();

src/test/regress/sql/logical_replication.sql

@@ -54,8 +54,6 @@ SET search_path TO logical_replication;
 select citus_move_shard_placement(6830002, 'localhost', :worker_1_port, 'localhost', :worker_2_port, 'force_logical');
 
 SELECT public.wait_for_resource_cleanup();
--- try to get flaky result
-SET search_path TO logical_replication;
 
 -- the subscription is still there, as there is no cleanup record for it
 -- we have created it manually