[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/FUNCflow/FUNCflow.py b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
index 0b02465..9b504ba 100644
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.py
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
@@ -31,7 +31,7 @@
from tests.dependencies.ONOSSetup import ONOSSetup
except ImportError:
main.log.error( "SetUp not found exiting the test" )
- main.exit()
+ main.cleanAndExit()
try:
main.testSetUp
except ( NameError, AttributeError ):
@@ -72,7 +72,7 @@
except ImportError as e:
print e
main.log.error("CheckingFlow not found exiting the test")
- main.exit()
+ main.cleanAndExit()
copyResult = main.ONOSbench.scp( main.Mininet1,
main.dependencyPath + main.topology,
main.Mininet1.home + '/custom/',
@@ -117,7 +117,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 ):
@@ -619,8 +619,7 @@
stepResult = main.FALSE
except ValueError:
main.log.error( "Problem getting Flows state from REST API. Exiting test" )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,
@@ -1028,8 +1027,7 @@
stepResult = main.FALSE
except ValueError:
main.log.error( "Problem getting Flows state from REST API. Exiting test" )
- main.cleanup()
- main.exit()
+ main.cleanAndExit()
utilities.assert_equals( expect=main.TRUE,
actual=stepResult,