diff options
| author | Michael Paquier <michael@paquier.xyz> | 2021-04-06 13:23:57 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2021-04-06 13:23:57 +0900 |
| commit | 5a71964a832febfee23cedc3bb354049d6ca78a7 (patch) | |
| tree | 976ca0d31dfc35ee74d9e84c091972a39aed06b3 | |
| parent | ac4645c0157fc5fcef0af8ff571512aa284a2cec (diff) | |
| download | postgresql-5a71964a832febfee23cedc3bb354049d6ca78a7.tar.gz postgresql-5a71964a832febfee23cedc3bb354049d6ca78a7.zip | |
Fix some issues with SSL and Kerberos tests
The recent refactoring done in c50624c accidentally broke a portion of
the kerberos tests checking after a query, so add its functionality
back. Some inactive SSL tests had their arguments in an incorrect
order, which would cause them to fail if they were to run.
Author: Jacob Champion
Discussion: https://postgr.es/m/4f5b0b3dc0b6fe9ae6a34886b4d4000f61eb567e.camel@vmware.com
| -rw-r--r-- | src/test/kerberos/t/001_auth.pl | 11 | ||||
| -rw-r--r-- | src/test/ssl/t/001_ssltests.pl | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl index de52a667854..8db18294608 100644 --- a/src/test/kerberos/t/001_auth.pl +++ b/src/test/kerberos/t/001_auth.pl @@ -20,7 +20,7 @@ use Time::HiRes qw(usleep); if ($ENV{with_gssapi} eq 'yes') { - plan tests => 30; + plan tests => 32; } else { @@ -196,7 +196,7 @@ sub test_access $node->connect_ok( $connstr, $test_name, sql => $query, - expected_stdout => qr/t/); + expected_stdout => qr/^t$/); } else { @@ -227,9 +227,10 @@ sub test_query my $connstr = $node->connstr('postgres') . " user=$role host=$host hostaddr=$hostaddr $gssencmode"; - my ($stdoutres, $stderrres); - - $node->connect_ok($connstr, $test_name, $query, $expected); + $node->connect_ok( + $connstr, $test_name, + sql => $query, + expected_stdout => $expected); return; } diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl index 21865ac30fc..0decbe71774 100644 --- a/src/test/ssl/t/001_ssltests.pl +++ b/src/test/ssl/t/001_ssltests.pl @@ -459,17 +459,17 @@ TODO: # correct client cert in encrypted PEM with empty password $node->connect_fails( "$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client-encrypted-pem_tmp.key sslpassword=''", + "certificate authorization fails with correct client cert and empty password in encrypted PEM format", expected_stderr => - qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!, - "certificate authorization fails with correct client cert and empty password in encrypted PEM format" + qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E! ); # correct client cert in encrypted PEM with no password $node->connect_fails( "$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client-encrypted-pem_tmp.key", + "certificate authorization fails with correct client cert and no password in encrypted PEM format", expected_stderr => - qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!, - "certificate authorization fails with correct client cert and no password in encrypted PEM format" + qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E! ); } |