postgres.git / summary / log / commit / refs

commit    05f110cc0b83d9dc174f72cf96798299eb3e7f67
Author:   Peter Geoghegan <pg@bowt.ie>
Date:     Sat Mar 23 20:49:53 2019 +0000
First released in: 12.0

    Suppress DETAIL output from an event_trigger test.
    
    Suppress 3 lines of unstable DETAIL output from a DROP ROLE statement in
    event_trigger.sql.  This is further cleanup for commit dd299df8.
    
    Note that the event_trigger test instability issue is very similar to
    the recently suppressed foreign_data test instability issue.  Both
    issues involve DETAIL output for a DROP ROLE statement that needed to be
    changed as part of dd299df8.
    
    Per buildfarm member macaque.


 src/test/regress/expected/event_trigger.out | 6 +++---
 src/test/regress/sql/event_trigger.sql      | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index f7891faa23c..7e9b2cdfa9d 100644
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -185,11 +185,11 @@ alter event trigger regress_event_trigger rename to regress_event_trigger3;
 drop event trigger regress_event_trigger;
 ERROR:  event trigger "regress_event_trigger" does not exist
 -- should fail, regress_evt_user owns some objects
+-- use terse mode to avoid ordering issues in DROP ROLE detail output
+\set VERBOSITY terse
 drop role regress_evt_user;
 ERROR:  role "regress_evt_user" cannot be dropped because some objects depend on it
-DETAIL:  owner of user mapping for regress_evt_user on server useless_server
-owner of default privileges on new relations belonging to role regress_evt_user
-owner of event trigger regress_event_trigger3
+\set VERBOSITY default
 -- cleanup before next test
 -- these are all OK; the second one should emit a NOTICE
 drop event trigger if exists regress_event_trigger2;
diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql
index 346168673db..46666d12789 100644
--- a/src/test/regress/sql/event_trigger.sql
+++ b/src/test/regress/sql/event_trigger.sql
@@ -157,7 +157,10 @@ alter event trigger regress_event_trigger rename to regress_event_trigger3;
 drop event trigger regress_event_trigger;
 
 -- should fail, regress_evt_user owns some objects
+-- use terse mode to avoid ordering issues in DROP ROLE detail output
+\set VERBOSITY terse
 drop role regress_evt_user;
+\set VERBOSITY default
 
 -- cleanup before next test
 -- these are all OK; the second one should emit a NOTICE


[parent: 29b64d1de7c7]