aboutsummaryrefslogtreecommitdiffstats
path: root/functest/cli
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-07-02 12:56:09 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-07-02 14:02:51 +0200
commit0ead7c9e03034bbb40b68a468a6deaa339b0364e (patch)
tree7002b06d6723b1569d4456547a69b04fb60b3203 /functest/cli
parent3dcd1e4db7540459d3dff337684547d68fea2b44 (diff)
Update cli commands to call console scripts
Change-Id: I401879d7ec713b5307817da8b001838c35d9d731 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/cli')
-rw-r--r--functest/cli/commands/cli_env.py5
-rw-r--r--functest/cli/commands/cli_testcase.py5
-rw-r--r--functest/cli/commands/cli_tier.py3
3 files changed, 3 insertions, 10 deletions
diff --git a/functest/cli/commands/cli_env.py b/functest/cli/commands/cli_env.py
index ce977572..99d36996 100644
--- a/functest/cli/commands/cli_env.py
+++ b/functest/cli/commands/cli_env.py
@@ -8,7 +8,6 @@
#
import os
-import pkg_resources
import click
import prettytable
@@ -36,9 +35,7 @@ class CliEnv(object):
else:
answer = raw_input("Invalid answer. Please type [y|n]\n")
- cmd = ("python %s start" % pkg_resources.resource_filename(
- 'functest', 'ci/prepare_env.py'))
- ft_utils.execute_command(cmd)
+ ft_utils.execute_command("prepare_env start")
def show(self):
def _get_value(attr, default='Unknown'):
diff --git a/functest/cli/commands/cli_testcase.py b/functest/cli/commands/cli_testcase.py
index 91904d87..cb3d4739 100644
--- a/functest/cli/commands/cli_testcase.py
+++ b/functest/cli/commands/cli_testcase.py
@@ -60,8 +60,5 @@ class CliTestcase(object):
else:
tests = testname.split(",")
for test in tests:
- cmd = ("python %s %s -t %s" %
- (pkg_resources.resource_filename(
- 'functest', 'ci/run_tests.py'),
- flags, test))
+ cmd = "run_tests {}-t {}".format(flags, test)
ft_utils.execute_command(cmd)
diff --git a/functest/cli/commands/cli_tier.py b/functest/cli/commands/cli_tier.py
index 48e9f542..9b2e60ba 100644
--- a/functest/cli/commands/cli_tier.py
+++ b/functest/cli/commands/cli_tier.py
@@ -68,6 +68,5 @@ class CliTier(object):
click.echo("Functest environment is not ready. "
"Run first 'functest env prepare'")
else:
- cmd = ("python %s %s -t %s" % (pkg_resources.resource_filename(
- 'functest', 'ci/run_tests.py'), flags, tiername))
+ cmd = "run_tests {}-t {}".format(flags, tiername)
ft_utils.execute_command(cmd)