[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/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
index 3a042a5..36f1eb4 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
@@ -115,12 +115,10 @@
"""
if len( speakers ) == 0:
main.log.error( "Parameter speakers can not be empty." )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
if len( peers ) == 0:
main.log.error( "Parameter speakers can not be empty." )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
if expectAllSuccess:
main.step( "BGP speakers ping peers, expect all tests to succeed" )
@@ -145,8 +143,7 @@
onfail = "Ping test results are Not expected" )
if result == False:
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
def pingHostToHost( main, hosts = ["h64514", "h64515", "h64516"],
@@ -162,8 +159,7 @@
str( expectAllSuccess ) )
if len( hosts ) == 0:
main.log.error( "Parameter hosts can not be empty." )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
result = True
if expectAllSuccess:
@@ -187,8 +183,7 @@
'''
if result == False:
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
'''
@@ -211,6 +206,5 @@
onpass = "Created tunnel succeeded",
onfail = "Create tunnel failed" )
if ( "PasswordAuthentication" not in tunnelResult ) :
- main.cleanup()
- main.exit()
+ main.cleanAndExit()