[Zodb-checkins] CVS: ZODB3/ZODB/tests - testZODB.py:1.5.2.1 testTransaction.py:1.11.8.1

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv20159/ZODB/tests

Modified Files:
      Tag: ZODB3-3_1-branch
	testZODB.py testTransaction.py 
Log Message:
Merge the deadlock debug code to the release branch.


=== ZODB3/ZODB/tests/testZODB.py 1.5 => 1.5.2.1 ===
--- ZODB3/ZODB/tests/testZODB.py:1.5	Sat Sep  7 13:22:09 2002
+++ ZODB3/ZODB/tests/testZODB.py	Tue Nov 12 15:18:08 2002
@@ -94,28 +94,6 @@
         self._storage.close()
         removefs("ZODBTests.fs")
 
-    def checkUnmodifiedObject(self):
-        # Test that a transaction with only unmodified objects works
-        # correctly.  The specific sequence of events is:
-        #     - an object is modified
-        #     - it is registered with the transaction
-        #     - the object is explicitly "unmodified"
-        #     - the transaction commits, but now has no modified objects
-        # We'd like to avoid doing anything with the storage.
-        ltid = self._storage.lastTransaction()
-        _objects = get_transaction()._objects
-        self.assertEqual(len(_objects), 0)
-        r = self._db.open().root()
-        obj = r["test"][0]
-        obj[1] = 1
-        self.assertEqual(obj._p_changed, 1)
-        self.assertEqual(len(_objects), 1)
-        del obj._p_changed
-        self.assertEqual(obj._p_changed, None)
-        self.assertEqual(len(_objects), 1)
-        get_transaction().commit()
-        self.assertEqual(ltid, self._storage.lastTransaction())
-
     def checkVersionOnly(self):
         # Make sure the changes to make empty transactions a no-op
         # still allow things like abortVersion().  This should work


=== ZODB3/ZODB/tests/testTransaction.py 1.11 => 1.11.8.1 ===