Commit bd1e3d27 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into t

* master:
  go/zodb/zeo: Skip handshake/py/msgpack=true on ZEO4
parents d7f3bc57 6d9a8046
...@@ -192,6 +192,7 @@ func withZEOSrv(t *testing.T, f func(t *testing.T, zsrv ZEOSrv), optv ...tOption ...@@ -192,6 +192,7 @@ func withZEOSrv(t *testing.T, f func(t *testing.T, zsrv ZEOSrv), optv ...tOption
needpy := []string{"ZEO"} needpy := []string{"ZEO"}
if msgpack { if msgpack {
needpy = append(needpy, "msgpack") needpy = append(needpy, "msgpack")
needpy = append(needpy, "ZEO.asyncio") // FIXME hack to check that ZEO ver >= 5
} }
xtesting.NeedPy(t, needpy...) xtesting.NeedPy(t, needpy...)
withFS1(t, func(fs1path string) { withFS1(t, func(fs1path string) {
......
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