commit 7ce2946e4d03855013e0e79c43f49213ff354373
author You Wang <you@opennetworking.org> Mon Mar 04 13:37:14 2019 -0800
committer You Wang <you@opennetworking.org> Mon Mar 04 23:18:41 2019 +0000
tree ffb51c41a8d7270048fe12b67df6270432183441
parent 7739cb88dc452a2a6aac188c1bb978e5029c7871

Fix the use of exitFromCmd in mininet cli driver

Change-Id: I41704ab6b01b3e3ce67b8f09bb65d6242c4fd281
(cherry picked from commit eb68dc44923f90a2afd8be4c2a36a6521a82f9b0)

TestON/drivers/common/cli/emulator/mininetclidriver.py

diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 661ada7..e67e4e1 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -386,7 +386,7 @@
                                         str( response ) )
                         # NOTE: Send ctrl-c to make sure pingall is done
                         self.exitFromCmd( [ "Interrupt", "mininet>" ] )
-                        self.handle.send( "" )
+                        self.handle.sendline( "" )
                         self.handle.expect( "mininet>" )
                         break
                 pattern = "Results\:"
@@ -398,7 +398,7 @@
                 else:
                     # NOTE: Send ctrl-c to make sure pingall is done
                     self.exitFromCmd( [ "Interrupt", "mininet>" ] )
-                    self.handle.send( "" )
+                    self.handle.sendline( "" )
                     self.handle.expect( "mininet>" )
                     return main.FALSE
             else:
@@ -492,7 +492,7 @@
             # NOTE: Send ctrl-c to make sure command is stopped
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
             response += self.handle.before + self.handle.after
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             response += self.handle.before + self.handle.after
             main.log.debug( response )
@@ -560,7 +560,7 @@
             # NOTE: Send ctrl-c to make sure command is stopped
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
             response += self.handle.before + self.handle.after
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             response += self.handle.before + self.handle.after
             main.log.debug( response )
@@ -624,7 +624,7 @@
             # NOTE: Send ctrl-c to make sure command is stopped
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
             response += self.handle.before + self.handle.after
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             response += self.handle.before + self.handle.after
             main.log.debug( response )
@@ -688,7 +688,7 @@
             # NOTE: Send ctrl-c to make sure command is stopped
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
             response += self.handle.before + self.handle.after
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             response += self.handle.before + self.handle.after
             main.log.debug( response )
@@ -1354,7 +1354,7 @@
                             repr( self.handle.before ) )
             # NOTE: Send ctrl-c to make sure iperf is done
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             return main.FALSE
         except pexpect.EOF:
@@ -1389,7 +1389,7 @@
             main.log.error( self.name + ": TIMEOUT exception found" )
             main.log.error( self.name + " response: " + repr( self.handle.before ) )
             self.exitFromCmd( [ "Interrupt", "mininet>" ] )
-            self.handle.send( "" )
+            self.handle.sendline( "" )
             self.handle.expect( "mininet>" )
             return main.FALSE
         except pexpect.EOF: