Skip to content

Commit

Permalink
Run test_persistentregistry under PyPy/3, and fix it. Doctests still …
Browse files Browse the repository at this point in the history
…fail under PyPy.
  • Loading branch information
jamadden committed May 27, 2015
1 parent 05accb6 commit df210e5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
- TOXENV=py33
- TOXENV=py34
- TOXENV=pypy
- TOXENV=pypy3
- TOXENV=coverage
- TOXENV=docs
install:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changes
4.2.2 (unreleased)
------------------

-TBD
- Fix test cases for PyPy and PyPy3.


4.2.1 (2014-03-19)
Expand Down
2 changes: 2 additions & 0 deletions src/zope/component/tests/test_persistentregistry.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def mru(self, oid):
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)

Expand Down
10 changes: 1 addition & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit df210e5

Please sign in to comment.