Latest HA tests
- better startup sequence
- single node HA test
- minor fixes to improve error handling
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 35a5d9d..f733d35 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -395,6 +395,7 @@
self.handle.sendline("\n")
self.handle.expect("\$")
self.handle.sendline("cd " + self.home + "; git log -1 --pretty=fuller --decorate=short | grep -A 6 \"commit\" --color=never")
+ #NOTE: for some reason there are backspaces inserted in this phrase when run from Jenkins on some tests
#self.handle.expect("--color=never")
self.handle.expect("\$")
response=(self.name +": \n"+ str(self.handle.before + self.handle.after))
@@ -788,7 +789,8 @@
try:
self.handle.sendline("")
self.handle.expect("\$")
- self.handle.sendline("onos-uninstall "+str(node_ip))
+ self.handle.sendline( "onos-uninstall "+str(node_ip) )
+ self.handle.expect( "onos-uninstall "+str(node_ip) )
self.handle.expect("\$")
main.log.info("ONOS "+node_ip+" was uninstalled")
@@ -931,14 +933,15 @@
self.handle.sendline("onos-wait-for-start " + node )
self.handle.expect("onos-wait-for-start")
#NOTE: this timeout is arbitrary"
- i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout = 300)
+ i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout = 120)
if i == 0:
main.log.info(self.name + ": " + node + " is up")
return main.TRUE
elif i == 1:
#NOTE: since this function won't return until ONOS is ready,
# we will kill it on timeout
- self.handle.sendline("\003") #Control-C
+ main.log.error("ONOS has not started yet")
+ self.handle.send("\x03") #Control-C
self.handle.expect("\$")
return main.FALSE
except pexpect.EOF: