From bdf5a903cbb378c9acfa476664cac899af9d47e6 Mon Sep 17 00:00:00 2001 From: Dmitry Belyaninov Date: Fri, 3 Mar 2017 14:27:27 +0100 Subject: [PATCH] Update murano-api services count Current value is 6 processes. Also deprecated function change. Change-Id: I69ab82b332c6bfa7e00c9999a72b4225bddffcb3 Closes-Bug: 1654267 (cherry picked from commit 46d2680d9e41dac33f3ca04b4d48af123af2f9f9) --- fuelweb_test/helpers/checkers.py | 4 ++-- fuelweb_test/tests/test_services.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fuelweb_test/helpers/checkers.py b/fuelweb_test/helpers/checkers.py index d86cb4f95..2780b1570 100644 --- a/fuelweb_test/helpers/checkers.py +++ b/fuelweb_test/helpers/checkers.py @@ -126,9 +126,9 @@ def check_image(image, md5, path): @logwrap def verify_service(ip, service_name, count=1, ignore_count_of_proccesses=False): - ps_output = ssh_manager.execute_on_remote( + ps_output = ssh_manager.check_call( ip=ip, - cmd='ps ax' + command='ps ax' )['stdout'] api = [ps for ps in ps_output if service_name in ps] logger.debug("{} \\n: {}".format(service_name, str(api))) diff --git a/fuelweb_test/tests/test_services.py b/fuelweb_test/tests/test_services.py index 1e9bf7afa..1d488dad6 100644 --- a/fuelweb_test/tests/test_services.py +++ b/fuelweb_test/tests/test_services.py @@ -247,7 +247,8 @@ class SaharaHA(TestBasic): self.env.make_snapshot("deploy_sahara_ha_tun") -@test(groups=["services", "services.murano", "services_ha_one_controller"]) +@test(groups=["services", "services.murano", "services_ha_one_controller"], + enabled=False) class MuranoHAOneController(TestBasic): """Murano HA with 1 controller tests. Don't recommend to start tests without kvm. @@ -301,7 +302,8 @@ class MuranoHAOneController(TestBasic): self.fuel_web.deploy_cluster_wait(cluster_id) _ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip'] - checkers.verify_service(_ip, service_name='murano-api') + checkers.verify_service(_ip, service_name='murano-api', + ignore_count_of_proccesses=True) logger.debug('Run sanity and functional Murano OSTF tests') self.fuel_web.run_ostf(cluster_id=cluster_id, test_sets=['sanity'])