Merge branch 'ONOS-Next' of https://github.com/OPENNETWORKINGLAB/ONLabTest into ONOS-Next
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 1718a84..5580cc1 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -450,14 +450,10 @@
if not grep_str:
self.handle.sendline("devices")
self.handle.expect("onos>")
- self.handle.sendline("")
- self.handle.expect("onos>")
else:
self.handle.sendline("devices | grep '"+
str(grep_str)+"'")
self.handle.expect("onos>")
- self.handle.sendline("")
- self.handle.expect("onos>")
handle = self.handle.before
print "handle =",handle
return handle
@@ -1038,7 +1034,6 @@
# append to id_list
for arg in temp_list:
id_list.append(arg.split("id=")[1])
-
return id_list
except pexpect.EOF:
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 66ecd41..b94001b 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -664,7 +664,7 @@
"Job\sis\salready\srunning",
"start/running",
"Unknown\sinstance",
- pexpect.TIMEOUT],timeout=60)
+ pexpect.TIMEOUT],timeout=120)
if i == 0:
main.log.info("Service is already running")