summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2011-04-25 14:43:26 -0400
committerAndrew Dunstan <andrew@dunslane.net>2011-04-25 14:43:26 -0400
commit625744ac43360ca3f4a6d3eccecb6f4c999a1a63 (patch)
tree96f61d1647387e377b8354485182f29c776df7fd /src
parent860be17ec3c19a1aeba0bbe7ecaf30be409ea446 (diff)
Use terse mode to avoid variable order dependency output in foreign data regression check.
Per Tom Lane's suggestion about my gripe about occasional errors noticed on the buildfarm.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/foreign_data.out9
-rw-r--r--src/test/regress/sql/foreign_data.sql4
2 files changed, 8 insertions, 5 deletions
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index c05bcabb71e..0dc7d045c7c 100644
--- 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 0d12b98e217..d3239216c10 100644
--- 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;