.

lib/tests/test_zodb.py

@@ -17,8 +17,9 @@
 #
 # See COPYING file for full licensing terms.
 # See https://www.nexedi.com/licensing for rationale and options.
-from wendelin.lib.zodb import LivePersistent, deactivate_btree, dbclose, zconn_at, zstor_2zurl
+from wendelin.lib.zodb import LivePersistent, deactivate_btree, dbclose, zconn_at, zstor_2zurl, zmajor
 from wendelin.lib.testing import getTestDB
+from wendelin.lib import testing
 from persistent import Persistent, UPTODATE, GHOST, CHANGED
 from ZODB import DB, POSException
 from BTrees.IOBTree import IOBTree
@@ -26,6 +27,7 @@ import transaction
 from transaction import TransactionManager
 from golang import defer, func
 from pytest import raises
+import pytest; xfail = pytest.mark.xfail
 import gc
 
 testdb = None
@@ -231,6 +233,7 @@ def test_deactivate_btree():
 
 
 # verify that zconn_at gives correct answer.
+@xfail(zmajor < 5, reason="zconn_at is TODO for ZODB4 and ZODB3")
 @func
 def test_zconn_at():
     stor = testdb.getZODBStorage()
@@ -306,6 +309,7 @@ def test_zconn_at():
 
 
 # verify that ZODB.Connection.onResyncCallback works
+@xfail(zmajor < 5, reason="ZODB.Connection.onResyncCallback is TODO for ZODB4 and ZODB3")
 @func
 def test_zodb_onresync():
     stor = testdb.getZODBStorage()
@@ -350,7 +354,10 @@ def test_zodb_onresync():
 
 
 # test that zurl does not change from one open to another storage open.
+#@xfail(not isinstance(testdb, testing.TestDB_FileStorage), reason="zstor_2zurl is TODO for ZEO and NEO")
 def test_zurlstable():
+    if not isinstance(testdb, testing.TestDB_FileStorage):
+        pytest.xfail(reason="zstor_2zurl is TODO for ZEO and NEO")
     zurl0 = None
     for i in range(10):
         zstor = testdb.getZODBStorage()