(PE-40377) better empty check for upgrade_version

davidmalloncares · davidmalloncares · commit adf971a1eee9 · 2025-02-27T11:07:09.000Z
diff --git a/spec/acceptance/peadm_spec/plans/test_migration.pp b/spec/acceptance/peadm_spec/plans/test_migration.pp
@@ -87,7 +87,8 @@
   }
 
   # if a new PE version was specified then check it has been upgraded
-  if $upgrade_version and $upgrade_version != '' {
+  out::message("upgrade_version:${upgrade_version}.")
+  if $upgrade_version and $upgrade_version != '' and !empty($upgrade_version) {
     if $peadm_config['value']['pe_version'] == $upgrade_version {
       out::message("Upgraded to new PE version ${upgrade_version} correctly")
     } else {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`# if a new PE version was specified then check it has been upgraded`
`90`		`- if $upgrade_version and $upgrade_version != '' {`
	`90`	`+ out::message("upgrade_version:${upgrade_version}.")`
	`91`	`+ if $upgrade_version and $upgrade_version != '' and !empty($upgrade_version) {`
`91`	`92`	`if $peadm_config['value']['pe_version'] == $upgrade_version {`
`92`	`93`	`out::message("Upgraded to new PE version ${upgrade_version} correctly")`
`93`	`94`	`} else {`