Appropriately skip the test_nic setup when in a basic zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d4a5756 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d4a5756 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d4a5756 Branch: refs/heads/master Commit: 7d4a575631e03f6c1c615c41dbf55b899ead1aae Parents: 4a96740 Author: Prasanna Santhanam <[email protected]> Authored: Fri Aug 23 16:41:38 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Fri Aug 23 17:02:35 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_nic.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d4a5756/test/integration/smoke/test_nic.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index b28e1b8..583fc29 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -152,9 +152,8 @@ class TestNic(cloudstackTestCase): zone = get_zone(self.apiclient, self.services) self.services['mode'] = zone.networktype - if self.services['mode'] != 'Advanced': - self.debug("Cannot run this test with a basic zone, please use advanced!") - return + 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 @@ -224,13 +223,11 @@ class TestNic(cloudstackTestCase): self.cleanup.insert(0, self.test_network2) except Exception as ex: self.debug("Exception during NIC test SETUP!: " + str(ex)) - self.assertEqual(True, False, "Exception during NIC test SETUP!: " + str(ex)) @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"]) def test_01_nic(self): - if self.services['mode'] != 'Advanced': - self.debug("Cannot run this test with a basic zone, please use advanced!") - return + """Test to add and update added nic to a virtual machine""" + try: self.virtual_machine = VirtualMachine.create( self.apiclient,
