diff options
Diffstat (limited to 'Lib/test/test_telnetlib.py')
| -rw-r--r-- | Lib/test/test_telnetlib.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index c1eea06..a78b938 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -1,12 +1,12 @@ import socket import select -import threading import telnetlib import time import contextlib from unittest import TestCase from test import support +threading = support.import_module('threading') HOST = support.HOST @@ -17,9 +17,10 @@ def server(evt, serv): conn, addr = serv.accept() except socket.timeout: pass + else: + conn.close() finally: serv.close() - conn.close() evt.set() class GeneralTests(TestCase): @@ -285,7 +286,7 @@ class OptionTests(TestCase): txt = telnet.read_all() cmd = nego.seen self.assertTrue(len(cmd) > 0) # we expect at least one command - self.assertTrue(cmd[:1] in self.cmds) + self.assertIn(cmd[:1], self.cmds) self.assertEqual(cmd[1:2], tl.NOOPT) self.assertEqual(data_len, len(txt + cmd)) nego.sb_getter = None # break the nego => telnet cycle @@ -332,7 +333,7 @@ class OptionTests(TestCase): telnet = test_telnet([a]) telnet.set_debuglevel(1) txt = telnet.read_all() - self.assertTrue(b in telnet._messages) + self.assertIn(b, telnet._messages) return def test_debuglevel_write(self): @@ -340,7 +341,7 @@ class OptionTests(TestCase): telnet.set_debuglevel(1) telnet.write(b'xxx') expected = "send b'xxx'\n" - self.assertTrue(expected in telnet._messages) + self.assertIn(expected, telnet._messages) def test_debug_accepts_str_port(self): # Issue 10695 @@ -349,7 +350,7 @@ class OptionTests(TestCase): telnet._messages = '' telnet.set_debuglevel(1) telnet.msg('test') - self.assertRegexpMatches(telnet._messages, r'0.*test') + self.assertRegex(telnet._messages, r'0.*test') def test_main(verbose=None): |