diff options
Diffstat (limited to 'test/test_tcp.py')
| -rw-r--r-- | test/test_tcp.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py index 615900ce..dc0efeb0 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -1,5 +1,5 @@ -import cStringIO -import Queue +from io import BytesIO +from six.moves import queue import time import socket import random @@ -435,7 +435,7 @@ class TestSSLDisconnect(tservers.ServerTestBase): c.rfile.read(10) c.close() tutils.raises(TcpDisconnect, c.wfile.write, "foo") - tutils.raises(Queue.Empty, self.q.get_nowait) + tutils.raises(queue.Empty, self.q.get_nowait) class TestSSLHardDisconnect(tservers.ServerTestBase): @@ -578,7 +578,7 @@ class TestTCPClient: class TestFileLike: def test_blocksize(self): - s = cStringIO.StringIO("1234567890abcdefghijklmnopqrstuvwxyz") + s = BytesIO(b"1234567890abcdefghijklmnopqrstuvwxyz") s = tcp.Reader(s) s.BLOCKSIZE = 2 assert s.read(1) == "1" @@ -589,7 +589,7 @@ class TestFileLike: assert d.startswith("abc") and d.endswith("xyz") def test_wrap(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s.flush() s = tcp.Reader(s) assert s.readline() == "foobar\n" @@ -598,18 +598,18 @@ class TestFileLike: assert s.isatty def test_limit(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s = tcp.Reader(s) assert s.readline(3) == "foo" def test_limitless(self): - s = cStringIO.StringIO("f" * (50 * 1024)) + s = BytesIO(b"f" * (50 * 1024)) s = tcp.Reader(s) ret = s.read(-1) assert len(ret) == 50 * 1024 def test_readlog(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s = tcp.Reader(s) assert not s.is_logging() s.start_log() @@ -626,7 +626,7 @@ class TestFileLike: tutils.raises(ValueError, s.get_log) def test_writelog(self): - s = cStringIO.StringIO() + s = BytesIO() s = tcp.Writer(s) s.start_log() assert s.is_logging() @@ -636,7 +636,7 @@ class TestFileLike: assert s.get_log() == "xx" def test_writer_flush_error(self): - s = cStringIO.StringIO() + s = BytesIO() s = tcp.Writer(s) o = mock.MagicMock() o.flush = mock.MagicMock(side_effect=socket.error) @@ -644,7 +644,7 @@ class TestFileLike: tutils.raises(TcpDisconnect, s.flush) def test_reader_read_error(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s = tcp.Reader(s) o = mock.MagicMock() o.read = mock.MagicMock(side_effect=socket.error) @@ -652,14 +652,14 @@ class TestFileLike: tutils.raises(TcpDisconnect, s.read, 10) def test_reset_timestamps(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s = tcp.Reader(s) s.first_byte_timestamp = 500 s.reset_timestamps() assert not s.first_byte_timestamp def test_first_byte_timestamp_updated_on_read(self): - s = cStringIO.StringIO("foobar\nfoobar") + s = BytesIO(b"foobar\nfoobar") s = tcp.Reader(s) s.read(1) assert s.first_byte_timestamp @@ -668,7 +668,7 @@ class TestFileLike: assert s.first_byte_timestamp == expected def test_first_byte_timestamp_updated_on_readline(self): - s = cStringIO.StringIO("foobar\nfoobar\nfoobar") + s = BytesIO(b"foobar\nfoobar\nfoobar") s = tcp.Reader(s) s.readline() assert s.first_byte_timestamp @@ -695,7 +695,7 @@ class TestFileLike: tutils.raises(TcpDisconnect, s.readline, 10) def test_reader_incomplete_error(self): - s = cStringIO.StringIO("foobar") + s = BytesIO(b"foobar") s = tcp.Reader(s) tutils.raises(TcpReadIncomplete, s.safe_read, 10) |