From f0f20711128970c2f810641502d2986ccece71b5 Mon Sep 17 00:00:00 2001 From: Santhosh Edukulla Date: Fri, 18 Apr 2014 22:07:35 +0530 Subject: [PATCH] Added fix for CLOUDSTACK-6389 Added changes for CLOUDSTACK-6389. More details in the bug. Signed-off-by: Santhosh Edukulla Signed-off-by: SrikanteswaraRao Talluri (cherry picked from commit cfa783fef27f64ebdd42f66c59445cb37c9a9764) --- test/integration/smoke/test_nic.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index 4ba905a2410..9b29403b355 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -133,8 +133,6 @@ class TestNic(cloudstackTestCase): def setUp(self): self.cleanup = [] - self.cleaning_up = 0 - def signal_handler(signal, frame): self.tearDown() sys.exit(0) @@ -152,9 +150,6 @@ class TestNic(cloudstackTestCase): zone = get_zone(self.apiclient, self.services) self.services['mode'] = zone.networktype - if zone.networktype != 'Advanced': - self.skipTest("Cannot run this test with a basic zone, please use advanced!") - #if local storage is enabled, alter the offerings to use localstorage #this step is needed for devcloud if zone.localstorageenabled == True: @@ -365,14 +360,6 @@ class TestNic(cloudstackTestCase): self.assertEqual(True, False, "Exception during NIC test!: " + str(ex)) def tearDown(self): - if self.services['mode'] != 'Advanced': - self.debug("Cannot run this test with a basic zone, please use advanced!") - return - - if self.cleaning_up == 1: - return - - self.cleaning_up = 1 try: for obj in self.cleanup: try: @@ -380,8 +367,6 @@ class TestNic(cloudstackTestCase): time.sleep(10) except Exception as ex: self.debug("Error deleting: " + str(obj) + ", exception: " + str(ex)) - except Exception as e: self.debug("Warning! Exception in tearDown: %s" % e) - self.cleaning_up = 0