Use terse mode to avoid variable order dependency output in foreign data regression...

Per Tom Lane's suggestion about my gripe about occasional errors noticed on the buildfarm.

diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index c05bcabb71e32b1e321e1664a66babf6d730b9ed..0dc7d045c7c033c265cb4c98c18c2734825f9551 100644 (file)
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -1086,13 +1086,12 @@ DROP SERVER t1 CASCADE;
 NOTICE:  drop cascades to user mapping for public
 DROP SERVER t2;
 DROP USER MAPPING FOR regress_test_role SERVER s6;
+-- This test causes some order dependent cascade detail output,
+-- so switch to terse mode for it. 
+\set VERBOSITY terse
 DROP FOREIGN DATA WRAPPER foo CASCADE;
 NOTICE:  drop cascades to 5 other objects
-DETAIL:  drop cascades to server s4
-drop cascades to user mapping for foreign_data_user
-drop cascades to server s6
-drop cascades to server s9
-drop cascades to user mapping for unprivileged_role
+\set VERBOSITY default
 DROP SERVER s8 CASCADE;
 NOTICE:  drop cascades to 2 other objects
 DETAIL:  drop cascades to user mapping for foreign_data_user

diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index 0d12b98e2172e94e09947b977a7b41d6e4aaf532..d3239216c10f8e9e3f6589b1fa8adf8e8dd8e5b8 100644 (file)
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -443,7 +443,11 @@ DROP SERVER s5 CASCADE;
 DROP SERVER t1 CASCADE;
 DROP SERVER t2;
 DROP USER MAPPING FOR regress_test_role SERVER s6;
+-- This test causes some order dependent cascade detail output,
+-- so switch to terse mode for it. 
+\set VERBOSITY terse
 DROP FOREIGN DATA WRAPPER foo CASCADE;
+\set VERBOSITY default
 DROP SERVER s8 CASCADE;
 DROP ROLE regress_test_indirect;
 DROP ROLE regress_test_role;