Refactoring: it's a thing. Re #85

This commit is contained in:
Jeff Forcier 2012-10-15 13:21:58 -07:00
parent 7c12862b55
commit dfb45dec7f
4 changed files with 17 additions and 23 deletions

View File

@ -26,6 +26,8 @@ import unittest
from paramiko.buffered_pipe import BufferedPipe, PipeTimeout
from paramiko import pipe
from util import ParamikoTest
def delay_thread(pipe):
pipe.feed('a')
@ -39,11 +41,7 @@ def close_thread(pipe):
pipe.close()
class BufferedPipeTest (unittest.TestCase):
assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below
assertFalse = unittest.TestCase.failIf # for Python 2.3 and below
class BufferedPipeTest(ParamikoTest):
def test_1_buffered_pipe(self):
p = BufferedPipe()
self.assert_(not p.read_ready())

View File

@ -36,6 +36,7 @@ from paramiko import OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED
from paramiko.common import MSG_KEXINIT, MSG_CHANNEL_WINDOW_ADJUST
from paramiko.message import Message
from loop import LoopSocket
from util import ParamikoTest
LONG_BANNER = """\
@ -105,13 +106,7 @@ class NullServer (ServerInterface):
return OPEN_SUCCEEDED
class TransportTest (unittest.TestCase):
if not hasattr(unittest.TestCase, 'assertTrue'):
assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below
if not hasattr(unittest.TestCase, 'assertFalse'):
assertFalse = unittest.TestCase.failIf # for Python 2.3 and below
class TransportTest(ParamikoTest):
def setUp(self):
self.socks = LoopSocket()
self.sockc = LoopSocket()

View File

@ -28,6 +28,7 @@ import unittest
from Crypto.Hash import SHA
import paramiko.util
from util import ParamikoTest
test_config_file = """\
Host *
@ -58,17 +59,7 @@ BGQ3GQ/Fc7SX6gkpXkwcZryoi4kNFhHu5LvHcZPdxXV1D+uTMfGS1eyd2Yz/DoNWXNAl8TI0cAsW\
from paramiko import *
class UtilTest (unittest.TestCase):
assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below
assertFalse = unittest.TestCase.failIf # for Python 2.3 and below
def setUp(self):
pass
def tearDown(self):
pass
class UtilTest(ParamikoTest):
def test_1_import(self):
"""
verify that all the classes can be imported from paramiko.

10
tests/util.py Normal file
View File

@ -0,0 +1,10 @@
import unittest
class ParamikoTest(unittest.TestCase):
# for Python 2.3 and below
if not hasattr(unittest.TestCase, 'assertTrue'):
assertTrue = unittest.TestCase.failUnless
if not hasattr(unittest.TestCase, 'assertFalse'):
assertFalse = unittest.TestCase.failIf