Fix some issues with SSL and Kerberos tests

michaelpq · michaelpq · commit 5a71964a832f · 2021-04-06T13:23:57.000+09:00
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
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
@@ -20,7 +20,7 @@
 
 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
@@ -459,17 +459,17 @@
 	# 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!
 	);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`if ($ENV{with_gssapi} eq 'yes')`
`22`	`22`	`{`
`23`		`- plan tests => 30;`
	`23`	`+ plan tests => 32;`
`24`	`24`	`}`
`25`	`25`	`else`
`26`	`26`	`{`
`@@ -196,7 +196,7 @@ sub test_access`
`196`	`196`	`$node->connect_ok(`
`197`	`197`	`$connstr, $test_name,`
`198`	`198`	`sql => $query,`
`199`		`- expected_stdout => qr/t/);`
	`199`	`+ expected_stdout => qr/^t$/);`
`200`	`200`	`}`
`201`	`201`	`else`
`202`	`202`	`{`
`@@ -227,9 +227,10 @@ sub test_query`
`227`	`227`	`my $connstr = $node->connstr('postgres')`
`228`	`228`	`. " user=$role host=$host hostaddr=$hostaddr $gssencmode";`
`229`	`229`
`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);`
`233`	`234`	`return;`
`234`	`235`	`}`
`235`	`236`