psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-26 10:53:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #819 from jdufresne/ctypes

Browse Source 
Remove unnecessary test decorator 'skip_if_cant_cast'
This commit is contained in:
Daniele Varrazzo 2018-12-05 11:30:48 +00:00 committed by GitHub
commit de79aba66d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/test_types_basic.py
View File

@ -22,13 +22,14 @@
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public # FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
# License for more details. # License for more details.
import ctypes
import decimal import decimal
import platform
import sys import sys
from functools import wraps
from . import testutils from . import testutils
import unittest import unittest
from .testutils import ConnectingTestCase, decorate_all_tests, long from .testutils import ConnectingTestCase, long
import psycopg2 import psycopg2
@ -471,36 +472,16 @@ class AdaptSubclassTest(unittest.TestCase):
self.assertEqual(ext.adapt(foo((1, 2, 3))).getquoted(), 'bar') self.assertEqual(ext.adapt(foo((1, 2, 3))).getquoted(), 'bar')
@decorate_all_tests @unittest.skipIf(
def skip_if_cant_cast(f): platform.system() == 'Windows',
@wraps(f) "Not testing because we are useless with ctypes on Windows")
def skip_if_cant_cast_(self, *args, **kwargs):
if self._cast is None:
return self.skipTest("can't test bytea parser: %s - %s"
% (self._exc.__class__.__name__, self._exc))
return f(self, *args, **kwargs)
return skip_if_cant_cast_
@skip_if_cant_cast
class ByteaParserTest(unittest.TestCase): class ByteaParserTest(unittest.TestCase):
"""Unit test for our bytea format parser.""" """Unit test for our bytea format parser."""
def setUp(self): def setUp(self):
try: self._cast = self._import_cast()
self._cast = self._import_cast()
except Exception as e:
self._cast = None
self._exc = e
def _import_cast(self): def _import_cast(self):
"""Use ctypes to access the C function. """Use ctypes to access the C function."""
Raise any sort of error: we just support this where ctypes works as
expected.
"""
import ctypes
lib = ctypes.pydll.LoadLibrary(psycopg2._psycopg.__file__) lib = ctypes.pydll.LoadLibrary(psycopg2._psycopg.__file__)
cast = lib.typecast_BINARY_cast cast = lib.typecast_BINARY_cast
cast.argtypes = [ctypes.c_char_p, ctypes.c_size_t, ctypes.py_object] cast.argtypes = [ctypes.c_char_p, ctypes.c_size_t, ctypes.py_object]