Skip to content

Commit 7d3bf73

Browse files
Suppress DETAIL output from a foreign_data test.
Unstable sort order related to changes to nbtree from commit dd299df 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 dd299df. Only a few such changes were required, though. Per buildfarm member batfish. Discussion: https://postgr.es/m/CAH2-WzkCQ_MtKeOpzozj7QhhgP1unXsK8o9DMAFvDqQFEPpkYQ@mail.gmail.com
1 parent 815b20a commit 7d3bf73

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/test/regress/expected/foreign_data.out

+3-3
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,11 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
439439
SET ROLE regress_test_role;
440440
ALTER SERVER s1 OWNER TO regress_test_indirect;
441441
RESET ROLE;
442+
-- We use terse mode to avoid ordering issues in detail output.
443+
\set VERBOSITY terse
442444
DROP ROLE regress_test_indirect; -- ERROR
443445
ERROR: role "regress_test_indirect" cannot be dropped because some objects depend on it
444-
DETAIL: privileges for foreign-data wrapper foo
445-
owner of server s1
446+
\set VERBOSITY default
446447
\des+
447448
List of foreign servers
448449
Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
@@ -1203,7 +1204,6 @@ ERROR: permission denied for foreign-data wrapper foo
12031204
ALTER SERVER s9 VERSION '1.1';
12041205
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
12051206
CREATE USER MAPPING FOR current_user SERVER s9;
1206-
-- We use terse mode to avoid ordering issues in cascade detail output.
12071207
\set VERBOSITY terse
12081208
DROP SERVER s9 CASCADE;
12091209
NOTICE: drop cascades to 2 other objects

src/test/regress/sql/foreign_data.sql

+3-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ GRANT USAGE ON FOREIGN DATA WRAPPER foo TO regress_test_indirect;
199199
SET ROLE regress_test_role;
200200
ALTER SERVER s1 OWNER TO regress_test_indirect;
201201
RESET ROLE;
202+
-- We use terse mode to avoid ordering issues in detail output.
203+
\set VERBOSITY terse
202204
DROP ROLE regress_test_indirect; -- ERROR
205+
\set VERBOSITY default
203206
\des+
204207

205208
ALTER SERVER s8 RENAME to s8new;
@@ -501,7 +504,6 @@ CREATE SERVER s10 FOREIGN DATA WRAPPER foo; -- ERROR
501504
ALTER SERVER s9 VERSION '1.1';
502505
GRANT USAGE ON FOREIGN SERVER s9 TO regress_test_role;
503506
CREATE USER MAPPING FOR current_user SERVER s9;
504-
-- We use terse mode to avoid ordering issues in cascade detail output.
505507
\set VERBOSITY terse
506508
DROP SERVER s9 CASCADE;
507509
\set VERBOSITY default

0 commit comments

Comments
 (0)