From ff72c32921ce373451740d3474d40951780e7a30 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Mon, 26 Jun 2017 03:23:40 +0000 Subject: Fix refstack_defcore As refstack-client is reinstalled only by the shell setup_env, the path of .venv and .tempest have been changed. Change-Id: Id50d0c6384295c2448705961942104abbd799b9b Signed-off-by: Linda Wang --- .../refstack_client/test_refstack_client.py | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'functest/tests/unit/openstack') 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) -- cgit 1.2.3-korg