Don't leave roles behind after core regression tests.

tglsfdc · tglsfdc · commit d0d968328794 · 2023-01-11T12:22:47.000-05:00
Commits cf5eb37 and e5b8a4c each created a new role that they forgot to remove again. This breaks the use-case of running "make installcheck" more than once, and it's also against project policy because it'd be quite unfriendly behavior if one were running "make installcheck" against a non-throwaway installation.
diff --git a/src/test/regress/expected/create_role.out b/src/test/regress/expected/create_role.out
@@ -174,18 +174,23 @@ DROP ROLE regress_password_null;
 DROP ROLE regress_noiseword;
 DROP ROLE regress_inroles;
 DROP ROLE regress_adminroles;
--- fail, cannot drop ourself nor superusers
+-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for
 DROP ROLE regress_role_super;
 ERROR:  must be superuser to drop superusers
 DROP ROLE regress_role_admin;
 ERROR:  current user cannot be dropped
+DROP ROLE regress_rolecreator;
+ERROR:  must have admin option on role "regress_rolecreator"
 -- ok
 RESET SESSION AUTHORIZATION;
 REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE;
 DROP INDEX tenant_idx;
 DROP TABLE tenant_table;
 DROP VIEW tenant_view;
+DROP SCHEMA regress_tenant2_schema;
 DROP ROLE regress_tenant;
+DROP ROLE regress_tenant2;
+DROP ROLE regress_rolecreator;
 DROP ROLE regress_role_admin;
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_normal;
diff --git a/src/test/regress/sql/create_role.sql b/src/test/regress/sql/create_role.sql
@@ -161,17 +161,21 @@ DROP ROLE regress_noiseword;
 DROP ROLE regress_inroles;
 DROP ROLE regress_adminroles;
 
--- fail, cannot drop ourself nor superusers
+-- fail, cannot drop ourself, nor superusers or roles we lack ADMIN for
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_admin;
+DROP ROLE regress_rolecreator;
 
 -- ok
 RESET SESSION AUTHORIZATION;
 REVOKE CREATE ON DATABASE regression FROM regress_role_admin CASCADE;
 DROP INDEX tenant_idx;
 DROP TABLE tenant_table;
 DROP VIEW tenant_view;
+DROP SCHEMA regress_tenant2_schema;
 DROP ROLE regress_tenant;
+DROP ROLE regress_tenant2;
+DROP ROLE regress_rolecreator;
 DROP ROLE regress_role_admin;
 DROP ROLE regress_role_super;
 DROP ROLE regress_role_normal;
