From 2dec0a7671d83f21a290e1a2b3ea9159da45757a Mon Sep 17 00:00:00 2001
From: Olle Lundberg <geek@nerd.sh>
Date: Thu, 14 Aug 2014 15:13:58 +0200
Subject: Add a utility method for value clamping.
---
tests/test_util.py | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'tests/test_util.py')
diff --git a/tests/test_util.py b/tests/test_util.py
index 69c75518..24f58076 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -333,3 +333,8 @@ IdentityFile something_%l_using_fqdn
"""
config = paramiko.util.parse_ssh_config(StringIO(test_config))
assert config.lookup('meh') # will die during lookup() if bug regresses
+
+ def test_12_clamp_value(self):
+ self.assertEqual(32768, paramiko.util.clamp_value(32767, 32768, 32769))
+ self.assertEqual(32767, paramiko.util.clamp_value(32767, 32765, 32769))
+ self.assertEqual(32769, paramiko.util.clamp_value(32767, 32770, 32769))
--
cgit v1.2.3
From 163caabf5e4a2a63216c2192dc476d4184ab81b3 Mon Sep 17 00:00:00 2001
From: Olle Lundberg <geek@nerd.sh>
Date: Fri, 15 Aug 2014 15:33:25 +0200
Subject: Remove all occurences of ParamikoTest.
Sorry paramiko, it's time to put on the big boy pants. You no
longer support old as hell versions of python.
---
tests/test_buffered_pipe.py | 5 ++---
tests/test_transport.py | 5 +++--
tests/test_util.py | 5 ++---
tests/util.py | 10 ----------
4 files changed, 7 insertions(+), 18 deletions(-)
(limited to 'tests/test_util.py')
diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py
index 1045a925..3b8f97ad 100644
--- a/tests/test_buffered_pipe.py
+++ b/tests/test_buffered_pipe.py
@@ -22,11 +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
-
def delay_thread(p):
p.feed('a')
@@ -40,7 +39,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())
diff --git a/tests/test_transport.py b/tests/test_transport.py
index ac744b26..5c77a321 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -26,6 +26,7 @@ import socket
import time
import threading
import random
+import unittest
from paramiko import Transport, SecurityOptions, ServerInterface, RSAKey, DSSKey, \
SSHException, ChannelException
@@ -35,7 +36,7 @@ from paramiko.common import MSG_KEXINIT, cMSG_CHANNEL_WINDOW_ADJUST
from paramiko.py3compat import bytes
from paramiko.message import Message
from tests.loop import LoopSocket
-from tests.util import ParamikoTest, test_path
+from tests.util import test_path
LONG_BANNER = """\
@@ -105,7 +106,7 @@ class NullServer (ServerInterface):
return OPEN_SUCCEEDED
-class TransportTest(ParamikoTest):
+class TransportTest(unittest.TestCase):
def setUp(self):
self.socks = LoopSocket()
self.sockc = LoopSocket()
diff --git a/tests/test_util.py b/tests/test_util.py
index 69c75518..643d9171 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -24,13 +24,12 @@ from binascii import hexlify
import errno
import os
from hashlib import sha1
+import unittest
import paramiko.util
from paramiko.util import lookup_ssh_host_config as host_config
from paramiko.py3compat import StringIO, byte_ord
-from tests.util import ParamikoTest
-
test_config_file = """\
Host *
User robey
@@ -60,7 +59,7 @@ BGQ3GQ/Fc7SX6gkpXkwcZryoi4kNFhHu5LvHcZPdxXV1D+uTMfGS1eyd2Yz/DoNWXNAl8TI0cAsW\
from paramiko import *
-class UtilTest(ParamikoTest):
+class UtilTest(unittest.TestCase):
def test_1_import(self):
"""
verify that all the classes can be imported from paramiko.
diff --git a/tests/util.py b/tests/util.py
index 66d2696c..b546a7e1 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -1,17 +1,7 @@
import os
-import unittest
root_path = os.path.dirname(os.path.realpath(__file__))
-
-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
-
-
def test_path(filename):
return os.path.join(root_path, filename)
--
cgit v1.2.3
From d05ef512bab1849e4fecafbc2a0c23465bf6b2c6 Mon Sep 17 00:00:00 2001
From: Olle Lundberg <geek@nerd.sh>
Date: Fri, 15 Aug 2014 15:41:49 +0200
Subject: Don't end a line with whitespace.
This might be stripped by editors at will, which will make some
tests brake.
---
tests/test_util.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'tests/test_util.py')
diff --git a/tests/test_util.py b/tests/test_util.py
index 69c75518..28c162e5 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -41,7 +41,12 @@ Host *.example.com
\tUser bjork
Port=3333
Host *
- \t \t Crazy something dumb
+"""
+
+dont_strip_whitespace_please = "\t \t Crazy something dumb "
+
+test_config_file += dont_strip_whitespace_please
+test_config_file += """
Host spoo.example.com
Crazy something else
"""
--
cgit v1.2.3