[ONOS-6901] Fix how the systemTest does not return any result when it forced to quit the test
Change-Id: If93c48d46e8dc2494046b42de21f732775d7f520
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index 9de5740..2b85fc2 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -45,7 +45,7 @@
main.testSetUp = ONOSSetup()
except ImportError:
main.log.error( "ONOSSetup not found. exiting the test" )
- main.exit()
+ main.cleanAndExit()
main.testSetUp.envSetupDescription()
stepResult = main.FALSE
@@ -123,7 +123,7 @@
from tests.dependencies.topology import Topology
except ImportError:
main.log.error( "Topology not found exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.topoRelated
except ( NameError, AttributeError ):
@@ -387,7 +387,7 @@
from tests.dependencies.utils import Utils
except ImportError:
main.log.error( "Utils not found exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.Utils
except ( NameError, AttributeError ):
@@ -417,8 +417,7 @@
mininetResult = main.Utils.mininetCleanup( main.Mininet1 )
# Exit if topology did not load properly
if not ( mininetResult and scapyResult ):
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
def CASE19( self, main ):
"""
@@ -428,7 +427,7 @@
from tests.dependencies.utils import Utils
except ImportError:
main.log.error( "Utils not found exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.Utils
except ( NameError, AttributeError ):