From c96f5ce5cabae3bedb8d07164f2a7d3bba82f4bc Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 6 Mar 2018 14:49:07 -0500 Subject: [PATCH] Fix test counting in SSL tests The branch that does not support tls-server-end-point runs more tests, so we need to structure the test counting dynamically. --- src/test/ssl/t/002_scram.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl index 3d7f9abfbe..a805a3196b 100644 --- a/src/test/ssl/t/002_scram.pl +++ b/src/test/ssl/t/002_scram.pl @@ -8,15 +8,13 @@ use ServerSetup; use File::Copy; -if ($ENV{with_openssl} eq 'yes') -{ - plan tests => 6; -} -else +if ($ENV{with_openssl} ne 'yes') { plan skip_all => 'SSL not supported by this build'; } +my $number_of_tests = 6; + # This is the hostname used to connect to the server. my $SERVERHOSTADDR = '127.0.0.1'; @@ -70,8 +68,11 @@ "scram_channel_binding=tls-server-end-point", qr/channel binding type "tls-server-end-point" is not supported by this build/, "SCRAM authentication with tls-server-end-point as channel binding"); + $number_of_tests++; } test_connect_fails($common_connstr, "scram_channel_binding=not-exists", qr/unsupported SCRAM channel-binding type/, "SCRAM authentication with invalid channel binding"); + +done_testing($number_of_tests); base-commit: 286c0ab257f8dde8e5494426b86c38f3877ae5c2 -- 2.16.2