openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Revert "Disable Murano tests""

This commit is contained in:
Jenkins 2016-04-26 08:43:59 +00:00 committed by Gerrit Code Review
parent 6b5393ba22 86b0990fba
commit 55f5b608cf
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuelweb_test/tests/test_ha_one_controller.py
View File

@ -476,6 +476,7 @@ class MultiroleMultipleServices(TestBasic):
'net_provider': 'neutron',
'net_segment_type': NEUTRON_SEGMENT['tun'],
'sahara': True,
'murano': True,
'ceilometer': True,
'volumes_lvm': True,
'volumes_ceph': False,

11
fuelweb_test/tests/test_services.py
View File

@ -239,14 +239,12 @@ class SaharaHA(TestBasic):
self.env.make_snapshot("deploy_sahara_ha_tun")
@test(enabled=False,
groups=["services", "services.murano", "services_ha_one_controller"])
@test(groups=["services", "services.murano", "services_ha_one_controller"])
class MuranoHAOneController(TestBasic):
"""Murano HA with 1 controller tests.
Don't recommend to start tests without kvm.
"""
# TODO (tleontovich) Update tests with Murano Plugin
@test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_3],
@test(depends_on=[SetupEnvironment.prepare_slaves_3],
groups=["deploy_murano_ha_one_controller_tun"])
@log_snapshot_after_test
def deploy_murano_ha_one_controller_tun(self):
@ -324,13 +322,12 @@ class MuranoHAOneController(TestBasic):
self.env.make_snapshot("deploy_murano_ha_one_controller_tun")
@test(enabled=False, groups=["services", "services.murano", "services_ha"])
@test(groups=["services", "services.murano", "services_ha"])
class MuranoHA(TestBasic):
"""Murano HA tests.
Don't recommend to start tests without kvm.
"""
# TODO (tleontovich) Update test with Murano Plugin
@test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_5],
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_murano_ha_with_tun"])
@log_snapshot_after_test
def deploy_murano_ha_with_tun(self):

5
fuelweb_test/tests/tests_os_components/test_mixed_os_components.py
View File

@ -23,8 +23,8 @@ from fuelweb_test.tests.base_test_case import TestBasic
@test(groups=["mixed_os_components", "additional_components"])
class MixedComponents(TestBasic):
"""MixedComponents""" # TODO documentation
# TODO (tleontovich) Update test with Murano Plugin
@test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=["mixed_components_murano_sahara_ceilometer"])
@log_snapshot_after_test
def mixed_components_murano_sahara_ceilometer(self):
@ -51,6 +51,7 @@ class MixedComponents(TestBasic):
"""
self.env.revert_snapshot('ready_with_9_slaves')
data = {
'murano': True,
'sahara': True,

6
fuelweb_test/tests/tests_os_components/test_murano_os_component.py
View File

@ -20,11 +20,11 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
@test(enabled=False, groups=['murano_os_component', 'additional_components'])
@test(groups=['murano_os_component', 'additional_components'])
class MuranoOSComponent(TestBasic):
"""MuranoOSComponent""" # TODO documentation
# TODO (tleontovich) Update test with Murano Plugin
@test(enabled=False, depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
groups=['murano_neutron_vlan'])
@log_snapshot_after_test
def murano_neutron_vlan(self):