aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-02-15 14:45:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-15 14:45:33 +0000
commit9476136e4f67cbb9853683c871bb699918a45ee6 (patch)
treef2591557ee74360a8d925938eab1d524d50a50e1 /functest/opnfv_tests/openstack
parentcf456f4397e0920da49289b3d90f0a9da62d025a (diff)
parentc9672ce9e26dc14f5f5bead2e49c0daaddc2cda6 (diff)
Merge "Stop reading NODE_NAME in tempest and refstack"
Diffstat (limited to 'functest/opnfv_tests/openstack')
-rw-r--r--functest/opnfv_tests/openstack/refstack_client/refstack_client.py10
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py13
2 files changed, 1 insertions, 22 deletions
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index cb2ba220..beb1a5a6 100644
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -84,16 +84,6 @@ class RefstackClient(testcase.TestCase):
LOGGER.info("Starting Refstack_defcore test case: '%s'.", cmd)
with open(os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
- "environment.log"), 'w+') as f_env:
- f_env.write(
- ("Refstack environment:\n"
- " SUT: {}\n Scenario: {}\n Node: {}\n Date: {}\n")
- .format(os.getenv('INSTALLER_TYPE', None),
- os.getenv('DEPLOY_SCENARIO', None),
- os.getenv('NODE_NAME', 'unknown_pod'),
- time.strftime("%a %b %d %H:%M:%S %Z %Y")))
-
- with open(os.path.join(conf_utils.REFSTACK_RESULTS_DIR,
"refstack.log"), 'w+') as f_stdout:
subprocess.call(cmd, shell=False, stdout=f_stdout,
stderr=subprocess.STDOUT)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 01caf4ff..56705fc0 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -164,21 +164,11 @@ class TempestCommon(testcase.TestCase):
cmd.extend(self.option)
LOGGER.info("Starting Tempest test suite: '%s'.", cmd)
- header = ("Tempest environment:\n"
- " SUT: %s\n Scenario: %s\n Node: %s\n Date: %s\n" %
- (CONST.__getattribute__('INSTALLER_TYPE'),
- CONST.__getattribute__('DEPLOY_SCENARIO'),
- CONST.__getattribute__('NODE_NAME'),
- time.strftime("%a %b %d %H:%M:%S %Z %Y")))
-
f_stdout = open(
os.path.join(conf_utils.TEMPEST_RESULTS_DIR, "tempest.log"), 'w+')
f_stderr = open(
os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
"tempest-error.log"), 'w+')
- f_env = open(os.path.join(conf_utils.TEMPEST_RESULTS_DIR,
- "environment.log"), 'w+')
- f_env.write(header)
proc = subprocess.Popen(
cmd,
@@ -201,7 +191,6 @@ class TempestCommon(testcase.TestCase):
f_stdout.close()
f_stderr.close()
- f_env.close()
def parse_verifier_result(self):
"""Parse and save test results."""
@@ -246,7 +235,7 @@ class TempestCommon(testcase.TestCase):
LOGGER.info("Tempest %s success_rate is %s%%",
self.case_name, self.result)
- def run(self):
+ def run(self, **kwargs):
self.start_time = time.time()
try: