diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2015-12-05 05:33:59 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2015-12-05 05:33:59 (GMT) |
commit | 2d2af91da033d3f9d5c68d4ea90a2d84d7f189f6 (patch) | |
tree | 3df2ce02fa15edae03f2c5f26ae7ac3cce3995c4 /Lib/test/test_telnetlib.py | |
parent | da0f2a1f5250a36c6067e035dcc9064b00b20bf5 (diff) | |
parent | ac28b796d80f869f39662491446145106960a886 (diff) | |
download | cpython-2d2af91da033d3f9d5c68d4ea90a2d84d7f189f6.zip cpython-2d2af91da033d3f9d5c68d4ea90a2d84d7f189f6.tar.gz cpython-2d2af91da033d3f9d5c68d4ea90a2d84d7f189f6.tar.bz2 |
Closes #25795: Merge with 3.5
Diffstat (limited to 'Lib/test/test_telnetlib.py')
-rw-r--r-- | Lib/test/test_telnetlib.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index 23029e0..610377a 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -4,8 +4,8 @@ import telnetlib import time import contextlib -from unittest import TestCase from test import support +import unittest threading = support.import_module('threading') HOST = support.HOST @@ -21,7 +21,7 @@ def server(evt, serv): finally: serv.close() -class GeneralTests(TestCase): +class GeneralTests(unittest.TestCase): def setUp(self): self.evt = threading.Event() @@ -170,7 +170,7 @@ def test_telnet(reads=(), cls=TelnetAlike): telnet._messages = '' # debuglevel output return telnet -class ExpectAndReadTestCase(TestCase): +class ExpectAndReadTestCase(unittest.TestCase): def setUp(self): self.old_selector = telnetlib._TelnetSelector telnetlib._TelnetSelector = MockSelector @@ -289,7 +289,7 @@ class nego_collector(object): tl = telnetlib -class WriteTests(TestCase): +class WriteTests(unittest.TestCase): '''The only thing that write does is replace each tl.IAC for tl.IAC+tl.IAC''' @@ -305,7 +305,7 @@ class WriteTests(TestCase): written = b''.join(telnet.sock.writes) self.assertEqual(data.replace(tl.IAC,tl.IAC+tl.IAC), written) -class OptionTests(TestCase): +class OptionTests(unittest.TestCase): # RFC 854 commands cmds = [tl.AO, tl.AYT, tl.BRK, tl.EC, tl.EL, tl.GA, tl.IP, tl.NOP] |