psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-03-22 18:44:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

A few large objects tests fixed

Browse Source 
The behavior changed in Python 3 after the lobject-decode merge.
This commit is contained in:
Daniele Varrazzo 2011-01-10 22:05:47 +00:00
parent 36d9ffea32
commit 3ba0631dbb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_lobject.py
View File

@ -144,7 +144,7 @@ class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
fp.close() fp.close()
lo = self.conn.lobject(0, "r", 0, filename) lo = self.conn.lobject(0, "r", 0, filename)
self.assertEqual(lo.read(), b("some data")) self.assertEqual(lo.read(), "some data")
def test_close(self): def test_close(self):
lo = self.conn.lobject() lo = self.conn.lobject()
@ -180,7 +180,7 @@ class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
lo = self.conn.lobject(lo.oid, "rb") lo = self.conn.lobject(lo.oid, "rb")
x = lo.read(4) x = lo.read(4)
self.assertEqual(type(x), type(b(''))) self.assertEqual(type(x), type(b('')))
self.assertEqual(x, "some") self.assertEqual(x, b("some"))
self.assertEqual(lo.read(), b(" data")) self.assertEqual(lo.read(), b(" data"))
def test_read_text(self): def test_read_text(self):
@ -197,13 +197,16 @@ class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
def test_read_large(self): def test_read_large(self):
lo = self.conn.lobject() lo = self.conn.lobject()
data = b("data") * 1000000 data = "data" * 1000000
length = lo.write(b("some") + data) length = lo.write("some" + data)
lo.close() lo.close()
lo = self.conn.lobject(lo.oid) lo = self.conn.lobject(lo.oid)
self.assertEqual(lo.read(4), b("some")) self.assertEqual(lo.read(4), "some")
self.assertEqual(lo.read(), data) data1 = lo.read()
# avoid dumping megacraps in the console in case of error
self.assert_(data == data1,
"%r... != %r..." % (data[:100], data1[:100]))
def test_seek_tell(self): def test_seek_tell(self):
lo = self.conn.lobject() lo = self.conn.lobject()
@ -214,17 +217,17 @@ class LargeObjectTests(LargeObjectMixin, unittest.TestCase):
self.assertEqual(lo.seek(5, 0), 5) self.assertEqual(lo.seek(5, 0), 5)
self.assertEqual(lo.tell(), 5) self.assertEqual(lo.tell(), 5)
self.assertEqual(lo.read(), b("data")) self.assertEqual(lo.read(), "data")
# SEEK_CUR: relative current location # SEEK_CUR: relative current location
lo.seek(5) lo.seek(5)
self.assertEqual(lo.seek(2, 1), 7) self.assertEqual(lo.seek(2, 1), 7)
self.assertEqual(lo.tell(), 7) self.assertEqual(lo.tell(), 7)
self.assertEqual(lo.read(), b("ta")) self.assertEqual(lo.read(), "ta")
# SEEK_END: relative to end of file # SEEK_END: relative to end of file
self.assertEqual(lo.seek(-2, 2), length - 2) self.assertEqual(lo.seek(-2, 2), length - 2)
self.assertEqual(lo.read(), b("ta")) self.assertEqual(lo.read(), "ta")
def test_unlink(self): def test_unlink(self):
lo = self.conn.lobject() lo = self.conn.lobject()