diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 12:30:01 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 12:30:01 -0700 |
| commit | e66de3809b5e2b17e57af469df3750a87bbd1ec0 (patch) | |
| tree | faa95f50e0b24bd22be99b1e9dad7f8e02d6b4f0 /tests | |
| parent | 04a70b9bf61684bacac1e82910ac949a96cbf070 (diff) | |
| parent | 24e1bb1252578891e8527a52285f48bcaaf6605d (diff) | |
| download | paramiko-e66de3809b5e2b17e57af469df3750a87bbd1ec0.tar.gz | |
Merge branch '2.0' into 2.1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_client.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/test_client.py b/tests/test_client.py index 5f4f0dd5..229df991 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -290,13 +290,10 @@ class SSHClientTest (unittest.TestCase): verify that when an SSHClient is collected, its transport (and the transport's packetizer) is closed. """ - # Unclear why this is borked on Py3, but it is, and does not seem worth - # pursuing at the moment. Skipped on PyPy because it fails on travis - # for unknown reasons, works fine locally. - # XXX: It's the release of the references to e.g packetizer that fails - # in py3... - if not PY2 or platform.python_implementation() == "PyPy": + # Skipped on PyPy because it fails on travis for unknown reasons + if platform.python_implementation() == "PyPy": return + threading.Thread(target=self._run).start() self.tc = paramiko.SSHClient() @@ -314,8 +311,8 @@ class SSHClientTest (unittest.TestCase): del self.tc # force a collection to see whether the SSHClient object is deallocated - # correctly. 2 GCs are needed to make sure it's really collected on - # PyPy + # 2 GCs are needed on PyPy, time is needed for Python 3 + time.sleep(0.3) gc.collect() gc.collect() |