psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-22 17:06:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests failing on Python 2.6

Browse Source
This commit is contained in:
Daniele Varrazzo 2016-12-24 00:18:22 +01:00
parent b3cd125d27
commit a478ba9a47
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_connection.py
View File

@ -465,7 +465,7 @@ class MakeDsnTestCase(ConnectingTestCase):
conn = self.connect() conn = self.connect()
d = conn.get_dsn_parameters() d = conn.get_dsn_parameters()
self.assertEqual(d['dbname'], dbname) # the only param we can check reliably self.assertEqual(d['dbname'], dbname) # the only param we can check reliably
self.assertNotIn('password', d) self.assert_('password' not in d, d)
class IsolationLevelsTestCase(ConnectingTestCase): class IsolationLevelsTestCase(ConnectingTestCase):

4
tests/test_module.py
View File

@ -119,8 +119,8 @@ class ConnectTestCase(unittest.TestCase):
def test_int_port_param(self): def test_int_port_param(self):
psycopg2.connect(database='sony', port=6543) psycopg2.connect(database='sony', port=6543)
dsn = " %s " % self.args[0] dsn = " %s " % self.args[0]
self.assertIn(" dbname=sony ", dsn) self.assert_(" dbname=sony " in dsn, dsn)
self.assertIn(" port=6543 ", dsn) self.assert_(" port=6543 " in dsn, dsn)
def test_empty_param(self): def test_empty_param(self):
psycopg2.connect(database='sony', password='') psycopg2.connect(database='sony', password='')

10
tests/test_quote.py
View File

@ -65,11 +65,13 @@ class QuotingTestCase(ConnectingTestCase):
curs = self.conn.cursor() curs = self.conn.cursor()
data = 'abcd\x01\x00cdefg' data = 'abcd\x01\x00cdefg'
with self.assertRaises(ValueError) as e: try:
curs.execute("SELECT %s", (data,)) curs.execute("SELECT %s", (data,))
except ValueError as e:
self.assertEquals(str(e.exception), self.assertEquals(str(e),
'A string literal cannot contain NUL (0x00) characters.') 'A string literal cannot contain NUL (0x00) characters.')
else:
self.fail("ValueError not raised")
def test_binary(self): def test_binary(self):
data = b"""some data with \000\013 binary data = b"""some data with \000\013 binary

4
tests/test_replication.py
View File

@ -35,11 +35,7 @@ from testutils import ConnectingTestCase
class ReplicationTestCase(ConnectingTestCase): class ReplicationTestCase(ConnectingTestCase):
def setUp(self): def setUp(self):
if not testconfig.repl_dsn:
self.skipTest("replication tests disabled by default")
super(ReplicationTestCase, self).setUp() super(ReplicationTestCase, self).setUp()
self.slot = testconfig.repl_slot self.slot = testconfig.repl_slot
self._slots = [] self._slots = []

3
tests/testutils.py
View File

@ -122,6 +122,9 @@ class ConnectingTestCase(unittest.TestCase):
Should raise a skip test if not available, but guard for None on Should raise a skip test if not available, but guard for None on
old Python versions. old Python versions.
""" """
if repl_dsn is None:
return self.skipTest("replication tests disabled by default")
if 'dsn' not in kwargs: if 'dsn' not in kwargs:
kwargs['dsn'] = repl_dsn kwargs['dsn'] = repl_dsn
import psycopg2 import psycopg2