commit d2b883af4e10722021373096dd8f6c8c2b22a1dd
author YPZhang <yunpeng@onlab.us> Fri May 13 23:27:20 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Fri May 13 23:27:20 2016 +0000
tree 82f5ff35dac909f1817bf9d33e18f4d9ed3848ab
parent 64ab3bd099f1a89ced15b20d83ba3f757e4bf590
parent ac53ebf4efdbd3c6ffacbec1d31ebe6a7fc91cd5

Merge "Fix a small Flows verifing problem 	- Improved verify logic"

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 0822879..afd3093 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -151,7 +151,10 @@
                         # ONOS didn't fully load, and logout command isn't working
                         # or the command timed out
                         self.handle.send( "\x04" )  # send ctrl-d
-                        self.handle.expect( "\$" )
+                        try:
+                            self.handle.expect( "\$" )
+                        except pexpect.TIMEOUT:
+                            main.log.error( "ONOS did not respond to 'logout' or CTRL-d" )
                         return main.TRUE
                     else: # some other output
                         main.log.warn( "Unknown repsonse to logout command: '{}'",