From fa07b428e099d4310b6431db3d41784d177bc47a Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Tue, 16 Jan 2024 14:11:28 +0300 Subject: [PATCH] debug: modify a few more tests make sure that fleky-test-detection job is still active for non-upgrade tests --- src/test/regress/expected/multi_extension.out | 6 ++++++ src/test/regress/expected/multi_test_helpers.out | 8 +++++++- src/test/regress/expected/upgrade_columnar_after.out | 6 ++++++ src/test/regress/sql/multi_extension.sql | 2 ++ src/test/regress/sql/multi_test_helpers.sql | 2 ++ src/test/regress/sql/upgrade_columnar_after.sql | 2 ++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 60e283800..4ad8db2c6 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -7,6 +7,12 @@ -- not done yet. -- -- Upgrade tests verify the objects are added in citus_finish_pg_upgrade() +SELECT 1; + ?column? +--------------------------------------------------------------------- + 1 +(1 row) + SET citus.next_shard_id TO 580000; CREATE SCHEMA multi_extension; SELECT $definition$ diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out index 70a541d2a..7786ec7ba 100644 --- a/src/test/regress/expected/multi_test_helpers.out +++ b/src/test/regress/expected/multi_test_helpers.out @@ -1,4 +1,10 @@ -- File to create functions and helpers needed for subsequent tests +SELECT 1; + ?column? +--------------------------------------------------------------------- + 1 +(1 row) + -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ @@ -625,4 +631,4 @@ BEGIN ) q2 JOIN pg_dist_node USING (nodeid); END; -$func$ LANGUAGE plpgsql; \ No newline at end of file +$func$ LANGUAGE plpgsql; diff --git a/src/test/regress/expected/upgrade_columnar_after.out b/src/test/regress/expected/upgrade_columnar_after.out index 768a057f9..d94925934 100644 --- a/src/test/regress/expected/upgrade_columnar_after.out +++ b/src/test/regress/expected/upgrade_columnar_after.out @@ -1,3 +1,9 @@ +SELECT 1; + ?column? +---------- + 1 +(1 row) + SET search_path TO upgrade_columnar, public; -- test we retained data SELECT * FROM test_retains_data ORDER BY a; diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 8cbbbc3ed..5c3ab08c0 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -8,6 +8,8 @@ -- -- Upgrade tests verify the objects are added in citus_finish_pg_upgrade() +SELECT 1; + SET citus.next_shard_id TO 580000; CREATE SCHEMA multi_extension; diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql index e67b782a5..ce5a5106e 100644 --- a/src/test/regress/sql/multi_test_helpers.sql +++ b/src/test/regress/sql/multi_test_helpers.sql @@ -1,5 +1,7 @@ -- File to create functions and helpers needed for subsequent tests +SELECT 1; + -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ diff --git a/src/test/regress/sql/upgrade_columnar_after.sql b/src/test/regress/sql/upgrade_columnar_after.sql index 133fcfde0..196a9cc06 100644 --- a/src/test/regress/sql/upgrade_columnar_after.sql +++ b/src/test/regress/sql/upgrade_columnar_after.sql @@ -1,3 +1,5 @@ +SELECT 1; + SET search_path TO upgrade_columnar, public; -- test we retained data