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

unskipping skipped tests

Browse Source 
and indentation fixes

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-05-27 10:10:01 +05:30
parent 61e150fd58
commit 16e9eaca80
2 changed files with 337 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/integration/component/test_host_high_availability.py
View File

@ -18,15 +18,12 @@
""" P1 tests for dedicated Host high availability
"""
#Import Local Modules
import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
from marvin.integration.lib.base import *
from marvin.integration.lib.common import *
from marvin import remoteSSHClient
import datetime
class Services:
@ -73,12 +70,12 @@ class Services:
"timeout": 100,
}
class TestHostHighAvailability(cloudstackTestCase):
""" Dedicated host HA test cases """
@classmethod
def setUpClass(cls):
cls.api_client = super(
TestHostHighAvailability,
cls
@ -150,8 +147,8 @@ class TestHostHighAvailability(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@attr(configuration = "ha.tag")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator"])
@attr(configuration="ha.tag")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator"])
def test_01_vm_deployment_with_compute_offering_with_ha_enabled(self):
""" Test VM deployments (Create HA enabled Compute Service Offering and VM) """
@ -215,8 +212,8 @@ class TestHostHighAvailability(cloudstackTestCase):
"VM not created with HA enable tag"
)
@attr(configuration = "ha.tag")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
@attr(configuration="ha.tag")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
def test_02_no_vm_creation_on_host_with_haenabled(self):
""" Verify you can not create new VMs on hosts with an ha.tag """
@ -340,8 +337,8 @@ class TestHostHighAvailability(cloudstackTestCase):
"VM migrated to HA enabled host."
)
@attr(configuration = "ha.tag")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
@attr(configuration="ha.tag")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
def test_03_cant_migrate_vm_to_host_with_ha_positive(self):
""" Verify you can not migrate VMs to hosts with an ha.tag (positive) """
@ -446,8 +443,8 @@ class TestHostHighAvailability(cloudstackTestCase):
"The VM is not migrated to targeted suitable host."
)
@attr(configuration = "ha.tag")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
@attr(configuration="ha.tag")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
def test_04_cant_migrate_vm_to_host_with_ha_negative(self):
""" Verify you can not migrate VMs to hosts with an ha.tag (negative) """
@ -551,9 +548,9 @@ class TestHostHighAvailability(cloudstackTestCase):
"The detination host id of migrated VM is not matching."
)
@attr(configuration = "ha.tag")
@attr(speed = "slow")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
@attr(configuration="ha.tag")
@attr(speed="slow")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
def test_05_no_vm_with_ha_gets_migrated_to_ha_host_in_live_migration(self):
""" Verify that none of the VMs with HA enabled migrate to an ha tagged host during live migration """
@ -683,9 +680,9 @@ class TestHostHighAvailability(cloudstackTestCase):
cmd.id = vm_with_ha_enabled.hostid
self.apiclient.cancelHostMaintenance(cmd)
@attr(configuration = "ha.tag")
@attr(speed = "slow")
@attr(tags = ["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
@attr(configuration="ha.tag")
@attr(speed="slow")
@attr(tags=["advanced", "advancedns", "sg", "basic", "eip", "simulator", "multihost"])
def test_06_no_vm_without_ha_gets_migrated_to_ha_host_in_live_migration(self):
""" Verify that none of the VMs without HA enabled migrate to an ha tagged host during live migration """

2
test/integration/component/test_vpc_host_maintenance.py
View File

@ -186,7 +186,6 @@ class Services:
}
@unittest.skip("No suitable setup available for testing")
class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
@classmethod
@ -562,7 +561,6 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase):
return
@unittest.skip("No suitable setup available for testing")
class TestVPCNetworkRules(cloudstackTestCase):
@classmethod