From e0be91a4c9804828f4a2531cfdb785ff978e10cf Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 10 Sep 2012 11:34:52 -0700 Subject: Fixes to failing-test teardowns to avoid more exceptions or hangs (cherry picked from commit 734f3d6f42ef1564f473fee5526e0354fc8196fc) Conflicts: test.py --- tests/test_client.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/test_client.py') diff --git a/tests/test_client.py b/tests/test_client.py index 2f9b9a76..08ef1f92 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -68,11 +68,9 @@ class SSHClientTest (unittest.TestCase): thread.start() def tearDown(self): - if hasattr(self, 'tc'): - self.tc.close() - self.ts.close() - self.socks.close() - self.sockl.close() + for attr in "tc ts socks sockl".split(): + if hasattr(self, attr): + getattr(self, attr).close() def _run(self): self.socks, addr = self.sockl.accept() -- cgit v1.2.3