diff options
| -rw-r--r-- | src/onaptests/scenario/cds_resource_resolution.py | 17 | ||||
| -rw-r--r-- | src/onaptests/scenario/pnf_macro.py | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/src/onaptests/scenario/cds_resource_resolution.py b/src/onaptests/scenario/cds_resource_resolution.py index 608734b..8c40916 100644 --- a/src/onaptests/scenario/cds_resource_resolution.py +++ b/src/onaptests/scenario/cds_resource_resolution.py @@ -79,15 +79,14 @@ class CDSResourceResolution(testcase.TestCase): self.__logger.debug("CDS resource resolution run") self.start_time = time.time() try: - self.test.execute() - self.test.cleanup() - self.result = 100 - except OnapTestException as exc: - self.result = 0 - self.__logger.error(exc.error_message) - except SDKException: - self.result = 0 - self.__logger.error("SDK Exception") + for test_phase in (self.test.execute, self.test.cleanup): + try: + test_phase() + self.result += 50 + except OnapTestException as exc: + self.__logger.error(exc.error_message) + except SDKException: + self.__logger.error("SDK Exception") finally: self.stop_time = time.time() diff --git a/src/onaptests/scenario/pnf_macro.py b/src/onaptests/scenario/pnf_macro.py index 931a332..b3c7d3e 100644 --- a/src/onaptests/scenario/pnf_macro.py +++ b/src/onaptests/scenario/pnf_macro.py @@ -119,15 +119,14 @@ class PnfMacro(testcase.TestCase): """Run PNF macro test.""" self.start_time = time.time() try: - self.test.execute() - self.test.cleanup() - self.result = 100 - except OnapTestException as exc: - self.result = 0 - self.__logger.error(exc.error_message) - except SDKException: - self.result = 0 - self.__logger.error("SDK Exception") + for test_phase in (self.test.execute, self.test.cleanup): + try: + test_phase() + self.result += 50 + except OnapTestException as exc: + self.__logger.error(exc.error_message) + except SDKException: + self.__logger.error("SDK Exception") finally: self.stop_time = time.time() |