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/clidriver.py b/TestON/drivers/common/clidriver.py
index 7d6ef0b..a7404fa 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -290,6 +290,8 @@
"100%",
refused,
"No such file or directory",
+ "Permission denied",
+ "\$",
pexpect.EOF,
pexpect.TIMEOUT ],
120 )
@@ -311,11 +313,16 @@
elif i == 4: # File Not found
main.log.error( "No such file found" )
returnVal = main.FALSE
- elif i == 5: # EOF
+ elif i == 5: # Permission denied
+ main.log.error( "Permission denied. Check folder permissions" )
+ returnVal = main.FALSE
+ elif i == 6: # prompt returned
+ return returnVal
+ elif i == 7: # EOF
main.log.error( "Pexpect.EOF found!!!" )
main.cleanup()
main.exit()
- elif i == 6: # timeout
+ elif i == 8: # timeout
main.log.error(
"No route to the Host " +
userName +