Creating subfolders for test suites
allow teston to look in subfolders
create subfolders for current test suites
move tests into sub folders
create HA suite dependencies folder and moved all common files there
minor driver and test updates
standardize on the name dependencies for the directory
change from admin to sdn users
Conflicts:
TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.topo
Change-Id: I849e45ab67da8b285c36c5fdf43b34323876e741
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 935f627..eb1f53a 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -974,6 +974,7 @@
node +
" timed out" )
self.handle.expect( "\$" )
+ main.log.warn( self.handle.before )
return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
@@ -1116,9 +1117,13 @@
if i == 0:
main.log.info( "ONOS instance " + str( nodeIp ) +
" was killed and stopped" )
+ self.handle.sendline( "" )
+ self.handle.expect( "\$" )
return main.TRUE
elif i == 1:
main.log.info( "ONOS process was not running" )
+ self.handle.sendline( "" )
+ self.handle.expect( "\$" )
return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )