added deldb to tests
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 4eb1660..412fb23 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -212,6 +212,7 @@
# if utilities.assert_matches(expect=pattern,actual=response,onpass="ONOS process is running...",onfail="ONOS process not running..."):
if re.search(pattern, response):
+ time.sleep(10)
if re.search(patternUp,tail2):
main.log.info(self.name + ": ONOS process is running...")
if tail1 == tail2:
@@ -920,7 +921,6 @@
return main.FALSE
elif i == 2:
main.log.info(self.name + ": Build success!")
- return main.TRUE
elif i == 3:
main.log.info(self.name + ": Build complete")
return main.TRUE
diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index 6c537e6..9ae90fb 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -99,7 +99,7 @@
'''
result = super(CLI, self).execute(self)
- defaultPrompt = '.*[\$|>|#]'
+ defaultPrompt = '.*[$>\#]'
args = utilities.parse_args(["CMD", "TIMEOUT", "PROMPT", "MORE"], **execparams)
expectPrompt = args["PROMPT"] if args["PROMPT"] else defaultPrompt
self.LASTRSP = ""
@@ -163,7 +163,7 @@
i = handle.expect([".ssword:*",default, pexpect.EOF])
if i==0:
handle.sendline(pwd)
- handle.sendline("\n")
+ handle.sendline("\r")
if i==1:
handle.expect(default)
@@ -212,7 +212,7 @@
main.log.error("ssh: connect to host "+ip_address+" port 22: Connection refused")
return main.FALSE
- self.handle.sendline("\n")
+ self.handle.sendline("\r")
return self.handle