diff options
| author | Tres Seaver <tseaver@palladion.com> | 2015-05-27 12:33:59 -0400 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2015-05-27 12:33:59 -0400 |
| commit | 7bbce5e4ec6dbfd8ca354f8af53c8efadf58a2df (patch) | |
| tree | adfe4e647165cffd51361a88ffe854dbc123d59f | |
| parent | 05accb65c5bd4f84c9cdefdd0d2d31a82062f33c (diff) | |
| parent | df210e5bdec797144628d8130d364ab03a6c1fab (diff) | |
| download | zope-component-7bbce5e4ec6dbfd8ca354f8af53c8efadf58a2df.tar.gz | |
Merge pull request #15 from NextThought/pypy-support
Run test_persistentregistry under PyPy/3, and fix it
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | CHANGES.rst | 2 | ||||
| -rw-r--r-- | src/zope/component/tests/test_persistentregistry.py | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
4 files changed, 5 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 134d416..941f2b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ env: - TOXENV=py33 - TOXENV=py34 - TOXENV=pypy + - TOXENV=pypy3 - TOXENV=coverage - TOXENV=docs install: diff --git a/CHANGES.rst b/CHANGES.rst index 0dd4f62..e62468a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,7 @@ Changes 4.2.2 (unreleased) ------------------ --TBD +- Fix test cases for PyPy and PyPy3. 4.2.1 (2014-03-19) diff --git a/src/zope/component/tests/test_persistentregistry.py b/src/zope/component/tests/test_persistentregistry.py index 7744a57..1a8fcf1 100644 --- a/src/zope/component/tests/test_persistentregistry.py +++ b/src/zope/component/tests/test_persistentregistry.py @@ -37,6 +37,8 @@ class PersistentAdapterRegistryTests(unittest.TestCase): def new_ghost(self, oid, obj): obj._p_jar = self._jar obj._p_oid = oid + def update_object_size_estimation(self, oid, size): + return return _Cache(jar) @@ -3,7 +3,7 @@ envlist = # Jython support pending 2.7 support, due 2012-07-15 or so. See: # http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html # py26,py27,py32,jython,pypy,coverage,docs - py26,py26min,py27,pypy,py32,py33,py34,coverage,docs + py26,py26min,py27,pypy,pypy3,py32,py33,py34,coverage,docs [mindeps] deps = @@ -39,14 +39,6 @@ deps = commands = nosetests -I persistentregistry -I security -[testenv:pypy] -usedevelop = true -deps = - {[mindeps]deps} - nose -commands = - nosetests -I persistentregistry -I security - [testenv:coverage] usedevelop = true basepython = |