From 7d3bf73ac416fdd74d6c7d473e0c00a19be90c82 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Wed, 20 Mar 2019 13:38:38 -0700 Subject: [PATCH] Suppress DETAIL output from a foreign_data test. Unstable sort order related to changes to nbtree from commit dd299df8 can cause two lines of DETAIL output to be in opposite-of-expected order. Suppress the output using the same VERBOSITY hack that is used elsewhere in the foreign_data tests. Note that the same foreign_data.out DETAIL output was mechanically updated by commit dd299df8. Only a few such changes were required, though. Per buildfarm member batfish. Discussion: https://postgr.es/m/CAH2-WzkCQ_MtKeOpzozj7QhhgP1unXsK8o9DMAFvDqQFEPpkYQ@mail.gmail.com --- src/test/regress/expected/foreign_data.out | 6 +++--- src/test/regress/sql/foreign_data.sql | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out index 0b7582accb..455926f107 100644 --- a/src/test/regress/expected/foreign_data.out +++ b/src/test/regress/expected/foreign_data.out @@ -439,10 +439,11 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect; SET ROLE regress_test_role; ALTER SERVER s1 OWNER TO regress_test_indirect; RESET ROLE; +-- We use terse mode to avoid ordering issues in detail output. +\set VERBOSITY terse DROP ROLE regress_test_indirect; -- ERROR ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it -DETAIL: privileges for foreign-data wrapper foo -owner of server s1 +\set VERBOSITY default \des+ List of foreign servers Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description @@ -1203,7 +1204,6 @@ ERROR: permission denied for foreign-data wrapper foo ALTER SERVER s9 VERSION '1.1'; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; CREATE USER MAPPING FOR current_user SERVER s9; --- We use terse mode to avoid ordering issues in cascade detail output. \set VERBOSITY terse DROP SERVER s9 CASCADE; NOTICE: drop cascades to 2 other objects diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql index 1cc1f6e012..657dc45627 100644 --- a/src/test/regress/sql/foreign_data.sql +++ b/src/test/regress/sql/foreign_data.sql @@ -199,7 +199,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect; SET ROLE regress_test_role; ALTER SERVER s1 OWNER TO regress_test_indirect; RESET ROLE; +-- We use terse mode to avoid ordering issues in detail output. +\set VERBOSITY terse DROP ROLE regress_test_indirect; -- ERROR +\set VERBOSITY default \des+ ALTER SERVER s8 RENAME to s8new; @@ -501,7 +504,6 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR ALTER SERVER s9 VERSION '1.1'; GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role; CREATE USER MAPPING FOR current_user SERVER s9; --- We use terse mode to avoid ordering issues in cascade detail output. \set VERBOSITY terse DROP SERVER s9 CASCADE; \set VERBOSITY default -- 2.40.0