[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 805946b..454bd95 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -40,8 +40,7 @@
self.home = None
self.handle = None
self.nicAddr = None
- self.prompt = "\$"
- super( CLI, self ).__init__()
+ super( OnosDriver, self ).__init__()
def connect( self, **connectargs ):
"""
@@ -52,6 +51,7 @@
the ip address needed to ssh to the "bench"
"""
try:
+
for key in connectargs:
vars( self )[ key ] = connectargs[ key ]
self.home = "~/onos"
@@ -182,7 +182,7 @@
try:
self.handle.sendline( 'date +%s.%N' )
self.handle.expect( 'date \+\%s\.\%N' )
- self.handle.expect( '\$' )
+ self.handle.expect( self.prompt )
epochMs = self.handle.before
return epochMs
except Exception:
@@ -311,8 +311,8 @@
'Runtime\sEnvironment\sto\scontinue',
'BUILD\sFAILURE',
'BUILD\sSUCCESS',
- 'onos\$', #TODO: fix this to be more generic?
- 'ONOS\$',
+ 'onos' + self.prompt, #TODO: fix this to be more generic?
+ 'ONOS' + self.prompt,
pexpect.TIMEOUT ], mciTimeout )
if i == 0:
main.log.error( self.name + ":There is insufficient memory \
@@ -449,7 +449,7 @@
if i == 0:
main.log.error( self.name + ": Git pull had some issue" )
output = self.handle.after
- self.handle.expect( '\$' )
+ self.handle.expect( self.prompt )
output += self.handle.before
main.log.warn( output )
return main.ERROR
@@ -1733,7 +1733,7 @@
cmd += " old"
self.handle.sendline( cmd )
self.handle.expect( cmd )
- self.handle.expect( "\$ " )
+ self.handle.expect( self.prompt + " " )
response = self.handle.before
return response
except pexpect.EOF: