[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/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index ddf0570..81a1b25 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -38,7 +38,7 @@
from tests.dependencies.Cluster import Cluster
except ImportError:
main.log.error( "Cluster not found. exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.Cluster
except ( NameError, AttributeError ):
@@ -60,7 +60,7 @@
actual=stepResult,
onpass="Successfully checkout onos branch.",
onfail="Failed to checkout onos branch. Exiting test..." )
- if not stepResult: main.exit()
+ if not stepResult: main.cleanAndExit()
main.step( "Git Pull on ONOS branch:" + gitBranch )
stepResult = main.ONOSbench.gitPull()
@@ -68,7 +68,7 @@
actual=stepResult,
onpass="Successfully pull onos. ",
onfail="Failed to pull onos. Exiting test ..." )
- if not stepResult: main.exit()
+ if not stepResult: main.cleanAndExit()
else:
main.log.info( "Skipped git checkout and pull as they are disabled in params file" )
@@ -89,7 +89,7 @@
from tests.dependencies.Cluster import Cluster
except ImportError:
main.log.error( "Cluster not found. exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.Cluster
except ( NameError, AttributeError ):
@@ -107,8 +107,7 @@
* includeGitPull - exceeption code e.
"""
main.log.exception( e )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
def evnSetupConclusion( self, stepResult ):
"""
@@ -242,8 +241,7 @@
onpass="Successfully installed ONOS package",
onfail="Failed to install ONOS package" )
if not onosInstallResult:
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
return onosInstallResult
def setupSsh( self, cluster ):
@@ -295,8 +293,7 @@
startCliResult = cluster.startCLIs()
if not startCliResult:
main.log.info( "ONOS CLI did not start up properly" )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
else:
main.log.info( "Successful CLI startup" )
utilities.assert_equals( expect=main.TRUE,