Initial pgperltidy run for v12.

Make all the perl code look nice, too (for some value of "nice").

2 files changed, 45 insertions, 27 deletions

diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index d2346baf2a1..3a02a7a654a 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -315,14 +315,18 @@ test_connect_fails(
 	"does not connect with client-side CRL");
 
 # pg_stat_ssl
-command_like([
-	'psql', '-X', '-A', '-F', ',', '-P', 'null=_null_',
-	'-d', "$common_connstr sslrootcert=invalid",
-	'-c', "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
-			 ],
-			 qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n
+command_like(
+	[
+		'psql',                                '-X',
+		'-A',                                  '-F',
+		',',                                   '-P',
+		'null=_null_',                         '-d',
+		"$common_connstr sslrootcert=invalid", '-c',
+		"SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
+	],
+	qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n
 				^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,_null_,_null_,_null_$}mx,
-			 'pg_stat_ssl view without client certificate');
+	'pg_stat_ssl view without client certificate');
 
 ### Server-side tests.
 ###
@@ -347,14 +351,23 @@ test_connect_ok(
 	"certificate authorization succeeds with correct client cert");
 
 # pg_stat_ssl
-command_like([
-	'psql', '-X', '-A', '-F', ',', '-P', 'null=_null_',
-	'-d', "$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-	'-c', "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
-			 ],
-			 qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n
+command_like(
+	[
+		'psql',
+		'-X',
+		'-A',
+		'-F',
+		',',
+		'-P',
+		'null=_null_',
+		'-d',
+		"$common_connstr user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+		'-c',
+		"SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
+	],
+	qr{^pid,ssl,version,cipher,bits,compression,client_dn,client_serial,issuer_dn\n
 				^\d+,t,TLSv[\d.]+,[\w-]+,\d+,f,/CN=ssltestuser,1,\Q/CN=Test CA for PostgreSQL SSL regression test client certs\E$}mx,
-			 'pg_stat_ssl with client certificate');
+	'pg_stat_ssl with client certificate');
 
 # client key with wrong permissions
 test_connect_fails(
@@ -382,22 +395,28 @@ test_connect_fails(
 # works, iff username matches Common Name
 # fails, iff username doesn't match Common Name.
 $common_connstr =
-"sslrootcert=ssl/root+server_ca.crt sslmode=require dbname=verifydb hostaddr=$SERVERHOSTADDR";
+  "sslrootcert=ssl/root+server_ca.crt sslmode=require dbname=verifydb hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok($common_connstr,
-				"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-				"auth_option clientcert=verify-full succeeds with matching username and Common Name");
+test_connect_ok(
+	$common_connstr,
+	"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+	"auth_option clientcert=verify-full succeeds with matching username and Common Name"
+);
 
-test_connect_fails($common_connstr,
-				   "user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-				   qr/FATAL/,
-				   "auth_option clientcert=verify-full fails with mismatching username and Common Name");
+test_connect_fails(
+	$common_connstr,
+	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+	qr/FATAL/,
+	"auth_option clientcert=verify-full fails with mismatching username and Common Name"
+);
 
 # Check that connecting with auth-optionverify-ca in pg_hba :
 # works, when username doesn't match Common Name
-test_connect_ok($common_connstr,
-				"user=yetanotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
-				"auth_option clientcert=verify-ca succeeds with mismatching username and Common Name");
+test_connect_ok(
+	$common_connstr,
+	"user=yetanotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+	"auth_option clientcert=verify-ca succeeds with mismatching username and Common Name"
+);
 
 # intermediate client_ca.crt is provided by client, and isn't in server's ssl_ca_file
 switch_server_cert($node, 'server-cn-only', 'root_ca');
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
index e636efa54dc..7c4b821cb78 100644
--- a/src/test/ssl/t/002_scram.pl
+++ b/src/test/ssl/t/002_scram.pl
@@ -47,7 +47,6 @@ $common_connstr =
   "user=ssltestuser dbname=trustdb sslmode=require sslcert=invalid sslrootcert=invalid hostaddr=$SERVERHOSTADDR";
 
 # Default settings
-test_connect_ok($common_connstr, '',
-	"Basic SCRAM authentication with SSL");
+test_connect_ok($common_connstr, '', "Basic SCRAM authentication with SSL");
 
 done_testing($number_of_tests);