Simplify version check for SKIP clause

danielgustafsson · danielgustafsson · commit 6ff2e8cdd410 · 2023-04-08T23:32:11.000+02:00
Checking for the required versions of IO::Pty as well as IPC::Run can be achieved with a single eval call, and by using the VERSION function the comparison is guaranteed to follow the same rules as calling 'use' on the module with a version. Reported-by: Andrew Dunstan <andrew@dunslane.net> Discussion: https://postgr.es/m/6d880ea2-f8ca-f458-4dcd-a7a3e6d6cd7c@dunslane.net
diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl
@@ -107,7 +107,7 @@ sub test_conn
 SKIP:
 {
 	skip "IO::Pty and IPC::Run >= 0.98 required", 1 unless
-		(eval { require IO::Pty; } && eval { $IPC::Run::VERSION >= '0.98' });
+		eval { require IO::Pty; IPC::Run->VERSION('0.98'); };
 
 	# Alter the password on the created role using \password in psql to ensure
 	# that clientside password changes use the scram_iterations value when

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ sub test_conn`
`107`	`107`	`SKIP:`
`108`	`108`	`{`
`109`	`109`	`skip "IO::Pty and IPC::Run >= 0.98 required", 1 unless`
`110`		`- (eval { require IO::Pty; } && eval { $IPC::Run::VERSION >= '0.98' });`
	`110`	`+ eval { require IO::Pty; IPC::Run->VERSION('0.98'); };`
`111`	`111`
`112`	`112`	`# Alter the password on the created role using \password in psql to ensure`
`113`	`113`	`# that clientside password changes use the scram_iterations value when`