commit b65d237727d01c7c03275124c547575f0074de3f
author You Wang <you@opennetworking.org> Fri Aug 17 15:37:59 2018 -0700
committer You Wang <you@opennetworking.org> Mon Aug 20 23:41:43 2018 +0000
tree ae694248cf98d21e30c8a83869b09211eb655654
parent 162d519d5b11d69818056e46dc6268f4b7b10db9

Allow sending ctrl+c multiple times to kill a command

Change-Id: I67bdc63beccbdde3b082948cff8246b37e70d123
(cherry picked from commit 18676a6f5f5ea0f17446e5a1b0cf36e9c31262c7)

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 84930de..7541780 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -830,14 +830,7 @@
                     isReachable = main.FALSE
         except pexpect.TIMEOUT:
             main.log.exception( self.name + ": TIMEOUT exception" )
-            response = self.handle.before
-            # NOTE: Send ctrl-c to make sure command is stopped
-            self.handle.send( "\x03" )
-            self.handle.expect( "Interrupt" )
-            response += self.handle.before + self.handle.after
-            self.handle.expect( "mininet>" )
-            response += self.handle.before + self.handle.after
-            main.log.debug( response )
+            self.exitFromCmd( self.hostPrompt )
             isReachable = main.FALSE
         except pexpect.EOF:
             main.log.error( self.name + ": EOF exception found" )

TestON/drivers/common/cli/onosdriver.py

diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index ef87e00..08138c2 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -2673,8 +2673,7 @@
         except pexpect.TIMEOUT:
             main.log.exception( self.name + ": TIMEOUT exception found in onosDiagnostics" )
             main.log.error( self.name + ":    " + self.handle.before )
-            self.handle.send( "\x03" )  # Control-C
-            self.handle.expect( self.prompt )
+            self.exitFromCmd( self.prompt, 100 )
             return main.FALSE
         except pexpect.EOF:
             main.log.error( self.name + ": EOF exception found" )