Fix for driver disconnect bug
* Fix in remotemininetdriver which caused an exception
* Modify teston.py to print exceptions encountered in disconnect
* Fix Typo in mininet driver and modify log messages
* Add return values to the disconnect functions
* some code cleanup in teston.py
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index ad9e896..389a077 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -373,12 +373,7 @@
"""
Called at the end of the test to disconnect the handle.
"""
- response = ''
- # print "Disconnecting Mininet"
if self.handle:
- self.handle.sendline( "exit" )
- self.handle.expect( "exit" )
- self.handle.expect( "(.*)" )
# Close the ssh connection
self.handle.sendline( "" )
self.handle.expect( "\$" )
@@ -386,6 +381,7 @@
self.handle.expect( "closed" )
else:
main.log.error( "Connection failed to the host" )
+ return main.TRUE
def getFlowTable( self, protoVersion, sw ):
"""