Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5a71964

Browse files
committed
Fix some issues with SSL and Kerberos tests
The recent refactoring done in c50624c accidentally broke a portion ofthe kerberos tests checking after a query, so add its functionalityback. Some inactive SSL tests had their arguments in an incorrectorder, which would cause them to fail if they were to run.Author: Jacob ChampionDiscussion:https://postgr.es/m/4f5b0b3dc0b6fe9ae6a34886b4d4000f61eb567e.camel@vmware.com
1 parentac4645c commit5a71964

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

‎src/test/kerberos/t/001_auth.pl

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
if ($ENV{with_gssapi}eq'yes')
2222
{
23-
plantests=>30;
23+
plantests=>32;
2424
}
2525
else
2626
{
@@ -196,7 +196,7 @@ sub test_access
196196
$node->connect_ok(
197197
$connstr,$test_name,
198198
sql=>$query,
199-
expected_stdout=>qr/t/);
199+
expected_stdout=>qr/^t$/);
200200
}
201201
else
202202
{
@@ -227,9 +227,10 @@ sub test_query
227227
my$connstr =$node->connstr('postgres')
228228
." user=$role host=$host hostaddr=$hostaddr$gssencmode";
229229

230-
my ($stdoutres,$stderrres);
231-
232-
$node->connect_ok($connstr,$test_name,$query,$expected);
230+
$node->connect_ok(
231+
$connstr,$test_name,
232+
sql=>$query,
233+
expected_stdout=>$expected);
233234
return;
234235
}
235236

‎src/test/ssl/t/001_ssltests.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,17 +459,17 @@
459459
# correct client cert in encrypted PEM with empty password
460460
$node->connect_fails(
461461
"$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client-encrypted-pem_tmp.key sslpassword=''",
462+
"certificate authorization fails with correct client cert and empty password in encrypted PEM format",
462463
expected_stderr=>
463-
qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!,
464-
"certificate authorization fails with correct client cert and empty password in encrypted PEM format"
464+
qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!
465465
);
466466

467467
# correct client cert in encrypted PEM with no password
468468
$node->connect_fails(
469469
"$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client-encrypted-pem_tmp.key",
470+
"certificate authorization fails with correct client cert and no password in encrypted PEM format",
470471
expected_stderr=>
471-
qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!,
472-
"certificate authorization fails with correct client cert and no password in encrypted PEM format"
472+
qr!\Qprivate key file "ssl/client-encrypted-pem_tmp.key": processing error\E!
473473
);
474474

475475
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp