From 029b8989dbdde898f0ee4e09e17153f4efa2e416 Mon Sep 17 00:00:00 2001
From: Robey Pointer <robey@lag.net>
Date: Fri, 15 Dec 2006 14:21:08 -0800
Subject: [project @ robey@lag.net-20061215222108-7pu0151970w1e1lp] add a
 ResourceManager to replace __del__ methods, and use it in SSHClient to
 automatically close any open transport when the SSHClient is collected. this
 won't work on Transport itself (to close the attached packetizer) because
 Transport starts up its own thread, and the threading library keeps a
 Transport object alive to run that thread.  i think that's okay; the
 SSHClient interface is meant to be the easier one, so that's the one where
 it's important that some auto-cleanup is attempted.

---
 tests/test_client.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'tests/test_client.py')

diff --git a/tests/test_client.py b/tests/test_client.py
index 32f1a304..a53ff0e9 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -23,6 +23,8 @@ Some unit tests for SSHClient.
 import socket
 import threading
 import unittest
+import weakref
+
 import paramiko
 
 
@@ -59,7 +61,8 @@ class SSHClientTest (unittest.TestCase):
         thread.start()
 
     def tearDown(self):
-        self.tc.close()
+        if hasattr(self, 'tc'):
+            self.tc.close()
         self.ts.close()
         self.socks.close()
         self.sockl.close()
@@ -125,3 +128,26 @@ class SSHClientTest (unittest.TestCase):
         self.assertEquals(True, self.ts.is_authenticated())
         self.assertEquals(1, len(self.tc.get_host_keys()))
         self.assertEquals(public_host_key, self.tc.get_host_keys()[self.addr]['ssh-rsa'])
+
+    def test_3_cleanup(self):
+        """
+        verify that when an SSHClient is collected, its transport (and the
+        transport's packetizer) is closed.
+        """
+        host_key = paramiko.RSAKey.from_private_key_file('tests/test_rsa.key')
+        public_host_key = paramiko.RSAKey(data=str(host_key))
+        
+        self.tc = paramiko.SSHClient()
+        self.tc.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.assertEquals(0, len(self.tc.get_host_keys()))
+        self.tc.connect(self.addr, self.port, username='slowdive', password='pygmalion')
+
+        self.event.wait(1.0)
+        self.assert_(self.event.isSet())
+        self.assert_(self.ts.is_active())
+        
+        p = weakref.ref(self.tc._transport.packetizer)
+        self.assert_(p() is not None)
+        del self.tc
+        self.assert_(p() is None)
+        
-- 
cgit v1.2.3