Skip to content

Commit d90aa68

Browse files
anarazelmichaelpq
anarazel
authored and
michaelpq
committed
tests: Rename conflicting role names
These cause problems when running installcheck-world USE_MODULE_DB=1 with -j. Note: This patch has been originally applied to v16 and newer branches as of 6a20b04. Sami Imseih has reported this issue as being possible to reach for other branches still supported: REL_15_STABLE and REL_14_STABLE. Reviewed-by: Michael Paquier <michael@paquier.xyz> Discussion: https://postgr.es/m/20221003234111.4ob7yph6r4g4ywhu@awork3.anarazel.de Discussion: https://postgr.es/m/CAA5RZ0soPHUvwXLZ+mf5Q=uJRL5ggnRg1uB0qKVG1bbdA9up6w@mail.gmail.com Backpatch-through: 14
1 parent 0c67dbc commit d90aa68

File tree

6 files changed

+64
-64
lines changed

6 files changed

+64
-64
lines changed

‎contrib/adminpack/expected/adminpack.out‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ SELECT pg_read_file('test_file1');
3636

3737
-- disallowed file paths for non-superusers and users who are
3838
-- not members of pg_write_server_files
39-
CREATE ROLE regress_user1;
40-
GRANT pg_read_all_settings TO regress_user1;
41-
GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_user1;
42-
SET ROLE regress_user1;
39+
CREATE ROLE regress_adminpack_user1;
40+
GRANT pg_read_all_settings TO regress_adminpack_user1;
41+
GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_adminpack_user1;
42+
SET ROLE regress_adminpack_user1;
4343
SELECT pg_file_write('../test_file0', 'test0', false);
4444
ERROR: path must be in or below the current directory
4545
SELECT pg_file_write('/tmp/test_file0', 'test0', false);
@@ -53,9 +53,9 @@ SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4'
5353
SELECT pg_file_write(current_setting('data_directory') || '/../test_file4', 'test4', false);
5454
ERROR: reference to parent directory ("..") not allowed
5555
RESET ROLE;
56-
REVOKE EXECUTE ON FUNCTION pg_file_write(text,text,bool) FROM regress_user1;
57-
REVOKE pg_read_all_settings FROM regress_user1;
58-
DROP ROLE regress_user1;
56+
REVOKE EXECUTE ON FUNCTION pg_file_write(text,text,bool) FROM regress_adminpack_user1;
57+
REVOKE pg_read_all_settings FROM regress_adminpack_user1;
58+
DROP ROLE regress_adminpack_user1;
5959
-- sync
6060
SELECT pg_file_sync('test_file1'); -- sync file
6161
pg_file_sync
@@ -153,8 +153,8 @@ SELECT pg_file_unlink('test_file4');
153153
(1 row)
154154

155155
-- superuser checks
156-
CREATE USER regress_user1;
157-
SET ROLE regress_user1;
156+
CREATE USER regress_adminpack_user1;
157+
SET ROLE regress_adminpack_user1;
158158
SELECT pg_file_write('test_file0', 'test0', false);
159159
ERROR: permission denied for function pg_file_write
160160
SELECT pg_file_sync('test_file0');
@@ -167,6 +167,6 @@ ERROR: permission denied for function pg_file_unlink
167167
SELECT pg_logdir_ls();
168168
ERROR: permission denied for function pg_logdir_ls
169169
RESET ROLE;
170-
DROP USER regress_user1;
170+
DROP USER regress_adminpack_user1;
171171
-- no further tests for pg_logdir_ls() because it depends on the
172172
-- server's logging setup

‎contrib/adminpack/sql/adminpack.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ SELECT pg_read_file('test_file1');
1414

1515
-- disallowed file paths for non-superusers and users who are
1616
-- not members of pg_write_server_files
17-
CREATE ROLE regress_user1;
17+
CREATE ROLE regress_adminpack_user1;
1818

19-
GRANT pg_read_all_settings TO regress_user1;
20-
GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_user1;
19+
GRANT pg_read_all_settings TO regress_adminpack_user1;
20+
GRANT EXECUTE ON FUNCTION pg_file_write(text,text,bool) TO regress_adminpack_user1;
2121

22-
SET ROLE regress_user1;
22+
SET ROLE regress_adminpack_user1;
2323
SELECT pg_file_write('../test_file0', 'test0', false);
2424
SELECT pg_file_write('/tmp/test_file0', 'test0', false);
2525
SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4', false);
2626
SELECT pg_file_write(current_setting('data_directory') || '/../test_file4', 'test4', false);
2727
RESET ROLE;
28-
REVOKE EXECUTE ON FUNCTION pg_file_write(text,text,bool) FROM regress_user1;
29-
REVOKE pg_read_all_settings FROM regress_user1;
30-
DROP ROLE regress_user1;
28+
REVOKE EXECUTE ON FUNCTION pg_file_write(text,text,bool) FROM regress_adminpack_user1;
29+
REVOKE pg_read_all_settings FROM regress_adminpack_user1;
30+
DROP ROLE regress_adminpack_user1;
3131

3232
-- sync
3333
SELECT pg_file_sync('test_file1'); -- sync file
@@ -59,8 +59,8 @@ SELECT pg_file_unlink('test_file4');
5959

6060

6161
-- superuser checks
62-
CREATE USER regress_user1;
63-
SET ROLE regress_user1;
62+
CREATE USER regress_adminpack_user1;
63+
SET ROLE regress_adminpack_user1;
6464

6565
SELECT pg_file_write('test_file0', 'test0', false);
6666
SELECT pg_file_sync('test_file0');
@@ -69,7 +69,7 @@ SELECT pg_file_unlink('test_file0');
6969
SELECT pg_logdir_ls();
7070

7171
RESET ROLE;
72-
DROP USER regress_user1;
72+
DROP USER regress_adminpack_user1;
7373

7474

7575
-- no further tests for pg_logdir_ls() because it depends on the

‎contrib/passwordcheck/expected/passwordcheck.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
LOAD 'passwordcheck';
2-
CREATE USER regress_user1;
2+
CREATE USER regress_passwordcheck_user1;
33
-- ok
4-
ALTER USER regress_user1 PASSWORD 'a_nice_long_password';
4+
ALTER USER regress_passwordcheck_user1 PASSWORD 'a_nice_long_password';
55
-- error: too short
6-
ALTER USER regress_user1 PASSWORD 'tooshrt';
6+
ALTER USER regress_passwordcheck_user1 PASSWORD 'tooshrt';
77
ERROR: password is too short
88
-- error: contains user name
9-
ALTER USER regress_user1 PASSWORD 'xyzregress_user1';
9+
ALTER USER regress_passwordcheck_user1 PASSWORD 'xyzregress_passwordcheck_user1';
1010
ERROR: password must not contain user name
1111
-- error: contains only letters
12-
ALTER USER regress_user1 PASSWORD 'alessnicelongpassword';
12+
ALTER USER regress_passwordcheck_user1 PASSWORD 'alessnicelongpassword';
1313
ERROR: password must contain both letters and nonletters
1414
-- encrypted ok (password is "secret")
15-
ALTER USER regress_user1 PASSWORD 'md51a44d829a20a23eac686d9f0d258af13';
15+
ALTER USER regress_passwordcheck_user1 PASSWORD 'md592350e12ac34e52dd598f90893bb3ae7';
1616
-- error: password is user name
17-
ALTER USER regress_user1 PASSWORD 'md5e589150ae7d28f93333afae92b36ef48';
17+
ALTER USER regress_passwordcheck_user1 PASSWORD 'md507a112732ed9f2087fa90b192d44e358';
1818
ERROR: password must not equal user name
19-
DROP USER regress_user1;
19+
DROP USER regress_passwordcheck_user1;

‎contrib/passwordcheck/sql/passwordcheck.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
LOAD 'passwordcheck';
22

3-
CREATE USER regress_user1;
3+
CREATE USER regress_passwordcheck_user1;
44

55
-- ok
6-
ALTER USER regress_user1 PASSWORD 'a_nice_long_password';
6+
ALTER USER regress_passwordcheck_user1 PASSWORD 'a_nice_long_password';
77

88
-- error: too short
9-
ALTER USER regress_user1 PASSWORD 'tooshrt';
9+
ALTER USER regress_passwordcheck_user1 PASSWORD 'tooshrt';
1010

1111
-- error: contains user name
12-
ALTER USER regress_user1 PASSWORD 'xyzregress_user1';
12+
ALTER USER regress_passwordcheck_user1 PASSWORD 'xyzregress_passwordcheck_user1';
1313

1414
-- error: contains only letters
15-
ALTER USER regress_user1 PASSWORD 'alessnicelongpassword';
15+
ALTER USER regress_passwordcheck_user1 PASSWORD 'alessnicelongpassword';
1616

1717
-- encrypted ok (password is "secret")
18-
ALTER USER regress_user1 PASSWORD 'md51a44d829a20a23eac686d9f0d258af13';
18+
ALTER USER regress_passwordcheck_user1 PASSWORD 'md592350e12ac34e52dd598f90893bb3ae7';
1919

2020
-- error: password is user name
21-
ALTER USER regress_user1 PASSWORD 'md5e589150ae7d28f93333afae92b36ef48';
21+
ALTER USER regress_passwordcheck_user1 PASSWORD 'md507a112732ed9f2087fa90b192d44e358';
2222

23-
DROP USER regress_user1;
23+
DROP USER regress_passwordcheck_user1;

‎src/pl/plperl/expected/plperl_setup.out‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
-- Before going ahead with the to-be-tested installations, verify that
55
-- a non-superuser is allowed to install plperl (but not plperlu) when
66
-- suitable permissions have been granted.
7-
CREATE USER regress_user1;
8-
CREATE USER regress_user2;
9-
SET ROLE regress_user1;
7+
CREATE USER regress_plperl_user1;
8+
CREATE USER regress_plperl_user2;
9+
SET ROLE regress_plperl_user1;
1010
CREATE EXTENSION plperl; -- fail
1111
ERROR: permission denied to create extension "plperl"
1212
HINT: Must have CREATE privilege on current database to create this extension.
@@ -16,11 +16,11 @@ HINT: Must be superuser to create this extension.
1616
RESET ROLE;
1717
DO $$
1818
begin
19-
execute format('grant create on database %I to regress_user1',
19+
execute format('grant create on database %I to regress_plperl_user1',
2020
current_database());
2121
end;
2222
$$;
23-
SET ROLE regress_user1;
23+
SET ROLE regress_plperl_user1;
2424
CREATE EXTENSION plperl;
2525
CREATE EXTENSION plperlu; -- fail
2626
ERROR: permission denied to create extension "plperlu"
@@ -34,23 +34,23 @@ SELECT foo1();
3434

3535
-- Must reconnect to avoid failure with non-MULTIPLICITY Perl interpreters
3636
\c -
37-
SET ROLE regress_user1;
37+
SET ROLE regress_plperl_user1;
3838
-- Should be able to change privileges on the language
3939
revoke all on language plperl from public;
40-
SET ROLE regress_user2;
40+
SET ROLE regress_plperl_user2;
4141
CREATE FUNCTION foo2() returns int language plperl as '2;'; -- fail
4242
ERROR: permission denied for language plperl
43-
SET ROLE regress_user1;
44-
grant usage on language plperl to regress_user2;
45-
SET ROLE regress_user2;
43+
SET ROLE regress_plperl_user1;
44+
grant usage on language plperl to regress_plperl_user2;
45+
SET ROLE regress_plperl_user2;
4646
CREATE FUNCTION foo2() returns int language plperl as '2;';
4747
SELECT foo2();
4848
foo2
4949
------
5050
2
5151
(1 row)
5252

53-
SET ROLE regress_user1;
53+
SET ROLE regress_plperl_user1;
5454
-- Should be able to drop the extension, but not the language per se
5555
DROP LANGUAGE plperl CASCADE;
5656
ERROR: cannot drop language plperl because extension plperl requires it
@@ -61,9 +61,9 @@ DETAIL: drop cascades to function foo1()
6161
drop cascades to function foo2()
6262
-- Clean up
6363
RESET ROLE;
64-
DROP OWNED BY regress_user1;
65-
DROP USER regress_user1;
66-
DROP USER regress_user2;
64+
DROP OWNED BY regress_plperl_user1;
65+
DROP USER regress_plperl_user1;
66+
DROP USER regress_plperl_user2;
6767
-- Now install the versions that will be used by subsequent test scripts.
6868
CREATE EXTENSION plperl;
6969
CREATE EXTENSION plperlu;

‎src/pl/plperl/sql/plperl_setup.sql‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
-- a non-superuser is allowed to install plperl (but not plperlu) when
77
-- suitable permissions have been granted.
88

9-
CREATE USER regress_user1;
10-
CREATE USER regress_user2;
9+
CREATE USER regress_plperl_user1;
10+
CREATE USER regress_plperl_user2;
1111

12-
SET ROLE regress_user1;
12+
SET ROLE regress_plperl_user1;
1313

1414
CREATE EXTENSION plperl; -- fail
1515
CREATE EXTENSION plperlu; -- fail
@@ -18,12 +18,12 @@ RESET ROLE;
1818

1919
DO $$
2020
begin
21-
execute format('grant create on database %I to regress_user1',
21+
execute format('grant create on database %I to regress_plperl_user1',
2222
current_database());
2323
end;
2424
$$;
2525

26-
SET ROLE regress_user1;
26+
SET ROLE regress_plperl_user1;
2727

2828
CREATE EXTENSION plperl;
2929
CREATE EXTENSION plperlu; -- fail
@@ -34,35 +34,35 @@ SELECT foo1();
3434
-- Must reconnect to avoid failure with non-MULTIPLICITY Perl interpreters
3535
\c -
3636

37-
SET ROLE regress_user1;
37+
SET ROLE regress_plperl_user1;
3838

3939
-- Should be able to change privileges on the language
4040
revoke all on language plperl from public;
4141

42-
SET ROLE regress_user2;
42+
SET ROLE regress_plperl_user2;
4343

4444
CREATE FUNCTION foo2() returns int language plperl as '2;'; -- fail
4545

46-
SET ROLE regress_user1;
46+
SET ROLE regress_plperl_user1;
4747

48-
grant usage on language plperl to regress_user2;
48+
grant usage on language plperl to regress_plperl_user2;
4949

50-
SET ROLE regress_user2;
50+
SET ROLE regress_plperl_user2;
5151

5252
CREATE FUNCTION foo2() returns int language plperl as '2;';
5353
SELECT foo2();
5454

55-
SET ROLE regress_user1;
55+
SET ROLE regress_plperl_user1;
5656

5757
-- Should be able to drop the extension, but not the language per se
5858
DROP LANGUAGE plperl CASCADE;
5959
DROP EXTENSION plperl CASCADE;
6060

6161
-- Clean up
6262
RESET ROLE;
63-
DROP OWNED BY regress_user1;
64-
DROP USER regress_user1;
65-
DROP USER regress_user2;
63+
DROP OWNED BY regress_plperl_user1;
64+
DROP USER regress_plperl_user1;
65+
DROP USER regress_plperl_user2;
6666

6767
-- Now install the versions that will be used by subsequent test scripts.
6868
CREATE EXTENSION plperl;

0 commit comments

Comments
 (0)