Reenable checkTransactionalUndoIterator

ZODB.patch

@@ -113,7 +113,7 @@ index f0a2b72..5305807 100644
              oids.extend(oid for (oid, _) in vote_result or ())
              self.assertEqual(len(oids), len(expected_oids), repr(oids))
 diff --git a/src/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py
-index 0ee68b2..1c88720 100644
+index 0ee68b2..4dab889 100644
 --- a/src/ZODB/tests/TransactionalUndoStorage.py
 +++ b/src/ZODB/tests/TransactionalUndoStorage.py
 @@ -73,6 +73,12 @@ def _transaction_vote(self, trans):
@@ -217,3 +217,16 @@ index 0ee68b2..1c88720 100644
          revid1 = self._transaction_newserial(oid1)
          revid2 = self._transaction_newserial(oid2)
          eq(revid1, revid2)
+@@ -685,9 +693,9 @@ def undo(i):
+             tid = p64(i + 1)
+             eq(txn.tid, tid)
+ 
+-            L1 = [(rec.oid, rec.tid, rec.data_txn) for rec in txn]
+-            L2 = [(oid, revid, None) for _tid, oid, revid in orig
+-                  if _tid == tid]
++            L1 = {(rec.oid, rec.tid, rec.data_txn) for rec in txn}
++            L2 = {(oid, revid, None) for _tid, oid, revid in orig
++                  if _tid == tid}
+ 
+             eq(L1, L2)
+ 

ZODB3.patch

@@ -113,7 +113,7 @@ index 9737ec4..43f29ed 100644
              oids.extend(oid for (oid, _) in vote_result or ())
              self.assertEqual(len(oids), len(expected_oids), repr(oids))
 diff --git a/src/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py
-index 72adac2..698e288 100644
+index 72adac2..203736a 100644
 --- a/src/ZODB/tests/TransactionalUndoStorage.py
 +++ b/src/ZODB/tests/TransactionalUndoStorage.py
 @@ -76,6 +76,12 @@ def _transaction_vote(self, trans):
@@ -220,3 +220,16 @@ index 72adac2..698e288 100644
          revid1 = self._transaction_newserial(oid1)
          revid2 = self._transaction_newserial(oid2)
          eq(revid1, revid2)
+@@ -683,9 +691,9 @@ def undo(i):
+             tid = p64(i + 1)
+             eq(txn.tid, tid)
+ 
+-            L1 = [(rec.oid, rec.tid, rec.data_txn) for rec in txn]
+-            L2 = [(oid, revid, None) for _tid, oid, revid in orig
+-                  if _tid == tid]
++            L1 = {(rec.oid, rec.tid, rec.data_txn) for rec in txn}
++            L2 = {(oid, revid, None) for _tid, oid, revid in orig
++                  if _tid == tid}
+ 
+             eq(L1, L2)
+ 

neo/tests/zodb/testUndo.py

@@ -28,15 +28,6 @@ class UndoTests(ZODBTestCase, StorageTestBase, TransactionalUndoStorage,
     checkTransactionalUndoAfterPack = expectedFailure()(
         TransactionalUndoStorage.checkTransactionalUndoAfterPack)
 
-# Don't run this test. It cannot run with pipelined store, and is not executed
-# on Zeo - but because Zeo doesn't have an iterator, while Neo has.
-# Note that it is possible to run this test on Neo with a simple fix:
-# instead of expecting "store" to return object's serial, it should
-# just load it after commit, and keep its serial.
-# When iterator is fully implemented in Neo, a fork of that test should be
-# done with above fix.
-del TransactionalUndoStorage.checkTransactionalUndoIterator
-
 if __name__ == "__main__":
     suite = unittest.makeSuite(UndoTests, 'check')
     unittest.main(defaultTest='suite')