From d369c8109cf83e212d245a0d0c5a60f0888911fc Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 19 Mar 2018 22:35:10 +0100 Subject: Put TestResults.json in the right dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/26/console Change-Id: Icfdc0030d517b1885a94c2815aeb35257fdfd590 Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/vnf/epc/juju_epc.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py index 58626acd9..0f1ef48f8 100644 --- a/functest/opnfv_tests/vnf/epc/juju_epc.py +++ b/functest/opnfv_tests/vnf/epc/juju_epc.py @@ -382,10 +382,10 @@ class JujuEpc(vnf.VnfOnBoarding): self.__logger.info("Getting results from Abot node....") os.system('juju scp abot-epc-basic/0:/var/lib/abot-' 'epc-basic/artifacts/TestResults.json {}/.' - .format(self.case_dir)) + .format(self.res_dir)) self.__logger.info("Parsing the Test results...") - res = (process_abot_test_result('{}/TestResults.' - 'json'.format(self.case_dir))) + res = (process_abot_test_result('{}/TestResults.json'.format( + self.res_dir))) short_result = sig_test_format(res) self.__logger.info(short_result) self.details['test_vnf'].update(status='PASS', @@ -402,10 +402,6 @@ class JujuEpc(vnf.VnfOnBoarding): """Clean created objects/functions.""" try: if not self.orchestrator['requirements']['preserve_setup']: - self.__logger.info("Removing deployment files...") - testresult = os.path.join(self.case_dir, 'TestResults.json') - if os.path.exists(testresult): - os.remove(testresult) self.__logger.info("Destroying Orchestrator...") os.system('juju destroy-controller -y abot-controller ' '--destroy-all-models') -- cgit 1.2.3-korg