From 98a88bc2bcd60e41ca70e2f1e13eee827e23eefb Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 2 Mar 2023 17:47:20 -0500
Subject: [PATCH] Harden new test case against force_parallel_mode = regress.

Per buildfarm: worker processes can't see a role created in
the current transaction.
---
 src/test/regress/expected/psql.out | 3 ++-
 src/test/regress/sql/psql.sql      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 0f349df344..b75a74d294 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -5248,9 +5248,9 @@ reset work_mem;
 (1 row)
 
 -- check \df+
-begin;
 -- we have to use functions with a predictable owner name, so make a role
 create role regress_psql_user superuser;
+begin;
 set session authorization regress_psql_user;
 create function psql_df_internal (float8)
   returns float8
@@ -5275,6 +5275,7 @@ comment on function psql_df_plpgsql () is 'some comment';
 (3 rows)
 
 rollback;
+drop role regress_psql_user;
 -- check \sf
 \sf information_schema._pg_expandarray
 CREATE OR REPLACE FUNCTION information_schema._pg_expandarray(anyarray, OUT x anyelement, OUT n integer)
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index e4ed6cda1f..961783d6ea 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -1276,9 +1276,9 @@ reset work_mem;
 \do && anyarray *
 
 -- check \df+
-begin;
 -- we have to use functions with a predictable owner name, so make a role
 create role regress_psql_user superuser;
+begin;
 set session authorization regress_psql_user;
 
 create function psql_df_internal (float8)
@@ -1297,6 +1297,7 @@ comment on function psql_df_plpgsql () is 'some comment';
 
 \df+ psql_df_*
 rollback;
+drop role regress_psql_user;
 
 -- check \sf
 \sf information_schema._pg_expandarray