commit aef00556ac54bc568c9c850c3d4384239e8bb84a
author admin <jlee@onlab.us> Thu May 08 09:18:36 2014 -0700
committer admin <jlee@onlab.us> Thu May 08 09:18:36 2014 -0700
tree 5efd5569b77168803fa637c83d7fdc7d33708973
parent 9c6e2c0c2c51307742309903f70eb11d7517decf

added deldb to tests

TestON/drivers/common/clidriver.py

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