diff options
| author |   Carlos Goncalves <carlos.goncalves@neclab.eu> | 2016-08-31 15:33:56 +0200 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2016-09-06 15:16:31 +0200 |
| commit | a7d390f6a5d05cb632d933c03f170b5bc25be534 (patch) | |
| tree | 0ada4f2a7a5cc4234d84acdd34bb4a9e6337b141 /testcases/OpenStack/tempest | |
| parent | 8899c821fcd665dc68c7f428c94c5b4cbd944af6 (diff) | |
Remove all logers as utils method args.
As it modifies method params, it could break the testcases.
JIRA: FUNCTEST-428
Conflicts:
testcases/features/copper.py
testcases/features/doctor.py
testcases/features/domino.py
Change-Id: I4263d9bd812f1803e513464e3c321cc4a7281958
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 8bfe49ee5a6d7b93b3ce7fb6aae0072acb1171d9)
Diffstat (limited to 'testcases/OpenStack/tempest')
| -rwxr-xr-x | testcases/OpenStack/tempest/gen_tempest_conf.py | 2 | ||||
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py index 4aa814a51..688a92402 100755 --- a/testcases/OpenStack/tempest/gen_tempest_conf.py +++ b/testcases/OpenStack/tempest/gen_tempest_conf.py @@ -116,7 +116,7 @@ def main(): if not os.path.exists(TEMPEST_RESULTS_DIR): os.makedirs(TEMPEST_RESULTS_DIR) - deployment_dir = ft_utils.get_deployment_dir(logger) + deployment_dir = ft_utils.get_deployment_dir() configure_tempest_multisite(deployment_dir) diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 390c8a65f..e93972182 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -163,7 +163,7 @@ def configure_tempest(deployment_dir): logger.debug("Generating new tempest.conf file...") cmd = "rally verify genconfig" - ft_utils.execute_command(cmd, logger) + ft_utils.execute_command(cmd) logger.debug("Finding tempest.conf file...") if not os.path.isfile(tempest_conf_file): @@ -225,7 +225,7 @@ def generate_test_list(deployment_dir, mode): testr_mode = 'tempest.api.' + mode cmd = ("cd " + deployment_dir + ";" + "testr list-tests " + testr_mode + ">" + TEMPEST_RAW_LIST + ";cd") - ft_utils.execute_command(cmd, logger) + ft_utils.execute_command(cmd) def apply_tempest_blacklist(): @@ -370,7 +370,6 @@ def run_tempest(OPTION): try: ft_utils.push_results_to_db("functest", case_name, - None, start_time, stop_time, status, @@ -396,7 +395,7 @@ def main(): if not os.path.exists(TEMPEST_RESULTS_DIR): os.makedirs(TEMPEST_RESULTS_DIR) - deployment_dir = ft_utils.get_deployment_dir(logger) + deployment_dir = ft_utils.get_deployment_dir() create_tempest_resources() if "" == args.conf: |