Update expcet logic for stop to not wait for timeout when ONOS isn't already running
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 01a414a..db01cc2 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -323,8 +323,8 @@
self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
self.handle.sendline("cd "+self.home)
self.handle.sendline("./onos.sh stop")
- i=self.handle.expect(["Stop",pexpect.EOF,pexpect.TIMEOUT])
- self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT], 60)
+ self.handle.expect(["./onos.sh stop",pexpect.EOF,pexpect.TIMEOUT])
+ i=self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT],60)
result = self.handle.before
if re.search("Killed", result):
main.log.info(self.name + ": ONOS Killed Successfully")
@@ -354,8 +354,8 @@
self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
self.handle.sendline("cd "+self.home)
self.handle.sendline("./onos.sh core stop")
- i=self.handle.expect(["Stop",pexpect.EOF,pexpect.TIMEOUT])
- self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT], 60)
+ self.handle.expect(["./onos.sh stop",pexpect.EOF,pexpect.TIMEOUT])
+ i=self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT],60)
result = self.handle.before
if re.search("Killed", result):
main.log.info(self.name + ": ONOS Killed Successfully")