From c9672ce9e26dc14f5f5bead2e49c0daaddc2cda6 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 13 Feb 2018 19:13:28 +0100 Subject: Stop reading NODE_NAME in tempest and refstack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NODE_NAME should only be read by TestCase when publishing the results to the database. Other debug data are already printed by run_tests. INSTALLER_TYPE and DEPLOY_SCENARIO are also unused by refstack. Change-Id: Ib82d5c1512553beba2c56f4ec2860cb2593f801e Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/tempest.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py') 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: -- cgit 1.2.3-korg