commit 64ab3bd099f1a89ced15b20d83ba3f757e4bf590
author Jon Hall <jhall@ciena.com> Fri May 13 11:29:44 2016 -0700
committer Jon Hall <jhall@ciena.com> Fri May 13 11:29:44 2016 -0700
tree b8ab922705fd550bfb7464f6e40179b24725f923
parent 00b72852ac20322c9ac096a07b9a2f6cb286452b

Fix for frozen onos during disconnect

Change-Id: Icdb3143d8ab40f6722135b49b29e3b2a2c977715

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: '{}'",