From 602c8c1206ad1e98cde4d2c7d4431a85c5c081f4 Mon Sep 17 00:00:00 2001
From: gurkanindibay <gindibay@microsoft.com>
Date: Mon, 25 Mar 2024 18:23:22 +0300
Subject: [PATCH] Removes unnecessary changes

---
 .../expected/multi_follower_sanity_check.out  | 23 -------------------
 src/test/regress/multi_follower_schedule      |  1 +
 src/test/regress/multi_mx_schedule            |  1 +
 src/test/regress/sql/multi_extension.sql      | 11 ---------
 .../sql/multi_follower_sanity_check.sql       | 11 ---------
 5 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/src/test/regress/expected/multi_follower_sanity_check.out b/src/test/regress/expected/multi_follower_sanity_check.out
index 4fee237fc..6124f26c9 100644
--- a/src/test/regress/expected/multi_follower_sanity_check.out
+++ b/src/test/regress/expected/multi_follower_sanity_check.out
@@ -1,27 +1,4 @@
 -- check that the nodes are all in read-only mode and rejecting write queries
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
- pg_reload_conf
----------------------------------------------------------------------
- t
-(1 row)
-
-\c - - - :worker_1_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
- pg_reload_conf
----------------------------------------------------------------------
- t
-(1 row)
-
-\c - - - :worker_2_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
- pg_reload_conf
----------------------------------------------------------------------
- t
-(1 row)
-
 \c - - - :follower_master_port
 ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
 SELECT pg_reload_conf();
diff --git a/src/test/regress/multi_follower_schedule b/src/test/regress/multi_follower_schedule
index c1f0ac6cb..686d6a38c 100644
--- a/src/test/regress/multi_follower_schedule
+++ b/src/test/regress/multi_follower_schedule
@@ -1,3 +1,4 @@
+test: enable_ddl_propagation
 test: multi_follower_sanity_check
 test: follower_single_node
 test: multi_follower_select_statements
diff --git a/src/test/regress/multi_mx_schedule b/src/test/regress/multi_mx_schedule
index 6654b4ab0..6e8b652e4 100644
--- a/src/test/regress/multi_mx_schedule
+++ b/src/test/regress/multi_mx_schedule
@@ -13,6 +13,7 @@
 # ---
 # Tests around schema changes, these are run first, so there's no preexisting objects.
 # ---
+test: enable_ddl_propagation
 test: multi_extension
 test: multi_test_helpers multi_test_helpers_superuser
 test: multi_mx_node_metadata
diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql
index f8168b07f..8cbbbc3ed 100644
--- a/src/test/regress/sql/multi_extension.sql
+++ b/src/test/regress/sql/multi_extension.sql
@@ -7,18 +7,7 @@
 -- not done yet.
 --
 -- Upgrade tests verify the objects are added in citus_finish_pg_upgrade()
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
 
-\c - - - :worker_1_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
-\c - - - :worker_2_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
-\c - - - :master_port
 SET citus.next_shard_id TO 580000;
 CREATE SCHEMA multi_extension;
 
diff --git a/src/test/regress/sql/multi_follower_sanity_check.sql b/src/test/regress/sql/multi_follower_sanity_check.sql
index eb8c2ee33..bdd0f5b55 100644
--- a/src/test/regress/sql/multi_follower_sanity_check.sql
+++ b/src/test/regress/sql/multi_follower_sanity_check.sql
@@ -1,15 +1,4 @@
 -- check that the nodes are all in read-only mode and rejecting write queries
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
-\c - - - :worker_1_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
-\c - - - :worker_2_port
-ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
-SELECT pg_reload_conf();
-
 \c - - - :follower_master_port
 ALTER SYSTEM SET citus.enable_ddl_propagation = 'true';
 SELECT pg_reload_conf();