mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stabilize postgres_fdw regression tests.

Browse Source 
The new test cases added in commit 8bf58c0d9 turn out to have output
that can vary depending on the lc_messages setting prevailing on the
test server.  Hide the remote end's error messages to ensure stable
output.  This isn't a terribly desirable solution; we'd rather know
that the connection failed for the expected reason and not some other
one.  But there seems little choice for the moment.

Per buildfarm.

Discussion: https://postgr.es/m/18419.1500658570@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2017-07-21 14:20:43 -04:00
parent 063ff9210c
commit 88f48b57fd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/postgres_fdw/expected/postgres_fdw.out
View File

@ -192,6 +192,8 @@ ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');
(6 rows) (6 rows)
-- Test that alteration of server options causes reconnection -- Test that alteration of server options causes reconnection
-- Remote's errors might be non-English, so hide them to ensure stable results
\set VERBOSITY terse
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work
c3 | c4 c3 | c4
-------+------------------------------ -------+------------------------------
@ -201,7 +203,6 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work
ALTER SERVER loopback OPTIONS (SET dbname 'no such database'); ALTER SERVER loopback OPTIONS (SET dbname 'no such database');
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail
ERROR: could not connect to server "loopback" ERROR: could not connect to server "loopback"
DETAIL: FATAL: database "no such database" does not exist
DO $d$ DO $d$
BEGIN BEGIN
EXECUTE $$ALTER SERVER loopback EXECUTE $$ALTER SERVER loopback
@ -219,7 +220,6 @@ ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
OPTIONS (ADD user 'no such user'); OPTIONS (ADD user 'no such user');
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail
ERROR: could not connect to server "loopback" ERROR: could not connect to server "loopback"
DETAIL: FATAL: role "no such user" does not exist
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
OPTIONS (DROP user); OPTIONS (DROP user);
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again
@ -228,6 +228,7 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again
00001 | Fri Jan 02 00:00:00 1970 PST 00001 | Fri Jan 02 00:00:00 1970 PST
(1 row) (1 row)
\set VERBOSITY default
-- Now we should be able to run ANALYZE. -- Now we should be able to run ANALYZE.
-- To exercise multiple code paths, we use local stats on ft1 -- To exercise multiple code paths, we use local stats on ft1
-- and remote-estimate mode on ft2. -- and remote-estimate mode on ft2.

3
contrib/postgres_fdw/sql/postgres_fdw.sql
View File

@ -196,6 +196,8 @@ ALTER FOREIGN TABLE ft2 ALTER COLUMN c1 OPTIONS (column_name 'C 1');
\det+ \det+
-- Test that alteration of server options causes reconnection -- Test that alteration of server options causes reconnection
-- Remote's errors might be non-English, so hide them to ensure stable results
\set VERBOSITY terse
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work
ALTER SERVER loopback OPTIONS (SET dbname 'no such database'); ALTER SERVER loopback OPTIONS (SET dbname 'no such database');
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail
@ -214,6 +216,7 @@ SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should fail
ALTER USER MAPPING FOR CURRENT_USER SERVER loopback ALTER USER MAPPING FOR CURRENT_USER SERVER loopback
OPTIONS (DROP user); OPTIONS (DROP user);
SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again SELECT c3, c4 FROM ft1 ORDER BY c3, c1 LIMIT 1; -- should work again
\set VERBOSITY default
-- Now we should be able to run ANALYZE. -- Now we should be able to run ANALYZE.
-- To exercise multiple code paths, we use local stats on ft1 -- To exercise multiple code paths, we use local stats on ft1