| commit | b62d17ddd34ca1996fdd1004daae4a78c2f829b9 | [log] [tgz] |
|---|---|---|
| author | shahshreya <shreya@onlab.us> | Mon Mar 23 16:08:48 2015 -0700 |
| committer | shahshreya <shreya@onlab.us> | Mon Mar 23 16:08:48 2015 -0700 |
| tree | fa30f25690203b33454df1929b74fc77d60b7254 | |
| parent | 957feaae760357cbf80da486e0c3f8ce3a3a2b79 [diff] | |
| parent | afa9f93959b0e7682c455884629f10e5cede690e [diff] |
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest
diff --git a/TestON/core/teston.py b/TestON/core/teston.py index edb763c..3210f9a 100644 --- a/TestON/core/teston.py +++ b/TestON/core/teston.py
@@ -247,7 +247,7 @@ #print code[testCaseNumber][step] self.stepCount = self.stepCount + 1 self.log.exception(e) - return main.FALSE + self.cleanup() return main.TRUE if cli.stop:
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py index 14562e7..83a6471 100644 --- a/TestON/drivers/common/cli/onosdriver.py +++ b/TestON/drivers/common/cli/onosdriver.py
@@ -996,8 +996,8 @@ timeout=120 ) if i == 1: return main.FALSE - self.handle.sendline( "" ) - self.handle.expect( "\$" ) + #self.handle.sendline( "" ) + #self.handle.expect( "\$" ) return main.TRUE except pexpect.EOF: