summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-05-04 01:34:28 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-04 01:34:28 +0000
commitfae70e08d91ff09b175098ef2f0fdef894bbb138 (patch)
tree2b82d8936bde8831b43bbc1524653e7d5b0e3a9d
parent6990400d9c020ed0f600e02141efec883593c6c6 (diff)
parentde1304d0c1e1e43c4b02ec4b715bb79ef36134a9 (diff)
Merge "bugfix: fix HA testcases" into stable/danube
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml2
-rwxr-xr-xyardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index b6bbb8966..cc5b5cd3e 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -34,7 +34,7 @@ scenarios:
host: node1
monitor_time: 20
sla:
- max_recover_time: 30
+ max_recover_time: 20
-
monitor_type: "openstack-cmd"
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash b/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash
index 88baed7d9..7c275f7ce 100755
--- a/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash
@@ -15,4 +15,4 @@ set -e
process_name=$1
-ps aux | grep -e .*python.*$process_name.* | grep -v grep | wc -l
+ps aux | grep -e $process_name | grep -v grep | wc -l