Add missing $Test::Builder::Level settings

petere · petere · commit 73aa5e0cafd0 · 2021-09-23T23:07:09.000+02:00
One of these was accidentally removed by c50624c. The others are added by analogy. Discussion: https://www.postgresql.org/message-id/ae1143fb-455c-c80f-ed66-78d45bd93303@enterprisedb.com
diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl
@@ -42,6 +42,8 @@ sub reset_pg_hba
 # named parameters are passed to connect_ok/fails as-is.
 sub test_role
 {
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
 	my ($node, $role, $method, $expected_res, %params) = @_;
 	my $status_string = 'failed';
 	$status_string = 'success' if ($expected_res eq 0);
diff --git a/src/test/authentication/t/002_saslprep.pl b/src/test/authentication/t/002_saslprep.pl
@@ -36,6 +36,8 @@ sub reset_pg_hba
 # Test access for a single role, useful to wrap all tests into one.
 sub test_login
 {
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
 	my $node          = shift;
 	my $role          = shift;
 	my $password      = shift;
diff --git a/src/test/kerberos/t/001_auth.pl b/src/test/kerberos/t/001_auth.pl
@@ -185,6 +185,8 @@ END
 # Test connection success or failure, and if success, that query returns true.
 sub test_access
 {
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
 	my ($node, $role, $query, $expected_res, $gssencmode, $test_name,
 		@expect_log_msgs)
 	  = @_;
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -166,6 +166,8 @@ END
 
 sub test_access
 {
+	local $Test::Builder::Level = $Test::Builder::Level + 1;
+
 	my ($node, $role, $expected_res, $test_name, %params) = @_;
 	my $connstr = "user=$role";
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ sub reset_pg_hba`
`42`	`42`	`# named parameters are passed to connect_ok/fails as-is.`
`43`	`43`	`sub test_role`
`44`	`44`	`{`
	`45`	`+ local $Test::Builder::Level = $Test::Builder::Level + 1;`
	`46`	`+`
`45`	`47`	`my ($node, $role, $method, $expected_res, %params) = @_;`
`46`	`48`	`my $status_string = 'failed';`
`47`	`49`	`$status_string = 'success' if ($expected_res eq 0);`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ sub reset_pg_hba`
`36`	`36`	`# Test access for a single role, useful to wrap all tests into one.`
`37`	`37`	`sub test_login`
`38`	`38`	`{`
	`39`	`+ local $Test::Builder::Level = $Test::Builder::Level + 1;`
	`40`	`+`
`39`	`41`	`my $node = shift;`
`40`	`42`	`my $role = shift;`
`41`	`43`	`my $password = shift;`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,8 @@ END`
`185`	`185`	`# Test connection success or failure, and if success, that query returns true.`
`186`	`186`	`sub test_access`
`187`	`187`	`{`
	`188`	`+ local $Test::Builder::Level = $Test::Builder::Level + 1;`
	`189`	`+`
`188`	`190`	`my ($node, $role, $query, $expected_res, $gssencmode, $test_name,`
`189`	`191`	`@expect_log_msgs)`
`190`	`192`	`= @_;`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,8 @@ END`
`166`	`166`
`167`	`167`	`sub test_access`
`168`	`168`	`{`
	`169`	`+ local $Test::Builder::Level = $Test::Builder::Level + 1;`
	`170`	`+`
`169`	`171`	`my ($node, $role, $expected_res, $test_name, %params) = @_;`
`170`	`172`	`my $connstr = "user=$role";`
`171`	`173`