Skip to content

Commit 60e03ec

Browse files
authored
Chn fwd test (#157)
* Updated forwarding tests
1 parent 02c0697 commit 60e03ec

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

requirements_dev.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ sphinx
55
sphinx_rtd_theme
66
pytest
77
pytest-rerunfailures
8+
-e .

tests/base_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def setUp(self):
4141
self.session.handshake(self.sock)
4242

4343
def tearDown(self):
44-
del self.session
45-
del self.sock
44+
self.session.disconnect()
45+
self.sock.close()
4646

4747
def _auth(self):
4848
return self.session.userauth_publickey_fromfile(

tests/embedded_server/openssh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def _wait_for_port(self):
6565
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
6666
while sock.connect_ex(('127.0.0.1', self.port)) != 0:
6767
sleep(.1)
68-
del sock
68+
sock.close()
6969

7070
def stop(self):
7171
if self.server_proc is not None and self.server_proc.returncode is None:

tests/test_session.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@ def test_hostkey(self):
246246
hostkey = self.session.hostkey_hash(_type)
247247
self.assertTrue(len(hostkey) > 0)
248248

249-
def test_forward_listen_failure(self):
250-
self.assertEqual(self._auth(), 0)
251-
self.assertRaises(RequestDeniedError, self.session.forward_listen, 80)
252-
253249
def test_forward_listen_ex(self):
254250
self.assertEqual(self._auth(), 0)
255251
listener, bound_port = self.session.forward_listen_ex(1)

tests/test_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from ssh2.utils import find_eol
44

5+
56
class UtilsTest(unittest.TestCase):
67

78
def test_find_eol_no_lines(self):

0 commit comments

Comments
 (0)