From 470f573a3ac2eb1783efec6da01a3bee33360c65 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Sep 2016 10:19:58 +0800 Subject: stop hardcoded FUNCTEST_REPO path everywhere functest repo is used by almost every testcase, each place we get it like: REPOS_DIR = os.getenv('repos_dir') FUNCTEST_REPO = ("%s/functest" % REPOS_DIR) provide a common interface in functest_util.py JIRA: FUNCTEST-453 Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf Signed-off-by: SerenaFeng --- cli/commands/cli_testcase.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cli/commands/cli_testcase.py') diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index 498f08132..68f9ed610 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -15,6 +15,7 @@ import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() @@ -54,9 +55,9 @@ class CliTestcase: "Run first 'functest env prepare'") else: if noclean: - cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py " - "-n -t %s" % testname) + cmd = ("python %s/ci/run_tests.py " + "-n -t %s" % (FUNCTEST_REPO, testname)) else: - cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py " - "-t %s" % testname) + cmd = ("python %s/ci/run_tests.py " + "-t %s" % (FUNCTEST_REPO, testname)) ft_utils.execute_command(cmd) -- cgit 1.2.3-korg