psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-29 12:23:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jdufresne/iobase'

Browse Source
This commit is contained in:
Daniele Varrazzo 2017-11-28 03:04:03 +00:00
commit a39d794308
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_copy.py
View File

@ -25,7 +25,7 @@
import sys import sys
import string import string
from testutils import (unittest, ConnectingTestCase, decorate_all_tests, from testutils import (unittest, ConnectingTestCase, decorate_all_tests,
skip_if_no_iobase, skip_before_postgres, slow) skip_before_postgres, slow)
from cStringIO import StringIO from cStringIO import StringIO
from itertools import cycle, izip from itertools import cycle, izip
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
@ -131,7 +131,6 @@ class CopyTests(ConnectingTestCase):
finally: finally:
curs.close() curs.close()
@skip_if_no_iobase
def test_copy_text(self): def test_copy_text(self):
self.conn.set_client_encoding('latin1') self.conn.set_client_encoding('latin1')
self._create_temp_table() # the above call closed the xn self._create_temp_table() # the above call closed the xn
@ -154,7 +153,6 @@ class CopyTests(ConnectingTestCase):
f.seek(0) f.seek(0)
self.assertEqual(f.readline().rstrip(), about) self.assertEqual(f.readline().rstrip(), about)
@skip_if_no_iobase
def test_copy_bytes(self): def test_copy_bytes(self):
self.conn.set_client_encoding('latin1') self.conn.set_client_encoding('latin1')
self._create_temp_table() # the above call closed the xn self._create_temp_table() # the above call closed the xn
@ -176,7 +174,6 @@ class CopyTests(ConnectingTestCase):
f.seek(0) f.seek(0)
self.assertEqual(f.readline().rstrip(), about) self.assertEqual(f.readline().rstrip(), about)
@skip_if_no_iobase
def test_copy_expert_textiobase(self): def test_copy_expert_textiobase(self):
self.conn.set_client_encoding('latin1') self.conn.set_client_encoding('latin1')
self._create_temp_table() # the above call closed the xn self._create_temp_table() # the above call closed the xn

14
tests/testutils.py
View File

@ -248,20 +248,6 @@ def skip_if_tpc_disabled(f):
return skip_if_tpc_disabled_ return skip_if_tpc_disabled_
def skip_if_no_iobase(f):
"""Skip a test if io.TextIOBase is not available."""
@wraps(f)
def skip_if_no_iobase_(self):
try:
from io import TextIOBase # noqa
except ImportError:
return self.skipTest("io.TextIOBase not found.")
else:
return f(self)
return skip_if_no_iobase_
def skip_before_postgres(*ver): def skip_before_postgres(*ver):
"""Skip a test on PostgreSQL before a certain version.""" """Skip a test on PostgreSQL before a certain version."""
ver = ver + (0,) * (3 - len(ver)) ver = ver + (0,) * (3 - len(ver))