Merge "Fix refstack_defcore"

3 files changed, 9 insertions, 39 deletions

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 2e86cc54..42daaa16 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -23,7 +23,6 @@ general:
         ims_data:           /home/opnfv/functest/data/ims/
         functest_images:    /home/opnfv/functest/images
         rally_inst:         /home/opnfv/.rally
-        refstack_client:    /home/opnfv/repos/refstack-client
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 30d1cf08..c4618894 100755
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
 # matthew.lijun@huawei.com wangwulin@huawei.com
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -45,31 +45,18 @@ class RefstackClient(testcase.OSGCTestCase):
         self.defcorelist = pkg_resources.resource_filename(
             'functest', 'opnfv_tests/openstack/refstack_client/defcore.txt')
 
-    def source_venv(self):
-
-        cmd = ("cd {0};"
-               ". .venv/bin/activate;"
-               "cd -;".format(CONST.__getattribute__('dir_refstack_client')))
-        ft_utils.execute_command(cmd)
-
     def run_defcore(self, conf, testlist):
         logger.debug("Generating test case list...")
 
-        cmd = ("cd {0};"
-               "./refstack-client test -c {1} -v --test-list {2};"
-               "cd -;".format(CONST.__getattribute__('dir_refstack_client'),
-                              conf,
-                              testlist))
+        cmd = ("refstack-client test -c {0} -v --test-list {1}"
+               .format(conf, testlist))
         ft_utils.execute_command(cmd)
 
     def run_defcore_default(self):
         logger.debug("Generating test case list...")
 
-        cmd = ("cd {0};"
-               "./refstack-client test -c {1} -v --test-list {2};"
-               "cd -;".format(CONST.__getattribute__('dir_refstack_client'),
-                              self.confpath,
-                              self.defcorelist))
+        cmd = ("refstack-client test -c {0} -v --test-list {1}"
+               .format(self.confpath, self.defcorelist))
         logger.info("Starting Refstack_defcore test case: '%s'." % cmd)
 
         header = ("Refstack environment:\n"
@@ -159,7 +146,6 @@ class RefstackClient(testcase.OSGCTestCase):
         try:
             tempestconf = TempestConf()
             tempestconf.generate_tempestconf()
-            self.source_venv()
             self.run_defcore_default()
             self.parse_refstack_result()
             res = testcase.TestCase.EX_OK
@@ -192,7 +178,6 @@ class RefstackClient(testcase.OSGCTestCase):
                          "%s", e)
             return self.EX_RUN_ERROR
         try:
-            self.source_venv()
             self._prep_test()
             self.run_defcore(self.confpath, self.testlist)
             res = testcase.TestCase.EX_OK
diff --git a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
index 3a121245..f92d2806 100644
--- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
+++ b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-
+# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
+# matthew.lijun@huawei.com wangwulin@huawei.com
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -12,7 +13,6 @@ import unittest
 
 from functest.core import testcase
 from functest.opnfv_tests.openstack.refstack_client import refstack_client
-from functest.utils.constants import CONST
 
 
 class OSRefstackClientTesting(unittest.TestCase):
@@ -28,27 +28,13 @@ class OSRefstackClientTesting(unittest.TestCase):
                             'testlist': self._testlist}
         self.refstackclient = refstack_client.RefstackClient()
 
-    def test_source_venv(self):
-        with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
-                        'refstack_client.ft_utils.execute_command') as m:
-            cmd = ("cd {0};"
-                   ". .venv/bin/activate;"
-                   "cd -;"
-                   .format(CONST.__getattribute__('dir_refstack_client')))
-            self.refstackclient.source_venv()
-            m.assert_any_call(cmd)
-
     def test_run_defcore(self):
         config = 'tempest.conf'
         testlist = 'testlist'
         with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
                         'refstack_client.ft_utils.execute_command') as m:
-            cmd = ("cd {0};"
-                   "./refstack-client test -c {1} -v --test-list {2};"
-                   "cd -;"
-                   .format(CONST.__getattribute__('dir_refstack_client'),
-                           config,
-                           testlist))
+            cmd = ("refstack-client test -c {0} -v --test-list {1}"
+                   .format(config, testlist))
             self.refstackclient.run_defcore(config, testlist)
             m.assert_any_call(cmd)