Save ONOS Logs for cluster test, print stacktrace when looking for
exceptions, and other random fixes
Change-Id: I26d54fc261d91c88b2303e3d99a954597fc4c58c
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 2b37186..6c36394 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -711,6 +711,7 @@
"=" + "\"" + arg + "\"" + "\n" )
tempCount = tempCount + 1
+ cellFile.write( "export OCI=$OC1" )
cellFile.write( mnString + "\"" + mnIpAddrs + "\"" + "\n" )
cellFile.write( appString + "\n" )
cellFile.close()
@@ -1435,9 +1436,9 @@
self.handle.expect( "\$" )
self.handle.sendline( "tshark -i " + str( interface ) + " -t e -w " + str( dirFile ) + " &" )
- self.handle.sendline( "\r" )
+ self.handle.sendline( "\n" )
self.handle.expect( "Capturing on" )
- self.handle.sendline( "\r" )
+ self.handle.sendline( "\n" )
self.handle.expect( "\$" )
main.log.info( "Tshark started capturing files on " +
@@ -1661,7 +1662,7 @@
cmd += " old"
self.handle.sendline( cmd )
self.handle.expect( cmd )
- self.handle.expect( "\$" )
+ self.handle.expect( "\$ " )
response = self.handle.before
return response
except pexpect.EOF:
@@ -1730,7 +1731,6 @@
* This function uses root privilege iptables command which may result
in unwanted network errors. USE WITH CAUTION
"""
- import time
# NOTE*********
# The strict checking methods of this driver function is intentional
diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index fd1a401..b6be81a 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -232,7 +232,7 @@
i = handle.expect( [ ".ssword:*", default, pexpect.EOF ] )
if i == 0:
handle.sendline( pwd )
- handle.sendline( "\r" )
+ handle.sendline( "\n" )
if i == 1:
handle.expect( default )