From 9dc547c83855f8e82bc8d88c49bacf6cc55a8663 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 12 Nov 2019 13:37:04 +0100 Subject: [PATCH] Add test for wrong port --- test/CDB_FederatedServerDiagnostics.sql | 19 +++++++++++++++++-- test/CDB_FederatedServerDiagnostics_expect | 8 ++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/test/CDB_FederatedServerDiagnostics.sql b/test/CDB_FederatedServerDiagnostics.sql index 0043769..47c27bc 100644 --- a/test/CDB_FederatedServerDiagnostics.sql +++ b/test/CDB_FederatedServerDiagnostics.sql @@ -58,8 +58,22 @@ SELECT '1.5', cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback') @> SELECT '1.6', cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback') @> '{"server_options": {"host": "localhost", "port": "@@PGPORT@@", "updatable": "false", "extensions": "postgis", "fetch_size": "1000", "use_remote_estimate": "true"}}'::jsonb; \echo '%% It returns the network latency to the remote server' -SELECT '1.7', (cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback')->'server_latency')::float > 0.0; -SELECT '1.8', (cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback')->'server_latency')::float < 1000.0; +SELECT '2.1', (cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback')->'server_latency')::float > 0.0; +SELECT '2.2', (cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback')->'server_latency')::float < 1000.0; + +\echo '%% It raises an error if the wrong port is provided' +SELECT 'C2', cartodb.CDB_Federated_Server_Register_PG(server => 'wrong-port'::text, config => '{ + "server": { + "host": "localhost", + "port": "12345" + }, + "credentials": { + "username": "cdb_fs_tester", + "password": "cdb_fs_passwd" + } +}'::jsonb); +SELECT '3.0', cartodb.CDB_Federated_Server_Diagnostics(server => 'wrong-port'); + -- =================================================================== @@ -67,6 +81,7 @@ SELECT '1.8', (cartodb.CDB_Federated_Server_Diagnostics(server => 'loopback')->' -- =================================================================== \set QUIET on SELECT 'D1', cartodb.CDB_Federated_Server_Unregister(server => 'loopback'::text); +SELECT 'D2', cartodb.CDB_Federated_Server_Unregister(server => 'wrong-port'::text); -- Reconnect, using a new session in order to close FDW connections \connect DROP DATABASE cdb_fs_tester; diff --git a/test/CDB_FederatedServerDiagnostics_expect b/test/CDB_FederatedServerDiagnostics_expect index d2c543e..e030def 100644 --- a/test/CDB_FederatedServerDiagnostics_expect +++ b/test/CDB_FederatedServerDiagnostics_expect @@ -12,6 +12,10 @@ ERROR: Server "doesNotExist" does not exist %% It returns the remote server options 1.6|t %% It returns the network latency to the remote server -1.7|t -1.8|t +2.1|t +2.2|t +%% It raises an error if the wrong port is provided +C2| +ERROR: could not connect to server "cdb_fs_wrong-port" D1| +D2|