commit 9627f4380ea63621da3ab65d8be1fbb21233afb1
author andrewonlab <andrew@onlab.us> Fri Nov 14 12:45:10 2014 -0500
committer andrewonlab <andrew@onlab.us> Fri Nov 14 12:45:10 2014 -0500
tree c28a0a1ab74621b1bcd9faf9e82038878b214d82
parent 114768abdaf452633b63189bcfeca322bcbdcb39

pexpect changes to logout function

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index e2e08bd..b7242eb 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -71,9 +71,9 @@
             main.cleanup()
             main.exit()
         except:
-            main.log.info(self.name + ":::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::")
+            main.log.info(self.name + ":::::::::::::::::::::::")
             main.log.error( traceback.print_exc() )
-            main.log.info(":::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::")
+            main.log.info(":::::::::::::::::::::::")
             main.cleanup()
             main.exit()
 
@@ -108,12 +108,20 @@
         Sends 'logout' command to ONOS cli
         '''
         try:
-            self.handle.sendline("logout")
-            self.handle.expect("\$")
-
+            self.handle.sendline("")
+            i = self.handle.expect([
+                "onos>",
+                "\$"], timeout=10)
+            if i == 0:
+                self.handle.sendline("logout")
+                self.handle.expect("\$")
+            elif i == 1:
+                return main.TRUE
+                    
         except pexpect.EOF:
             main.log.error(self.name + ": eof exception found")
-            main.log.error(self.name + ":    " + self.handle.before)
+            main.log.error(self.name + ":    " +
+                    self.handle.before)
             main.cleanup()
             main.exit()
         except: