diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-04-27 13:47:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-27 13:47:27 +0000 |
| commit | 284c0a3e13aa1c3cc83bac3d4c9d6b69fc479b79 (patch) | |
| tree | 774acc12e3c1d27b5fa2229badd97917a5ff3512 | |
| parent | 0cca44508c3a171cb5e94347a3b555462ec31cd3 (diff) | |
| parent | 6604cb5f2d6e3c819cb8488f1ad3468184822cf9 (diff) | |
Merge "bugfix: fix HA testcases"
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml | 2 | ||||
| -rwxr-xr-x | yardstick/benchmark/scenarios/availability/ha_tools/check_process_python.bash | 2 |
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 |