database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-05 02:22:28 +03:00
Code Activity

Fix SSL tests

Browse Source 
These were accidentally broken by the great backpatching of
331828b754.
This commit is contained in:
Peter Eisentraut
2016-05-06 23:45:12 -04:00
parent 196870f2fc
commit ab32a40572
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/ssl/ServerSetup.pm
View File

@@ -46,6 +46,7 @@ sub copy_files
sub configure_test_server_for_ssl sub configure_test_server_for_ssl
{ {
my $tempdir = $_[0]; my $tempdir = $_[0];
my $serverhost = $_[1];
# Create test users and databases # Create test users and databases
psql 'postgres', "CREATE USER ssltestuser"; psql 'postgres', "CREATE USER ssltestuser";
@@ -58,6 +59,7 @@ sub configure_test_server_for_ssl
print CONF "fsync=off\n"; print CONF "fsync=off\n";
print CONF "log_connections=on\n"; print CONF "log_connections=on\n";
print CONF "log_hostname=on\n"; print CONF "log_hostname=on\n";
print CONF "listen_addresses='$serverhost'\n";
print CONF "log_statement=all\n"; print CONF "log_statement=all\n";
# enable SSL and set up server key # enable SSL and set up server key

2
src/test/ssl/t/001_ssltests.pl
View File

@@ -84,7 +84,7 @@ chmod 0600, "ssl/client.key";
diag "setting up data directory in \"$tempdir\"..."; diag "setting up data directory in \"$tempdir\"...";
start_test_server($tempdir); start_test_server($tempdir);
configure_test_server_for_ssl($tempdir); configure_test_server_for_ssl($tempdir, $SERVERHOSTADDR);
switch_server_cert($tempdir, 'server-cn-only'); switch_server_cert($tempdir, 'server-cn-only');
### Part 1. Run client-side tests. ### Part 1. Run client-side tests.