openstack/deb-python-testtools
Code Issues Proposed changes

Restore test suite compatability with Python 3.x.

Browse Source
This commit is contained in:
Robert Collins
2012-12-17 01:32:37 +13:00
parent db38b5bdce
commit 7ebfaccdee
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
testtools/tests/test_content.py
View File

@@ -9,6 +9,7 @@ from testtools import TestCase
from testtools.compat import ( from testtools.compat import (
_b, _b,
_u, _u,
BytesIO,
StringIO, StringIO,
) )
from testtools.content import ( from testtools.content import (
@@ -127,24 +128,23 @@ class TestContent(TestCase):
def test_from_file_with_simple_seek(self): def test_from_file_with_simple_seek(self):
f = tempfile.NamedTemporaryFile() f = tempfile.NamedTemporaryFile()
f.write('some data') f.write(_b('some data'))
f.flush() f.flush()
self.addCleanup(f.close) self.addCleanup(f.close)
content = content_from_file( content = content_from_file(
f.name, UTF8_TEXT, chunk_size=50, seek_offset=5) f.name, UTF8_TEXT, chunk_size=50, seek_offset=5)
self.assertThat( self.assertThat(
list(content.iter_bytes()), Equals(['data'])) list(content.iter_bytes()), Equals([_b('data')]))
def test_from_file_with_whence_seek(self): def test_from_file_with_whence_seek(self):
f = tempfile.NamedTemporaryFile() f = tempfile.NamedTemporaryFile()
f.write('some data') f.write(_b('some data'))
f.flush() f.flush()
self.addCleanup(f.close) self.addCleanup(f.close)
content = content_from_file( content = content_from_file(
f.name, UTF8_TEXT, chunk_size=50, seek_offset=-4, seek_whence=2) f.name, UTF8_TEXT, chunk_size=50, seek_offset=-4, seek_whence=2)
self.assertThat( self.assertThat(
list(content.iter_bytes()), Equals(['data'])) list(content.iter_bytes()), Equals([_b('data')]))
def test_from_stream(self): def test_from_stream(self):
data = StringIO('some data') data = StringIO('some data')
@@ -170,18 +170,18 @@ class TestContent(TestCase):
''.join(content.iter_text()), Equals('some data')) ''.join(content.iter_text()), Equals('some data'))
def test_from_stream_with_simple_seek(self): def test_from_stream_with_simple_seek(self):
data = StringIO('some data') data = BytesIO(_b('some data'))
content = content_from_stream( content = content_from_stream(
data, UTF8_TEXT, chunk_size=50, seek_offset=5) data, UTF8_TEXT, chunk_size=50, seek_offset=5)
self.assertThat( self.assertThat(
list(content.iter_bytes()), Equals(['data'])) list(content.iter_bytes()), Equals([_b('data')]))
def test_from_stream_with_whence_seek(self): def test_from_stream_with_whence_seek(self):
data = StringIO('some data') data = BytesIO(_b('some data'))
content = content_from_stream( content = content_from_stream(
data, UTF8_TEXT, chunk_size=50, seek_offset=-4, seek_whence=2) data, UTF8_TEXT, chunk_size=50, seek_offset=-4, seek_whence=2)
self.assertThat( self.assertThat(
list(content.iter_bytes()), Equals(['data'])) list(content.iter_bytes()), Equals([_b('data')]))
def test_from_text(self): def test_from_text(self):
data = _u("some data") data = _u("some data")