commit bff538c0930f0e452a3ca7d7878a1731470e5bd0
author Jon Hall <jhall@opennetworking.org> Thu Apr 19 17:49:25 2018 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Thu Apr 19 17:49:25 2018 +0000
tree dfc414753e69a5abb6cf9a5b22a8c2f7c417b281
parent fc9131709c43d6651740f0df5e6f4426571c71e1
parent bc74311167f710d957519bbc9ebec9f96240ff5d

Merge "Catch more errors when starting mininet"

TestON/drivers/common/cli/emulator/mininetclidriver.py

diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index ca86a89..08d8505 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -202,7 +202,7 @@
                 startTime = time.time()
                 while True:
                     i = self.handle.expect( [ 'mininet>',
-                                              'Exception',
+                                              'Exception|Error',
                                               '\*\*\*',
                                               pexpect.EOF,
                                               pexpect.TIMEOUT,
@@ -234,6 +234,7 @@
                         main.log.error(
                             self.name +
                             ": Something took too long... " )
+                        main.log.debug( self.handle.before + self.handle.after )
                         return main.FALSE
                     elif i == 5:
                         main.log.error( self.name + ": " + self.handle.before + self.handle.after )