diff options
| author | Stephen Frost <sfrost@snowman.net> | 2015-08-21 15:51:24 -0400 |
|---|---|---|
| committer | Stephen Frost <sfrost@snowman.net> | 2015-08-21 15:51:24 -0400 |
| commit | 072710dff3eef4540f1c64d07890eb128535e212 (patch) | |
| tree | 4b2518dfae9a2ac5936adb0a68e320fc8588f883 | |
| parent | e68be16b0d0e857bc05949b8ee78c5aaf7d8954a (diff) | |
| download | postgresql-072710dff3eef4540f1c64d07890eb128535e212.tar.gz postgresql-072710dff3eef4540f1c64d07890eb128535e212.zip | |
Clean up roles from roleattributes test
Having the roles remain after the test ends up causing repeated 'make
installcheck' runs to fail and may be risky from a security perspective
also, so remove them at the end of the test.
| -rw-r--r-- | src/test/regress/expected/roleattributes.out | 19 | ||||
| -rw-r--r-- | src/test/regress/sql/roleattributes.sql | 20 |
2 files changed, 32 insertions, 7 deletions
diff --git a/src/test/regress/expected/roleattributes.out b/src/test/regress/expected/roleattributes.out index b7fded93556..aa5f42abf43 100644 --- a/src/test/regress/expected/roleattributes.out +++ b/src/test/regress/expected/roleattributes.out @@ -230,7 +230,20 @@ SELECT * FROM pg_authid WHERE rolname = 'test_bypassrls'; test_bypassrls | f | t | f | f | f | f | t | -1 | | (1 row) --- remove the one role with LOGIN rights +-- clean up roles +DROP ROLE test_def_superuser; +DROP ROLE test_superuser; +DROP ROLE test_def_inherit; +DROP ROLE test_inherit; +DROP ROLE test_def_createrole; +DROP ROLE test_createrole; +DROP ROLE test_def_createdb; +DROP ROLE test_createdb; +DROP ROLE test_def_role_canlogin; DROP ROLE test_role_canlogin; --- other roles not removed to test pg_dumpall role dump through --- pg_upgrade +DROP USER test_def_user_canlogin; +DROP USER test_user_canlogin; +DROP ROLE test_def_replication; +DROP ROLE test_replication; +DROP ROLE test_def_bypassrls; +DROP ROLE test_bypassrls; diff --git a/src/test/regress/sql/roleattributes.sql b/src/test/regress/sql/roleattributes.sql index 9f9dd9cf812..67c6b0f8351 100644 --- a/src/test/regress/sql/roleattributes.sql +++ b/src/test/regress/sql/roleattributes.sql @@ -78,8 +78,20 @@ SELECT * FROM pg_authid WHERE rolname = 'test_bypassrls'; ALTER ROLE test_bypassrls WITH BYPASSRLS; SELECT * FROM pg_authid WHERE rolname = 'test_bypassrls'; --- remove the one role with LOGIN rights +-- clean up roles +DROP ROLE test_def_superuser; +DROP ROLE test_superuser; +DROP ROLE test_def_inherit; +DROP ROLE test_inherit; +DROP ROLE test_def_createrole; +DROP ROLE test_createrole; +DROP ROLE test_def_createdb; +DROP ROLE test_createdb; +DROP ROLE test_def_role_canlogin; DROP ROLE test_role_canlogin; - --- other roles not removed to test pg_dumpall role dump through --- pg_upgrade +DROP USER test_def_user_canlogin; +DROP USER test_user_canlogin; +DROP ROLE test_def_replication; +DROP ROLE test_replication; +DROP ROLE test_def_bypassrls; +DROP ROLE test_bypassrls; |