Some changes for deldb
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index f5a70d4..fd9df50 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -1076,7 +1076,7 @@
else:
pass
#these should be the old logs
- main.log.report(str(count) + "Exceptions were found on "+self.name)
+ main.log.report(str(count) + " Exceptions were found on "+self.name)
return output
except pexpect.TIMEOUT:
main.log.error(self.name + ": Timeout exception found in check_exceptions function")
diff --git a/TestON/drivers/common/cli/ramcloudclidriver.py b/TestON/drivers/common/cli/ramcloudclidriver.py
index 52f8e7d..90e92bc 100644
--- a/TestON/drivers/common/cli/ramcloudclidriver.py
+++ b/TestON/drivers/common/cli/ramcloudclidriver.py
@@ -194,16 +194,16 @@
self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
self.handle.sendline("cd "+self.home)
self.handle.sendline("./onos.sh rc deldb")
- self.handle.expect(["[y/N]",pexpect.EOF,pexpect.TIMEOUT])
+ self.handle.expect(["\[y/N\]",pexpect.EOF,pexpect.TIMEOUT])
self.handle.sendline("y")
self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
response = self.handle.before + self.handle.after
- main.log.info(response)
- if re.search("DONE",response):
+ if re.search("DONE",response) or re.search("Terminated",response):
main.log.info("RAMCloud Database Cleaned")
return main.TRUE
else:
main.log.warn("Something wrong in Cleaning Database")
+ main.log.warn(self.handle.before)
return main.FALSE