]> granicus.if.org Git - postgresql/commitdiff
Fix test counting in SSL tests
authorPeter Eisentraut <peter_e@gmx.net>
Tue, 6 Mar 2018 19:49:07 +0000 (14:49 -0500)
committerPeter Eisentraut <peter_e@gmx.net>
Wed, 7 Mar 2018 05:53:25 +0000 (00:53 -0500)
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>
src/test/ssl/t/002_scram.pl

index 3d7f9abfbe7dd58f03c2e6afb95bcdb184ced217..a805a3196bf4f50d319290b99eb4feade33ac1ff 100644 (file)
@@ -8,15 +8,13 @@ use Test::More;
 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 @@ else
                                        "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);