Skip to content

Commit cc697d4

Browse files
committed
CSTACKEX-301: resolving comments
1 parent e1e6827 commit cc697d4

2 files changed

Lines changed: 2 additions & 18 deletions

File tree

‎test/integration/plugins/ontap/iscsi/instance/test_vm_volume_attach.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -785,15 +785,7 @@ def test_06_stop_vm_lun_unmapped(self):
785785

786786
cmd = stopVirtualMachineAPI.stopVirtualMachineCmd()
787787
cmd.id = self.__class__.vm.id
788-
try:
789-
self.apiClient.stopVirtualMachine(cmd)
790-
except Exception as exc:
791-
# Marvin can lose the management API connection while polling an
792-
# already-submitted async stop job. The VM state is authoritative,
793-
# so continue polling before treating the stop as failed.
794-
logger.warning(
795-
"stopVirtualMachine polling failed; checking VM state: %s",
796-
exc)
788+
self.apiClient.stopVirtualMachine(cmd)
797789

798790
result = self._poll_vm_state(self.__class__.vm.id, "Stopped",
799791
timeout=300)

‎test/integration/plugins/ontap/nfs3/instance/test_vm_volume_attach.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -720,15 +720,7 @@ def test_06_stop_vm_export_retained(self):
720720

721721
cmd = stopVirtualMachineAPI.stopVirtualMachineCmd()
722722
cmd.id = vm.id
723-
try:
724-
self.apiClient.stopVirtualMachine(cmd)
725-
except Exception as exc:
726-
# Marvin can lose the management API connection while polling an
727-
# already-submitted async stop job. The VM state is authoritative,
728-
# so continue polling before treating the stop as failed.
729-
logger.warning(
730-
"stopVirtualMachine polling failed; checking VM state: %s",
731-
exc)
723+
self.apiClient.stopVirtualMachine(cmd)
732724

733725
result = self._poll_vm_state(vm.id, "Stopped", timeout=300)
734726
self.assertEqual(

0 commit comments

Comments
 (0)