Use logout instead of shutdown when exiting tests
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index d312f16..6b2335f 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -82,18 +82,11 @@
"""
response = main.TRUE
try:
- self.handle.sendline( "" )
- i = self.handle.expect( [ "onos>", "\$" ] )
- if i == 0:
- self.handle.sendline( "system:shutdown" )
- self.handle.expect( "Confirm" )
- self.handle.sendline( "yes" )
- self.handle.expect( "\$" )
+ self.logout()
self.handle.sendline( "" )
self.handle.expect( "\$" )
self.handle.sendline( "exit" )
self.handle.expect( "closed" )
-
except TypeError:
main.log.exception( self.name + ": Object not as expected" )
response = main.FALSE
@@ -111,15 +104,15 @@
"""
try:
self.handle.sendline( "" )
- i = self.handle.expect( [
- "onos>",
- "\$" ], timeout=10 )
- if i == 0:
+ i = self.handle.expect( [ "onos>", "\$", pexpect.TIMEOUT ],
+ timeout=10 )
+ if i == 0: # In ONOS CLI
self.handle.sendline( "logout" )
self.handle.expect( "\$" )
- elif i == 1:
+ elif i == 1: # not in CLI
return main.TRUE
-
+ elif i == 3: # Timeout
+ return main.FALSE
except TypeError:
main.log.exception( self.name + ": Object not as expected" )
return None