summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Yu <Gabriel.yuyang@huawei.com>2018-03-14 17:07:47 +0800
committerYang Yu <Gabriel.yuyang@huawei.com>2018-03-14 17:07:47 +0800
commit9400c02df69737daf14644d1113ac9c1173fa70a (patch)
tree56101c2497a3aa312b6f7e79a5c86c4578483e7e
parent75bf3ebba105798ce450b321a5d770fcee985896 (diff)
bugfix: stress ping for offline support
JIRA: BOTTLENECK-226 See above Change-Id: Iba5d21348355a80d6c17deb1a12114d1d07e5c15 Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>
-rw-r--r--testsuites/posca/testcase_script/posca_factor_ping.py2
-rw-r--r--utils/env_prepare/stack_prepare.py8
2 files changed, 8 insertions, 2 deletions
diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py
index ea79d3a..4ee4396 100644
--- a/testsuites/posca/testcase_script/posca_factor_ping.py
+++ b/testsuites/posca/testcase_script/posca_factor_ping.py
@@ -43,7 +43,7 @@ test_dict = {
}
testfile = os.path.basename(__file__)
testcase, file_format = os.path.splitext(testfile)
-cidr = "/home/opnfv/repos/yardstick/samples/storage_bottlenecks.yaml"
+cidr = "/home/opnfv/repos/yardstick/samples/ping_bottlenecks.yaml"
runner_DEBUG = True
q = Queue.Queue()
diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py
index c1ac395..6b9bc51 100644
--- a/utils/env_prepare/stack_prepare.py
+++ b/utils/env_prepare/stack_prepare.py
@@ -75,7 +75,13 @@ def _source_file(rc_file):
shell=True)
output = p.communicate()[0]
output_lines = output.splitlines()
- env = dict((line.split('=', 1) for line in output_lines))
+ env = list()
+ for line in output_lines:
+ if '=' in line:
+ env.append(tuple(line.split('=', 1)))
+
+ env = dict(env)
+# env = dict((line.split('=', 1) for line in output_lines))
os.environ.update(env)
return env