summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 08:47:54 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 08:47:54 +0000
commit54dc1c3f6d4eb8dab6fd67cdee8a5350becea8ae (patch)
tree1fd1911183625b51abcb4438e7c46ecf7e37e6a4
parent4fec779c4f537d07d8a2635900ecf1ecaf535fba (diff)
parent0d50a07e59dd87bf7b825ab69f06ac5e5f4b52b8 (diff)
Merge "Disable Murano tests"
-rw-r--r--fuelweb_test/tests/test_services.py3
-rw-r--r--fuelweb_test/tests/tests_os_components/test_murano_os_component.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py
index ce6de16..0464a42 100644
--- a/fuelweb_test/tests/test_services.py
+++ b/fuelweb_test/tests/test_services.py
@@ -328,7 +328,8 @@ class MuranoHAOneController(TestBasic):
328 self.env.make_snapshot("deploy_murano_ha_one_controller_tun") 328 self.env.make_snapshot("deploy_murano_ha_one_controller_tun")
329 329
330 330
331@test(groups=["services", "services.murano", "services_ha"]) 331@test(groups=["services", "services.murano", "services_ha"],
332 enabled=False)
332class MuranoHA(TestBasic): 333class MuranoHA(TestBasic):
333 """Murano HA tests. 334 """Murano HA tests.
334 Don't recommend to start tests without kvm. 335 Don't recommend to start tests without kvm.
diff --git a/fuelweb_test/tests/tests_os_components/test_murano_os_component.py b/fuelweb_test/tests/tests_os_components/test_murano_os_component.py
index adfd5b3..49d27d7 100644
--- a/fuelweb_test/tests/tests_os_components/test_murano_os_component.py
+++ b/fuelweb_test/tests/tests_os_components/test_murano_os_component.py
@@ -20,7 +20,8 @@ from fuelweb_test.tests.base_test_case import SetupEnvironment
20from fuelweb_test.tests.base_test_case import TestBasic 20from fuelweb_test.tests.base_test_case import TestBasic
21 21
22 22
23@test(groups=['murano_os_component', 'additional_components']) 23@test(groups=['murano_os_component', 'additional_components'],
24 enabled=False)
24class MuranoOSComponent(TestBasic): 25class MuranoOSComponent(TestBasic):
25 """MuranoOSComponent""" # TODO documentation 26 """MuranoOSComponent""" # TODO documentation
26 27