[Zope-Checkins] CVS: ZODB3/ZODB/tests - VersionStorage.py:1.23.10.3 TransactionalUndoVersionStorage.py:1.11.36.2 StorageTestBase.py:1.27.8.4 PackableStorage.py:1.20.8.3 HistoryStorage.py:1.10.8.2 BasicStorage.py:1.24.8.2

Jeremy Hylton jeremy@zope.com
Tue, 15 Jul 2003 14:20:31 -0400


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

Modified Files:
      Tag: zodb33-devel-branch
	VersionStorage.py TransactionalUndoVersionStorage.py 
	StorageTestBase.py PackableStorage.py HistoryStorage.py 
	BasicStorage.py 
Log Message:
Remove unused variables and imports.


=== ZODB3/ZODB/tests/VersionStorage.py 1.23.10.2 => 1.23.10.3 ===
--- ZODB3/ZODB/tests/VersionStorage.py:1.23.10.2	Mon Jul  7 17:45:27 2003
+++ ZODB3/ZODB/tests/VersionStorage.py	Tue Jul 15 14:20:23 2003
@@ -165,7 +165,7 @@
         oid = self._storage.new_oid()
         revid = self._dostore(oid, data=MinPO(49))
         revid = self._dostore(oid, revid=revid, data=MinPO(50))
-        nvrevid = revid = self._dostore(oid, revid=revid, data=MinPO(51))
+        revid = self._dostore(oid, revid=revid, data=MinPO(51))
         # Now do some stores in a version
         revid = self._dostore(oid, revid=revid, data=MinPO(52),
                               version=version)
@@ -240,7 +240,6 @@
             self._storage.tpc_abort(t)
 
     def checkNewSerialOnCommitVersionToVersion(self):
-        eq = self.assertEqual
         oid, version = self._setup_version()
         data, vserial = self._storage.load(oid, version)
         data, nserial = self._storage.load(oid, '')


=== ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py 1.11.36.1 => 1.11.36.2 ===
--- ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py:1.11.36.1	Tue Jul  1 16:57:20 2003
+++ ZODB3/ZODB/tests/TransactionalUndoVersionStorage.py	Tue Jul 15 14:20:23 2003
@@ -125,9 +125,9 @@
         version = 'version'
         revid1 = self._x_dostore(oid1, data=MinPO(0), description='create1')
         revid2 = self._x_dostore(oid1, data=MinPO(1), revid=revid1,
-                               version=version, description='version1')
-        revid3 = self._x_dostore(oid1, data=MinPO(2), revid=revid2,
-                               version=version, description='version2')
+                                 version=version, description='version1')
+        self._x_dostore(oid1, data=MinPO(2), revid=revid2,
+                        version=version, description='version2')
         self._x_dostore(description='create2')
 
         t = Transaction()
@@ -172,9 +172,9 @@
         version = 'version'
         revid1 = self._x_dostore(oid1, data=MinPO(0), description='create1')
         revid2 = self._x_dostore(oid1, data=MinPO(1), revid=revid1,
-                               version=version, description='version1')
-        revid3 = self._x_dostore(oid1, data=MinPO(2), revid=revid2,
-                               version=version, description='version2')
+                                 version=version, description='version1')
+        self._x_dostore(oid1, data=MinPO(2), revid=revid2,
+                        version=version, description='version2')
         self._x_dostore(description='create2')
 
         t = Transaction()


=== ZODB3/ZODB/tests/StorageTestBase.py 1.27.8.3 => 1.27.8.4 ===
--- ZODB3/ZODB/tests/StorageTestBase.py:1.27.8.3	Tue Jul 15 13:20:59 2003
+++ ZODB3/ZODB/tests/StorageTestBase.py	Tue Jul 15 14:20:23 2003
@@ -21,7 +21,6 @@
 
 import errno
 import os
-import pickle
 import string
 import sys
 import time


=== ZODB3/ZODB/tests/PackableStorage.py 1.20.8.2 => 1.20.8.3 ===
--- ZODB3/ZODB/tests/PackableStorage.py:1.20.8.2	Tue Jul  1 16:57:20 2003
+++ ZODB3/ZODB/tests/PackableStorage.py	Tue Jul 15 14:20:23 2003
@@ -383,8 +383,6 @@
 
     def checkPackUndoLog(self):
         self._initroot()
-        eq = self.assertEqual
-        raises = self.assertRaises
         # Create a `persistent' object
         obj = self._newobj()
         oid = obj.getoid()
@@ -395,9 +393,9 @@
         snooze()
         packtime = time.time()
         snooze()
-        revid2 = self._dostoreNP(oid, revid=revid1, data=pickle.dumps(obj))
+        self._dostoreNP(oid, revid=revid1, data=pickle.dumps(obj))
         # Now pack the first transaction
-        self.assertEqual(3,len(self._storage.undoLog()))
+        self.assertEqual(3, len(self._storage.undoLog()))
         self._storage.pack(packtime, referencesf)
         # The undo log contains only the most resent transaction
         self.assertEqual(1,len(self._storage.undoLog()))
@@ -434,12 +432,12 @@
         revid13 = self._dostoreNP(oid1, revid=revid11,
                                   data=pickle.dumps(obj1), description="1-3")
         obj1.value = 4
-        revid14 = self._dostoreNP(oid1, revid=revid13,
-                                  data=pickle.dumps(obj1), description="1-4")
+        self._dostoreNP(oid1, revid=revid13,
+                        data=pickle.dumps(obj1), description="1-4")
         # Commit one revision of the second object
         obj2.value = 5
-        revid25 = self._dostoreNP(oid2, revid=revid22,
-                                  data=pickle.dumps(obj2), description="2-5")
+        self._dostoreNP(oid2, revid=revid22,
+                        data=pickle.dumps(obj2), description="2-5")
         # Now pack
         self.assertEqual(6,len(self._storage.undoLog()))
         print '\ninitial undoLog was'


=== ZODB3/ZODB/tests/HistoryStorage.py 1.10.8.1 => 1.10.8.2 ===
--- ZODB3/ZODB/tests/HistoryStorage.py:1.10.8.1	Tue Jul  1 16:57:20 2003
+++ ZODB3/ZODB/tests/HistoryStorage.py	Tue Jul 15 14:20:23 2003
@@ -132,7 +132,7 @@
         # Now commit the version
         t = Transaction()
         self._storage.tpc_begin(t)
-        oids = self._storage.commitVersion(version, '', t)
+        self._storage.commitVersion(version, '', t)
         self._storage.tpc_vote(t)
         self._storage.tpc_finish(t)
         # After consultation with Jim, we agreed that the semantics of
@@ -192,7 +192,7 @@
         # Now commit the version
         t = Transaction()
         self._storage.tpc_begin(t)
-        oids = self._storage.abortVersion(version, t)
+        self._storage.abortVersion(version, t)
         self._storage.tpc_vote(t)
         self._storage.tpc_finish(t)
         # After consultation with Jim, we agreed that the semantics of


=== ZODB3/ZODB/tests/BasicStorage.py 1.24.8.1 => 1.24.8.2 ===
--- ZODB3/ZODB/tests/BasicStorage.py:1.24.8.1	Tue Jul  1 16:57:20 2003
+++ ZODB3/ZODB/tests/BasicStorage.py	Tue Jul 15 14:20:23 2003
@@ -113,7 +113,7 @@
     def checkConflicts(self):
         oid = self._storage.new_oid()
         revid1 = self._dostore(oid, data=MinPO(11))
-        revid2 = self._dostore(oid, revid=revid1, data=MinPO(12))
+        self._dostore(oid, revid=revid1, data=MinPO(12))
         self.assertRaises(POSException.ConflictError,
                           self._dostore,
                           oid, revid=revid1, data=MinPO(13))