diff options
author | Jeremy T. Bouse <jbouse@debian.org> | 2014-09-22 09:21:39 -0400 |
---|---|---|
committer | Jeremy T. Bouse <jbouse@debian.org> | 2014-09-22 09:21:39 -0400 |
commit | 70f669a0a41e104bd0427e8ad9142071aae241ed (patch) | |
tree | a5c0a22c336514e1db001012a64d15477986b671 /tests/test_buffered_pipe.py | |
parent | e9306cab7448e641a54789039f5c8bfe988de320 (diff) | |
parent | ccd643cdbd7ba752727d62051058a4454451414d (diff) | |
download | python-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar python-paramiko-70f669a0a41e104bd0427e8ad9142071aae241ed.tar.gz |
Merge tag 'upstream/1.15.0'
Upstream version 1.15.0
Diffstat (limited to 'tests/test_buffered_pipe.py')
-rw-r--r-- | tests/test_buffered_pipe.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py index a53081a..eeb4d0a 100644 --- a/tests/test_buffered_pipe.py +++ b/tests/test_buffered_pipe.py @@ -22,10 +22,10 @@ Some unit tests for BufferedPipe. import threading import time +import unittest from paramiko.buffered_pipe import BufferedPipe, PipeTimeout from paramiko import pipe - -from tests.util import ParamikoTest +from paramiko.py3compat import b def delay_thread(p): @@ -40,7 +40,7 @@ def close_thread(p): p.close() -class BufferedPipeTest(ParamikoTest): +class BufferedPipeTest(unittest.TestCase): def test_1_buffered_pipe(self): p = BufferedPipe() self.assertTrue(not p.read_ready()) @@ -48,12 +48,12 @@ class BufferedPipeTest(ParamikoTest): self.assertTrue(p.read_ready()) data = p.read(6) self.assertEqual(b'hello.', data) - + p.feed('plus/minus') self.assertEqual(b'plu', p.read(3)) self.assertEqual(b's/m', p.read(3)) self.assertEqual(b'inus', p.read(4)) - + p.close() self.assertTrue(not p.read_ready()) self.assertEqual(b'', p.read(1)) |