Commit d1514957 authored by Jens Vagelpohl's avatar Jens Vagelpohl

Merge branch 'master' into python38-and-39

parents b3bc7a0a 60c9d106
...@@ -16,6 +16,7 @@ jobs: ...@@ -16,6 +16,7 @@ jobs:
- ["2.7", "py27"] - ["2.7", "py27"]
- ["2.7", "py27-msgpack1"] - ["2.7", "py27-msgpack1"]
- ["2.7", "py27-zeo4"] - ["2.7", "py27-zeo4"]
- ["2.7", "py27-zodbmaster"]
- ["3.5", "py35"] - ["3.5", "py35"]
- ["3.5", "py35-zeo4"] - ["3.5", "py35-zeo4"]
- ["3.6", "py36"] - ["3.6", "py36"]
...@@ -25,6 +26,7 @@ jobs: ...@@ -25,6 +26,7 @@ jobs:
- ["3.7", "py37-mtacceptor"] - ["3.7", "py37-mtacceptor"]
- ["3.7", "py37-mtacceptor-msgpack1"] - ["3.7", "py37-mtacceptor-msgpack1"]
- ["3.7", "py37-uvloop"] - ["3.7", "py37-uvloop"]
- ["3.7", "py37-zodbmaster"]
- ["3.8", "py38"] - ["3.8", "py38"]
- ["3.8", "py38-mtacceptor"] - ["3.8", "py38-mtacceptor"]
- ["3.8", "py38-mtacceptor-msgpack1"] - ["3.8", "py38-mtacceptor-msgpack1"]
......
...@@ -4,6 +4,9 @@ Changelog ...@@ -4,6 +4,9 @@ Changelog
5.2.3 (unreleased) 5.2.3 (unreleased)
------------------ ------------------
- Add automated tests against the ZODB ``master`` branch
see `issue 177 <https://github.com/zopefoundation/ZEO/issues/177>`_.
- Fix data corruption due to race between load and external invalidations. - Fix data corruption due to race between load and external invalidations.
See `issue 155 <https://github.com/zopefoundation/ZEO/issues/155>`_. See `issue 155 <https://github.com/zopefoundation/ZEO/issues/155>`_.
......
...@@ -18,7 +18,9 @@ commands = ...@@ -18,7 +18,9 @@ commands =
# Only run functional tests if unit tests pass. # Only run functional tests if unit tests pass.
zope-testrunner -f --test-path=src {posargs:-vc} zope-testrunner -f --test-path=src {posargs:-vc}
deps = deps =
ZODB >= 4.2.0b1 !zodbmaster: ZODB >= 4.2.0b1
zodbmaster: -e git+https://github.com/zopefoundation/ZODB.git@master#egg=ZODB
uvloop: uvloop
random2 random2
ZConfig ZConfig
manuel manuel
...@@ -33,78 +35,11 @@ deps = ...@@ -33,78 +35,11 @@ deps =
msgpack < 1 msgpack < 1
# ZopeUndo is needed as soft-dependency for a regression test # ZopeUndo is needed as soft-dependency for a regression test
ZopeUndo ZopeUndo
[testenv:py27-msgpack1]
setenv =
ZEO_MSGPACK=1
[testenv:py27-zeo4]
setenv =
ZEO4_SERVER=1
[testenv:py35-zeo4]
setenv =
ZEO4_SERVER=1
[testenv:py36-mtacceptor]
setenv =
ZEO_MTACCEPTOR=1
[testenv:py36-mtacceptor-msgpack1]
setenv =
ZEO_MTACCEPTOR=1
ZEO_MSGPACK=1
[testenv:py37-mtacceptor]
setenv =
ZEO_MTACCEPTOR=1
[testenv:py37-mtacceptor-msgpack1]
setenv =
ZEO_MTACCEPTOR=1
ZEO_MSGPACK=1
[testenv:py37-uvloop]
deps =
{[testenv]deps}
uvloop
[testenv:py38-mtacceptor]
setenv =
ZEO_MTACCEPTOR=1
[testenv:py38-mtacceptor-msgpack1]
setenv =
ZEO_MTACCEPTOR=1
ZEO_MSGPACK=1
[testenv:py38-uvloop]
deps =
{[testenv]deps}
uvloop
[testenv:py39-mtacceptor]
setenv =
ZEO_MTACCEPTOR=1
[testenv:py39-mtacceptor-msgpack1]
setenv =
ZEO_MTACCEPTOR=1
ZEO_MSGPACK=1
[testenv:py39-uvloop]
deps =
{[testenv]deps}
uvloop
[testenv:pypy3-mtacceptor]
setenv =
ZEO_MTACCEPTOR=1
[testenv:pypy3-mtacceptor-msgpack1]
setenv = setenv =
ZEO_MTACCEPTOR=1 !py27-!pypy: PYTHONWARNINGS=ignore::ResourceWarning
ZEO_MSGPACK=1 msgpack1: ZEO_MSGPACK=1
mtacceptor: ZEO_MTACCEPTOR=1
zeo4: ZEO4_SERVER=1
[testenv:simple] [testenv:simple]
# Test that 'setup.py test' works # Test that 'setup.py test' works
......
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