cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From santhosheduku...@apache.org
Subject git commit: updated refs/heads/master to c76302c
Date Tue, 05 Aug 2014 12:01:02 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 64b9ca0a3 -> c76302cdd


CLOUDSTACK-7240: Fixed expunge VM issue in test_persistent_networks.py

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c76302cd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c76302cd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c76302cd

Branch: refs/heads/master
Commit: c76302cdd8a70498a792db5d7fbe82ad43b7f8b5
Parents: 64b9ca0
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Tue Aug 5 15:04:12 2014 +0530
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Tue Aug 5 17:30:41 2014 +0530

----------------------------------------------------------------------
 .../component/test_persistent_networks.py            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c76302cd/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index 210063e..b242579 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -163,11 +163,6 @@ class TestPersistentNetworks(cloudstackTestCase):
     def verifyVmExpungement(self, virtual_machine):
         """verify if vm is expunged"""
         isVmExpunged = False
-        try:
-            virtual_machine.delete(self.apiclient, expunge=True)
-        except Exception as e:
-            self.fail("Failed to delete VM: %s with error %s" % (virtual_machine.id, e))
-
         # Verify if it is expunged
         retriesCount = 20
         while True:
@@ -232,7 +227,7 @@ class TestPersistentNetworks(cloudstackTestCase):
             virtual_machine = VirtualMachine.create(self.apiclient,self.services["virtual_machine"],
                                                     networkids=[network.id],serviceofferingid=self.service_offering.id,
                                                     accountid=self.account.name,domainid=self.domain.id)
-            virtual_machine.delete(self.apiclient, expunge=True)
+            virtual_machine.delete(self.apiclient)
         except Exception as e:
             self.fail("vm creation failed: %s" % e)
 
@@ -378,7 +373,7 @@ class TestPersistentNetworks(cloudstackTestCase):
             self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id,
ipaddress.ipaddress.ipaddress))
 
         # Delete VM
-        virtual_machine.delete(self.api_client, expunge=True)
+        virtual_machine.delete(self.api_client)
 
         # Verify VM is expunged
         self.verifyVmExpungement(virtual_machine)
@@ -457,7 +452,7 @@ class TestPersistentNetworks(cloudstackTestCase):
         except Exception as e:
             self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id,
ipaddress.ipaddress.ipaddress))
 
-        virtual_machine.delete(self.api_client, expunge=True)
+        virtual_machine.delete(self.api_client)
 
         # Verify VM is expunged
         self.verifyVmExpungement(virtual_machine)
@@ -540,7 +535,7 @@ class TestPersistentNetworks(cloudstackTestCase):
         except Exception as e:
             self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id,
ipaddress.ipaddress.ipaddress))
 
-        virtual_machine.delete(self.api_client, expunge=True)
+        virtual_machine.delete(self.api_client)
 
         # Verify VM is expunged
         self.verifyVmExpungement(virtual_machine)
@@ -919,7 +914,7 @@ class TestPersistentNetworks(cloudstackTestCase):
             self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id,
ipaddress.ipaddress.ipaddress))
 
         # Delete VM
-        virtual_machine.delete(self.api_client, expunge=True)
+        virtual_machine.delete(self.api_client)
 
         # Verify VM is expunged
         self.verifyVmExpungement(virtual_machine)


Mime
View raw message