Skip to content

Z
zodburi
Commit 7502fa4f authored by Éloi Rivard's avatar Éloi Rivard
2 Browse files
Options

tox tests with zodb4

parent 475f420d
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 36 deletions
.travis.yml
View file @ 7502fa4f
...@@ -5,19 +5,27 @@ sudo: false ...@@ -5,19 +5,27 @@ sudo: false
matrix: matrix:
include: include:
- python: 2.7 - python: 2.7
env: TOXENV=py27 env: TOXENV=py27-zodb4
- python: 2.7
env: TOXENV=py27-zodb5
- python: 3.4
env: TOXENV=py34-zodb4
- python: 3.4 - python: 3.4
env: TOXENV=py34 env: TOXENV=py34-zodb5
- python: 3.5 - python: 3.5
env: TOXENV=py35 env: TOXENV=py35-zodb4
- python: 3.5
env: TOXENV=py35-zodb5
- python: 3.6
env: TOXENV=py36-zodb4
- python: 3.6 - python: 3.6
env: TOXENV=py36 env: TOXENV=py36-zodb5
- python: 3.7 - python: 3.7
env: TOXENV=py37 env: TOXENV=py37-zodb5
dist: xenial dist: xenial
sudo: true sudo: true
- python: 3.8-dev - python: 3.8-dev
env: TOXENV=py38 env: TOXENV=py38-zodb5
dist: xenial dist: xenial
sudo: true sudo: true
allow_failures: allow_failures:
......
CONTRIBUTORS.txt
View file @ 7502fa4f
...@@ -103,3 +103,4 @@ Contributors ...@@ -103,3 +103,4 @@ Contributors
- Todd Koym, 2016/07/21 - Todd Koym, 2016/07/21
- Jim Fulton, 2017/04/13 - Jim Fulton, 2017/04/13
- Kirill Smelkov, 2017/10/17 - Kirill Smelkov, 2017/10/17
- Éloi Rivard, 2019/01/18
tox.ini
View file @ 7502fa4f
[tox] [tox]
envlist = envlist =
py27,py34,py35,py36,py37,cover,docs {py27,py34,py35,py36}-{zodb4,zodb5},py37-zodb5,cover,docs
[testenv] [testenv]
commands = commands =
python setup.py -q test -q python setup.py -q test -q
deps = deps =
mock mock
zodb4: ZODB==4.*
zodb5: ZODB==5.*
zodb4: ZEO==4.*
zodb5: ZEO==5.*
[testenv:cover] [testenv:cover]
basepython = basepython =
......
zodburi/tests/test_resolvers.py
View file @ 7502fa4f
import mock import mock
import pkg_resources
import unittest import unittest
ZODB_VERSION = tuple(map(int, pkg_resources.get_distribution("ZODB").version.split('.')))
class Base: class Base:
def test_interpret_kwargs_noargs(self): def test_interpret_kwargs_noargs(self):
...@@ -437,15 +442,26 @@ class TestZConfigURIResolver(unittest.TestCase): ...@@ -437,15 +442,26 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory() storage = factory()
from ZODB.MappingStorage import MappingStorage from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage)) self.assertTrue(isinstance(storage, MappingStorage))
self.assertEqual(dbkw, if ZODB_VERSION[0] < 5:
{'connection_cache_size': 5000, self.assertEqual(dbkw,
'connection_cache_size_bytes': 0, {'connection_cache_size': 5000,
'connection_historical_cache_size': 1000, 'connection_cache_size_bytes': 0,
'connection_historical_cache_size_bytes': 0, 'connection_historical_cache_size': 1000,
'connection_historical_pool_size': 3, 'connection_historical_cache_size_bytes': 0,
'connection_historical_timeout': 300, 'connection_historical_pool_size': 3,
'connection_large_record_size': 16777216, 'connection_historical_timeout': 300,
'connection_pool_size': 7}) 'connection_pool_size': 7})
else:
self.assertEqual(dbkw,
{'connection_cache_size': 5000,
'connection_cache_size_bytes': 0,
'connection_historical_cache_size': 1000,
'connection_historical_cache_size_bytes': 0,
'connection_historical_pool_size': 3,
'connection_historical_timeout': 300,
'connection_large_record_size': 16777216,
'connection_pool_size': 7})
def test_named_database(self): def test_named_database(self):
self.tmp.write(b""" self.tmp.write(b"""
...@@ -463,16 +479,28 @@ class TestZConfigURIResolver(unittest.TestCase): ...@@ -463,16 +479,28 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory() storage = factory()
from ZODB.MappingStorage import MappingStorage from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage)) self.assertTrue(isinstance(storage, MappingStorage))
self.assertEqual(dbkw, if ZODB_VERSION[0] < 5:
{'connection_cache_size': 20000, self.assertEqual(dbkw,
'connection_cache_size_bytes': 0, {'connection_cache_size': 20000,
'connection_historical_cache_size': 1000, 'connection_cache_size_bytes': 0,
'connection_historical_cache_size_bytes': 0, 'connection_historical_cache_size': 1000,
'connection_historical_pool_size': 3, 'connection_historical_cache_size_bytes': 0,
'connection_historical_timeout': 300, 'connection_historical_pool_size': 3,
'connection_large_record_size': 16777216, 'connection_historical_timeout': 300,
'connection_pool_size': 5, 'connection_pool_size': 5,
'database_name': 'foo'}) 'database_name': 'foo'})
else:
self.assertEqual(dbkw,
{'connection_cache_size': 20000,
'connection_cache_size_bytes': 0,
'connection_historical_cache_size': 1000,
'connection_historical_cache_size_bytes': 0,
'connection_historical_pool_size': 3,
'connection_historical_timeout': 300,
'connection_large_record_size': 16777216,
'connection_pool_size': 5,
'database_name': 'foo'})
def test_database_all_options(self): def test_database_all_options(self):
from zodburi import connection_parameters, bytes_parameters from zodburi import connection_parameters, bytes_parameters
...@@ -518,16 +546,28 @@ class TestZConfigURIResolver(unittest.TestCase): ...@@ -518,16 +546,28 @@ class TestZConfigURIResolver(unittest.TestCase):
storage = factory() storage = factory()
from ZODB.MappingStorage import MappingStorage from ZODB.MappingStorage import MappingStorage
self.assertTrue(isinstance(storage, MappingStorage)) self.assertTrue(isinstance(storage, MappingStorage))
self.assertEqual(dbkw, if ZODB_VERSION[0] < 5:
{'cache_size': 5000, self.assertEqual(dbkw,
'cache_size_bytes': 0, {'cache_size': 5000,
'historical_cache_size': 1000, 'cache_size_bytes': 0,
'historical_cache_size_bytes': 0, 'historical_cache_size': 1000,
'historical_pool_size': 3, 'historical_cache_size_bytes': 0,
'historical_timeout': 300, 'historical_pool_size': 3,
'large_record_size': 16777216, 'historical_timeout': 300,
'pool_size': 7, 'pool_size': 7,
'database_name': 'unnamed'}) 'database_name': 'unnamed'})
else:
self.assertEqual(dbkw,
{'cache_size': 5000,
'cache_size_bytes': 0,
'historical_cache_size': 1000,
'historical_cache_size_bytes': 0,
'historical_pool_size': 3,
'historical_timeout': 300,
'large_record_size': 16777216,
'pool_size': 7,
'database_name': 'unnamed'})
class TestMappingStorageURIResolver(Base, unittest.TestCase): class TestMappingStorageURIResolver(Base, unittest.TestCase):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7