Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c3bf3ea

Browse files
committed
Remove configure-option-dependent test cases from dblink tests.
The HINTs generated for these error cases vary across builds. We could try to work around that, but the test cases aren't really useful enough to justify taking any trouble. Per buildfarm.
1 parent 864db11 commit c3bf3ea

File tree

2 files changed

+0
-14
lines changed

2 files changed

+0
-14
lines changed

contrib/dblink/expected/dblink.out

-8
Original file line numberDiff line numberDiff line change
@@ -783,14 +783,6 @@ SELECT dblink_disconnect('dtest1');
783783

784784
-- test foreign data wrapper functionality
785785
CREATE USER dblink_regression_test;
786-
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
787-
OPTIONS (invalid 'val'); -- fail, invalid option
788-
ERROR: invalid option "invalid"
789-
HINT: Valid options in this context are: service, connect_timeout, dbname, host, hostaddr, port, application_name, fallback_application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, requirepeer
790-
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
791-
OPTIONS (password 'val'); -- fail, can't specify password here
792-
ERROR: invalid option "password"
793-
HINT: Valid options in this context are: service, connect_timeout, dbname, host, hostaddr, port, application_name, fallback_application_name, keepalives, keepalives_idle, keepalives_interval, keepalives_count, sslmode, sslcompression, sslcert, sslkey, sslrootcert, sslcrl, requirepeer
794786
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
795787
OPTIONS (dbname 'contrib_regression');
796788
CREATE USER MAPPING FOR public SERVER fdtest

contrib/dblink/sql/dblink.sql

-6
Original file line numberDiff line numberDiff line change
@@ -360,14 +360,8 @@ SELECT dblink_disconnect('dtest1');
360360

361361
-- test foreign data wrapper functionality
362362
CREATE USER dblink_regression_test;
363-
364-
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
365-
OPTIONS (invalid 'val'); -- fail, invalid option
366-
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
367-
OPTIONS (password 'val'); -- fail, can't specify password here
368363
CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
369364
OPTIONS (dbname 'contrib_regression');
370-
371365
CREATE USER MAPPING FOR public SERVER fdtest
372366
OPTIONS (server 'localhost'); -- fail, can't specify server here
373367
CREATE USER MAPPING FOR public SERVER fdtest;

0 commit comments

Comments
 (0)