From 7e2859aa0cd6f6be4d7eec5a133c47eb8ddd9d47 Mon Sep 17 00:00:00 2001 From: eaydingol Date: Wed, 21 Feb 2024 12:29:56 +0000 Subject: [PATCH] Test clean-up --- src/test/regress/expected/seclabel_non_maindb.out | 2 ++ src/test/regress/sql/seclabel_non_maindb.sql | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/regress/expected/seclabel_non_maindb.out b/src/test/regress/expected/seclabel_non_maindb.out index 602a16ab2..8baed7731 100644 --- a/src/test/regress/expected/seclabel_non_maindb.out +++ b/src/test/regress/expected/seclabel_non_maindb.out @@ -103,8 +103,10 @@ SELECT node_type, result FROM get_citus_tests_label_provider_labels('"user 2"') (3 rows) -- clean up +SET citus.enable_create_database_propagation to ON; DROP DATABASE database1; DROP DATABASE database2; DROP DATABASE database_w1; DROP ROLE user1; DROP ROLE "user 2"; +RESET citus.enable_create_database_propagation; diff --git a/src/test/regress/sql/seclabel_non_maindb.sql b/src/test/regress/sql/seclabel_non_maindb.sql index 27378afb7..2f80644b5 100644 --- a/src/test/regress/sql/seclabel_non_maindb.sql +++ b/src/test/regress/sql/seclabel_non_maindb.sql @@ -29,7 +29,7 @@ SECURITY LABEL FOR "citus '!tests_label_provider" ON ROLE "user 2" IS 'citus_unc SELECT node_type, result FROM get_citus_tests_label_provider_labels('user1') ORDER BY node_type; SELECT node_type, result FROM get_citus_tests_label_provider_labels('"user 2"') ORDER BY node_type; -\c database1 +\c database1 -- Set a SECURITY LABEL on database, it should not be propagated SECURITY LABEL FOR "citus '!tests_label_provider" ON DATABASE database1 IS 'citus_classified'; @@ -63,8 +63,10 @@ ROLLBACK; SELECT node_type, result FROM get_citus_tests_label_provider_labels('"user 2"') ORDER BY node_type; -- clean up +SET citus.enable_create_database_propagation to ON; DROP DATABASE database1; DROP DATABASE database2; DROP DATABASE database_w1; DROP ROLE user1; DROP ROLE "user 2"; +RESET citus.enable_create_database_propagation;