Added fix for CLOUDSTACK-6389 Added changes for CLOUDSTACK-6389. More details in the bug.
Signed-off-by: Santhosh Edukulla <santhosh.eduku...@citrix.com> Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c9b2190 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c9b2190 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c9b2190 Branch: refs/heads/master Commit: 6c9b21907c2600f320d2afc2fb7273fae73b7ba1 Parents: bf54f74 Author: Santhosh Edukulla <santhosh.eduku...@citrix.com> Authored: Fri Apr 18 22:07:35 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Wed Apr 30 13:56:52 2014 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_nic.py | 15 --------------- 1 file changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c9b2190/test/integration/smoke/test_nic.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index abfe443..e12bb33 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -33,8 +33,6 @@ class TestNic(cloudstackTestCase): def setUp(self): self.cleanup = [] - self.cleaning_up = 0 - def signal_handler(signal, frame): self.tearDown() sys.exit(0) @@ -52,9 +50,6 @@ class TestNic(cloudstackTestCase): zone = get_zone(self.apiclient, self.testClient.getZoneForTests()) 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: @@ -265,14 +260,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: @@ -280,8 +267,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
