From: Yu Yang (Gabriel) <Gabriel.yuyang@huawei.com>
Date: Thu, 15 Mar 2018 07:47:10 +0000 (+0000)
Subject: Merge "support hosts file copy"
X-Git-Tag: opnfv-6.0.0~8
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=28ac6b8788b3acc561c35c9946f73abb735c1df1;hp=b8b65fbc102f632a1c83cd3fc67dc2b921902a8a;p=bottlenecks.git

Merge "support hosts file copy"
---

diff --git a/testsuites/posca/testcase_script/posca_factor_ping.py b/testsuites/posca/testcase_script/posca_factor_ping.py
index ea79d3ad..4ee43964 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 c1ac395a..6b9bc510 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