Improve cleanup in rolenames test

Drop test_schema at the end, because that otherwise interferes with the
collate.linux.utf8 test.

diff --git a/src/test/regress/expected/rolenames.out b/src/test/regress/expected/rolenames.out
index a1f039422fa7ed6745c7945d9fe3afb17b70064f..6676a565eb338bc9cf58c56bc0bc1fe719aacd8e 100644 (file)
--- a/src/test/regress/expected/rolenames.out
+++ b/src/test/regress/expected/rolenames.out
@@ -952,6 +952,7 @@ SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
 
 -- clean up
 \c
+DROP SCHEMA test_schema;
 DROP OWNED BY testrol0, "Public", "current_user", testrol1, testrol2, testrolx CASCADE;
 DROP ROLE testrol0, testrol1, testrol2, testrolx;
 DROP ROLE "Public", "None", "current_user", "session_user", "user";

diff --git a/src/test/regress/sql/rolenames.sql b/src/test/regress/sql/rolenames.sql
index 6c831b8b9f17c6cd8e5bbaa5533fa5b2fb2ab49f..56c1b98b390a1614baa1cb0c9f0e8b7f62559ee6 100644 (file)
--- a/src/test/regress/sql/rolenames.sql
+++ b/src/test/regress/sql/rolenames.sql
@@ -441,6 +441,7 @@ SELECT proname, proacl FROM pg_proc WHERE proname LIKE 'testagg_';
 -- clean up
 \c
 
+DROP SCHEMA test_schema;
 DROP OWNED BY testrol0, "Public", "current_user", testrol1, testrol2, testrolx CASCADE;
 DROP ROLE testrol0, testrol1, testrol2, testrolx;
 DROP ROLE "Public", "None", "current_user", "session_user", "user";