apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added fix for CLOUDSTACK-6389

Browse Source 
Added changes for CLOUDSTACK-6389.
More details in the bug.

Signed-off-by: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
This commit is contained in:
Santhosh Edukulla 2014-04-18 22:07:35 +05:30 committed by SrikanteswaraRao Talluri
parent bf54f74ffc
commit 6c9b21907c
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/smoke/test_nic.py
View File

@ -33,8 +33,6 @@ class TestNic(cloudstackTestCase):
def setUp(self): def setUp(self):
self.cleanup = [] self.cleanup = []
self.cleaning_up = 0
def signal_handler(signal, frame): def signal_handler(signal, frame):
self.tearDown() self.tearDown()
sys.exit(0) sys.exit(0)
@ -52,9 +50,6 @@ class TestNic(cloudstackTestCase):
zone = get_zone(self.apiclient, self.testClient.getZoneForTests()) zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
self.services['mode'] = zone.networktype 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 #if local storage is enabled, alter the offerings to use localstorage
#this step is needed for devcloud #this step is needed for devcloud
if zone.localstorageenabled == True: if zone.localstorageenabled == True:
@ -265,14 +260,6 @@ class TestNic(cloudstackTestCase):
self.assertEqual(True, False, "Exception during NIC test!: " + str(ex)) self.assertEqual(True, False, "Exception during NIC test!: " + str(ex))
def tearDown(self): 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: try:
for obj in self.cleanup: for obj in self.cleanup:
try: try:
@ -280,8 +267,6 @@ class TestNic(cloudstackTestCase):
time.sleep(10) time.sleep(10)
except Exception as ex: except Exception as ex:
self.debug("Error deleting: " + str(obj) + ", exception: " + str(ex)) self.debug("Error deleting: " + str(obj) + ", exception: " + str(ex))
except Exception as e: except Exception as e:
self.debug("Warning! Exception in tearDown: %s" % e) self.debug("Warning! Exception in tearDown: %s" % e)
self.cleaning_up = 0