| commit | 1204ef08836e2880499e380c0940fc816e84ba52 | [log] [tgz] |
|---|---|---|
| author | andrewonlab <andrew@onlab.us> | Wed Oct 22 12:31:31 2014 -0400 |
| committer | andrewonlab <andrew@onlab.us> | Wed Oct 22 12:31:31 2014 -0400 |
| tree | 54ada018938f5f21607e9f05e17dff39c1150b73 | |
| parent | 0c0a6776e29fb44a42a708c3e32f3d051a96066b [diff] | |
| parent | f8d1098d2dfe90716eac5246cd92143b41b3b3b9 [diff] |
Merge branch 'ONOS-Next' of https://github.com/OPENNETWORKINGLAB/ONLabTest into ONOS-Next
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py index b217913..ccf3baf 100644 --- a/TestON/drivers/common/cli/emulator/mininetclidriver.py +++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -1016,7 +1016,7 @@ if not second_dir: main.log.report('ONOS does not have the link %s/%s -> %s/%s' % (node2, port2, node1, port1)) link_results = link_results and first_dir and second_dir - return link_results + return link_results
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py index 3d9debf..2e7ffa3 100644 --- a/TestON/drivers/common/cli/onosdriver.py +++ b/TestON/drivers/common/cli/onosdriver.py
@@ -82,6 +82,8 @@ ''' response = '' try: + self.handle.sendline("\n") + self.handle.expect("\$") self.handle.sendline("exit") self.handle.expect("closed") except pexpect.EOF: @@ -1014,10 +1016,3 @@ - - - - - - -