Merge pull request #79 from opennetworkinglab/lincoe_disconnect
modify disconnect() in remotemininetdriver to take care to exit from min...
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index 389a077..9c9585a 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -376,9 +376,20 @@
if self.handle:
# Close the ssh connection
self.handle.sendline( "" )
- self.handle.expect( "\$" )
- self.handle.sendline( "exit" )
- self.handle.expect( "closed" )
+ #self.handle.expect( "\$" )
+ i = self.handle.expect( [ '\$', 'mininet>', pexpect.TIMEOUT ],
+ timeout = 2)
+ if i == 0:
+ self.handle.sendline( "exit" )
+ self.handle.expect( "closed" )
+ elif i == 1:
+ self.handle.sendline( "exit" )
+ self.handle.expect( "exit" )
+ self.handle.expect('\$')
+ self.handle.sendline( "exit" )
+ self.handle.expect( "exit" )
+ self.handle.expect( "closed" )
+
else:
main.log.error( "Connection failed to the host" )
return main.TRUE