commit 957feaae760357cbf80da486e0c3f8ce3a3a2b79
author shahshreya <shreya@onlab.us> Mon Mar 23 16:08:29 2015 -0700
committer shahshreya <shreya@onlab.us> Mon Mar 23 16:08:29 2015 -0700
tree 1679ab00a68e0a24ccab6106cf0347fe6ac0dc68
parent eaa759ffb3b61af4036c2405a07df4212ef77388

Minor refactoring

TestON/core/teston.py

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:

TestON/drivers/common/cli/onosdriver.py

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: