From 75f99aaeadada56dfc974746cd83fec275133a3c Mon Sep 17 00:00:00 2001 From: liyin Date: Mon, 17 Jul 2017 17:45:38 +0800 Subject: Bug fix of Bottlenecks can't use CLI JIRA: BOTTLENECK-171 Bug fix of Bottlenecks can't use CLI to start test. Some docker-compose function delete to fit elk docker support. After this patch you could use bottlenecks testcase run posca_factor_ping to start this test. you also need to put the rc file to bottlenecks docker. Change-Id: I340e31185a499c81f9595a902df89d8f0ddf0cd3 Signed-off-by: liyin --- testsuites/posca/testcase_script/posca_factor_ping.py | 2 +- testsuites/run_testsuite.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'testsuites') diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py index 5f56cdae..e46a919f 100644 --- a/testsuites/posca/testcase_script/posca_factor_ping.py +++ b/testsuites/posca/testcase_script/posca_factor_ping.py @@ -67,8 +67,8 @@ def do_test(test_config, con_dic): loop_walue = 0 while loop_walue < 150: time.sleep(2) + loop_walue = loop_walue + 1 with open(out_file) as f: - loop_walue = loop_walue + 1 data = json.load(f) if data["status"] == 1: if data["result"]["criteria"] == "PASS": diff --git a/testsuites/run_testsuite.py b/testsuites/run_testsuite.py index 7ec67eff..1e8d8953 100644 --- a/testsuites/run_testsuite.py +++ b/testsuites/run_testsuite.py @@ -77,6 +77,7 @@ def report(testcase, start_date, stop_date, criteria, details_doc): def docker_env_prepare(config): + LOG.info("Begin to prepare docker environment") if 'contexts' in config.keys() and config["contexts"] is not None: context_config = config["contexts"] if 'yardstick' in context_config.keys() and \ @@ -89,6 +90,7 @@ def docker_env_prepare(config): conf_parser.Parser.convert_docker_env(config, "dashboard") LOG.debug('Waiting for ELK init') time.sleep(15) + LOG.info("Docker environment have prepared") return -- cgit 1.2.3-korg