Fix rare failure in LDAP tests.

macdice · macdice · commit 76b2b3e72438 · 2020-08-03T12:44:27.000+12:00
Instead of writing a query to psql's stdin, use -c. This avoids a failure where psql exits before we write, seen a few times on the build farm. Thanks to Tom Lane for the suggestion. Back-patch to 11, where the LDAP tests arrived. Reviewed-by: Noah Misch <noah@leadboat.com> Discussion: https://postgr.es/m/CA%2BhUKGLFmW%2BHQYPeKiwSp5sdFFHtFViCpw4Mh6yAgEx74r5-Cw%40mail.gmail.com
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
@@ -165,7 +165,8 @@ sub test_access
 	my ($node, $role, $expected_res, $test_name) = @_;
 
 	my $res =
-	  $node->psql('postgres', 'SELECT 1', extra_params => [ '-U', $role ]);
+	  $node->psql('postgres', undef,
+				  extra_params => [ '-U', $role, '-c', 'SELECT 1' ]);
 	is($res, $expected_res, $test_name);
 	return;
 }

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ sub test_access`
`165`	`165`	`my ($node, $role, $expected_res, $test_name) = @_;`
`166`	`166`
`167`	`167`	`my $res =`
`168`		`- $node->psql('postgres', 'SELECT 1', extra_params => [ '-U', $role ]);`
	`168`	`+ $node->psql('postgres', undef,`
	`169`	`+ extra_params => [ '-U', $role, '-c', 'SELECT 1' ]);`
`169`	`170`	`is($res, $expected_res, $test_name);`
`170`	`171`	`return;`
`171`	`172`	`}`