database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Fix test counting in SSL tests

Browse Source 
The branch that does not support tls-server-end-point runs more tests,
so we need to structure the test counting dynamically.

Reviewed-by: Michael Paquier <michael@paquier.xyz>
This commit is contained in:
Peter Eisentraut
2018-03-06 14:49:07 -05:00
parent 06ca148430
commit 2dadd061b3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/test/ssl/t/002_scram.pl
View File

@ -8,15 +8,13 @@ use Test::More;
use ServerSetup; use ServerSetup;
use File::Copy; use File::Copy;
if ($ENV{with_openssl} eq 'yes') if ($ENV{with_openssl} ne 'yes')
{
plan tests => 6;
}
else
{ {
plan skip_all => 'SSL not supported by this build'; plan skip_all => 'SSL not supported by this build';
} }
my $number_of_tests = 6;
# This is the hostname used to connect to the server. # This is the hostname used to connect to the server.
my $SERVERHOSTADDR = '127.0.0.1'; my $SERVERHOSTADDR = '127.0.0.1';
@ -70,8 +68,11 @@ else
"scram_channel_binding=tls-server-end-point", "scram_channel_binding=tls-server-end-point",
qr/channel binding type "tls-server-end-point" is not supported by this build/, qr/channel binding type "tls-server-end-point" is not supported by this build/,
"SCRAM authentication with tls-server-end-point as channel binding"); "SCRAM authentication with tls-server-end-point as channel binding");
$number_of_tests++;
} }
test_connect_fails($common_connstr, test_connect_fails($common_connstr,
"scram_channel_binding=not-exists", "scram_channel_binding=not-exists",
qr/unsupported SCRAM channel-binding type/, qr/unsupported SCRAM channel-binding type/,
"SCRAM authentication with invalid channel binding"); "SCRAM authentication with invalid channel binding");
done_testing($number_of_tests);