[Zodb-checkins] SVN: ZODB/trunk/src/ZODB/tests/test_storage.py Removed unneeded loadEx and added missing close and cleanup methods.

[Jim Fulton]

Log message for revision 74832:
  Removed unneeded loadEx and added missing close and cleanup methods.
  

Changed:
  U   ZODB/trunk/src/ZODB/tests/test_storage.py

-=-
Modified: ZODB/trunk/src/ZODB/tests/test_storage.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/test_storage.py	2007-04-26 23:19:47 UTC (rev 74831)
+++ ZODB/trunk/src/ZODB/tests/test_storage.py	2007-04-26 23:19:51 UTC (rev 74832)
@@ -74,19 +74,16 @@
     def _clear_temp(self):
         pass
 
-    def loadEx(self, oid, version):
+    def load(self, oid, version):
         self._lock_acquire()
         try:
             assert not version
             tid = self._cur[oid]
-            self.hook(oid, tid, version)
-            return self._index[(oid, tid)], tid, ""
+            self.hook(oid, tid, '')
+            return self._index[(oid, tid)], tid
         finally:
             self._lock_release()
 
-    def load(self, oid, version):
-        return self.loadEx(oid, version)[:2]
-
     def _begin(self, tid, u, d, e):
         self._txn = Transaction(tid)
 
@@ -145,6 +142,11 @@
         finally:
             self._lock_release()
 
+    def close(self):
+        pass
+
+    cleanup = close
+
 class MinimalTestSuite(StorageTestBase.StorageTestBase,
                        BasicStorage.BasicStorage,
                        MTStorage.MTStorage,