diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-07-04 07:46:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-04 07:46:50 +0000 |
| commit | 2e6b361f4752b4ba5d6f03b469b0983b7b245630 (patch) | |
| tree | e0c09f20162dfe626cf85639adb468aa613f2038 /functest/cli | |
| parent | c14a40a88ff496f981e61837f605027e65b2c345 (diff) | |
| parent | 0ead7c9e03034bbb40b68a468a6deaa339b0364e (diff) | |
Merge "Update cli commands to call console scripts"
Diffstat (limited to 'functest/cli')
| -rw-r--r-- | functest/cli/commands/cli_env.py | 5 | ||||
| -rw-r--r-- | functest/cli/commands/cli_testcase.py | 5 | ||||
| -rw-r--r-- | functest/cli/commands/cli_tier.py | 3 |
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) |