[Lldb-commits] [lldb] r220583 - Patch from ovyalov at google.com:
Jim Ingham
jingham at apple.com
Fri Oct 24 11:51:58 PDT 2014
Author: jingham
Date: Fri Oct 24 13:51:57 2014
New Revision: 220583
URL: http://llvm.org/viewvc/llvm-project?rev=220583&view=rev
Log:
Patch from ovyalov at google.com:
Handle pexpect exceptions correctly so that processes spawned with
pexpect are always reaped.
Modified:
lldb/trunk/test/lldbtest.py
Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=220583&r1=220582&r2=220583&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Fri Oct 24 13:51:57 2014
@@ -1014,12 +1014,12 @@ class Base(unittest2.TestCase):
self.child.sendline('settings set interpreter.prompt-on-quit false')
self.child.sendline('quit')
self.child.expect(pexpect.EOF)
- except ValueError, ExceptionPexpect:
+ except (ValueError, pexpect.ExceptionPexpect):
# child is already terminated
pass
-
- # Give it one final blow to make sure the child is terminated.
- self.child.close()
+ finally:
+ # Give it one final blow to make sure the child is terminated.
+ self.child.close()
def tearDown(self):
More information about the lldb-commits
mailing list