marvin: Refactor - cleanup of resource after test run (apache#5505)

Pearl1594 · web-flow · commit d1f375f35aa3 · 2021-09-24T13:42:15.000+05:30
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
@@ -97,6 +97,7 @@ def setUpClass(cls):
                     mode=cls.services["mode"]
                 )
 
+            cls._cleanup.append(cls.virtual_machine_with_disk)
             cls._cleanup.append(cls.service_offering)
             cls._cleanup.append(cls.account)
             cls._cleanup.append(cls.disk_offering)
@@ -251,8 +252,6 @@ def test_02_list_snapshots_with_removed_data_store(self):
         )
         assert isinstance(clusters,list) and len(clusters)>0
 
-        self.cleanup.append(self.virtual_machine_with_disk)
-
         # Attach created volume to vm, then detach it to be able to migrate it
         self.virtual_machine_with_disk.stop(self.apiclient)
         self.virtual_machine_with_disk.attach_volume(

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ def setUpClass(cls):`
`97`	`97`	`mode=cls.services["mode"]`
`98`	`98`	`)`
`99`	`99`
	`100`	`+ cls._cleanup.append(cls.virtual_machine_with_disk)`
`100`	`101`	`cls._cleanup.append(cls.service_offering)`
`101`	`102`	`cls._cleanup.append(cls.account)`
`102`	`103`	`cls._cleanup.append(cls.disk_offering)`
`@@ -251,8 +252,6 @@ def test_02_list_snapshots_with_removed_data_store(self):`
`251`	`252`	`)`
`252`	`253`	`assert isinstance(clusters,list) and len(clusters)>0`
`253`	`254`
`254`		`- self.cleanup.append(self.virtual_machine_with_disk)`
`255`		`-`
`256`	`255`	`# Attach created volume to vm, then detach it to be able to migrate it`
`257`	`256`	`self.virtual_machine_with_disk.stop(self.apiclient)`
`258`	`257`	`self.virtual_machine_with_disk.attach_volume(`