conversion test fails if there is an existing user named foo. Choose a name

somewhat less likely to provoke a conflict.

diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out
index dbe76e09746f7231036b2549d7b07f385a41a3a7..dbdfe3529cda39e4ea194d157f3ae96b34b68a1d 100644 (file)
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -1,8 +1,8 @@
 --
 -- create user defined conversion
 --
-CREATE USER foo WITH NOCREATEDB NOCREATEUSER;
-SET SESSION AUTHORIZATION foo;
+CREATE USER conversion_test_user WITH NOCREATEDB NOCREATEUSER;
+SET SESSION AUTHORIZATION conversion_test_user;
 CREATE CONVERSION myconv FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_to_utf8;
 --
 -- cannot make same name conversion in same schema
@@ -1511,4 +1511,4 @@ SELECT CONVERT('foo', 'WIN874', 'UNICODE');
 -- return to the super user
 --
 RESET SESSION AUTHORIZATION;
-DROP USER foo;
+DROP USER conversion_test_user;

diff --git a/src/test/regress/sql/conversion.sql b/src/test/regress/sql/conversion.sql
index d95b91975f90eee1eb7dc0bfa36009d60923df32..35e09689ca709d3d7ff945f7ec66d09ef56aeeff 100644 (file)
--- a/src/test/regress/sql/conversion.sql
+++ b/src/test/regress/sql/conversion.sql
@@ -1,8 +1,8 @@
 --
 -- create user defined conversion
 --
-CREATE USER foo WITH NOCREATEDB NOCREATEUSER;
-SET SESSION AUTHORIZATION foo;
+CREATE USER conversion_test_user WITH NOCREATEDB NOCREATEUSER;
+SET SESSION AUTHORIZATION conversion_test_user;
 CREATE CONVERSION myconv FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_to_utf8;
 --
 -- cannot make same name conversion in same schema
@@ -369,4 +369,4 @@ SELECT CONVERT('foo', 'WIN874', 'UNICODE');
 -- return to the super user
 --
 RESET SESSION AUTHORIZATION;
-DROP USER foo;
+DROP USER conversion_test_user;