aboutsummaryrefslogtreecommitdiffstats
path: root/src/onaptests/scenario/pnf_macro.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/onaptests/scenario/pnf_macro.py')
-rw-r--r--src/onaptests/scenario/pnf_macro.py17
1 files changed, 8 insertions, 9 deletions
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()