diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-20 08:38:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-20 08:38:58 +0000 |
| commit | 4bd1f64734b39e55ae9975af3b3f291a4ed16a0e (patch) | |
| tree | 6d4a9fb73cda97a6e3fbcad578a4d75d99f86045 | |
| parent | eaaab38780fc23ee6a6ba210100629c97ada7c5b (diff) | |
| parent | d369c8109cf83e212d245a0d0c5a60f0888911fc (diff) | |
Merge "Put TestResults.json in the right dir"
| -rw-r--r-- | functest/opnfv_tests/vnf/epc/juju_epc.py | 10 |
1 files 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') |