CA-340473: Synchronous object removers do not return an object.

Konstantina Chremmou · Konstantina Chremmou · commit ec6adc5eaf6e · 2020-06-01T11:35:37.000+01:00
Signed-off-by: Konstantina Chremmou &lt;konstantina.chremmou@citrix.com&gt;
diff --git a/powershell/autogen/samples/AutomatedTestCore.ps1 b/powershell/autogen/samples/AutomatedTestCore.ps1
@@ -175,7 +175,7 @@ function disconnect_server([String]$svr) {
 # VM Functions
 
 function destroy_vm([XenAPI.VM]$vm) {
-    if ($vm -eq $null) {
+    if ($null -eq $vm) {
         return
     }
 
@@ -343,9 +343,9 @@ function detach_nfs_sr([String]$sr_name) {
         }
     }
 
-    $sr_opq = Remove-XenSR -Name $sr_name -Async -PassThru | Wait-XenTask -ShowProgress -PassThru
+    Remove-XenSR -Name $sr_name -Async -PassThru | Wait-XenTask -ShowProgress
 
-    if ($null -eq $sr_opq) {
+    if ($null -eq (Get-XenSR -Name $sr_name)) {
         return $true
     }
     return $false

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ function disconnect_server([String]$svr) {`
`175`	`175`	`# VM Functions`
`176`	`176`
`177`	`177`	`function destroy_vm([XenAPI.VM]$vm) {`
`178`		`- if ($vm -eq $null) {`
	`178`	`+ if ($null -eq $vm) {`
`179`	`179`	`return`
`180`	`180`	`}`
`181`	`181`
`@@ -343,9 +343,9 @@ function detach_nfs_sr([String]$sr_name) {`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`
`346`		`- $sr_opq = Remove-XenSR -Name $sr_name -Async -PassThru \| Wait-XenTask -ShowProgress -PassThru`
	`346`	`+ Remove-XenSR -Name $sr_name -Async -PassThru \| Wait-XenTask -ShowProgress`
`347`	`347`
`348`		`- if ($null -eq $sr_opq) {`
	`348`	`+ if ($null -eq (Get-XenSR -Name $sr_name)) {`
`349`	`349`	`return $true`
`350`	`350`	`}`
`351`	`351`	`return $false`