[Zodb-checkins] CVS: Zope/lib/python/ZODB/tests - MTStorage.py:1.4.4.1 ReadOnlyStorage.py:1.3.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv9237/lib/python/ZODB/tests

Modified Files:
      Tag: chrism-install-branch
	MTStorage.py ReadOnlyStorage.py 
Log Message:
Merging with HEAD.


=== Zope/lib/python/ZODB/tests/MTStorage.py 1.4 => 1.4.4.1 ===
--- Zope/lib/python/ZODB/tests/MTStorage.py:1.4	Wed Aug 14 18:07:09 2002
+++ Zope/lib/python/ZODB/tests/MTStorage.py	Mon Sep 16 02:00:54 2002
@@ -170,9 +170,9 @@
         for t in threads:
             t.start()
         for t in threads:
-            t.join(10)
+            t.join(30)
         for t in threads:
-            self.failIf(t.isAlive())
+            self.failIf(t.isAlive(), "thread failed to finish in 30 seconds")
 
     def check2ZODBThreads(self):
         db = ZODB.DB(self._storage)


=== Zope/lib/python/ZODB/tests/ReadOnlyStorage.py 1.3 => 1.3.4.1 ===
--- Zope/lib/python/ZODB/tests/ReadOnlyStorage.py:1.3	Wed Aug 14 18:07:09 2002
+++ Zope/lib/python/ZODB/tests/ReadOnlyStorage.py	Mon Sep 16 02:00:54 2002
@@ -32,28 +32,16 @@
         self.assertRaises(ReadOnlyError, self._storage.new_oid)
         self.assertRaises(ReadOnlyError, self._storage.undo,
                           '\000' * 8)
-
         t = Transaction()
-        self._storage.tpc_begin(t)
+        self.assertRaises(ReadOnlyError, self._storage.tpc_begin, t)
+
         self.assertRaises(ReadOnlyError, self._storage.abortVersion,
                           '', t)
-        self._storage.tpc_abort(t)
-
-        t = Transaction()
-        self._storage.tpc_begin(t)
         self.assertRaises(ReadOnlyError, self._storage.commitVersion,
                           '', '', t)
-        self._storage.tpc_abort(t)
-
-        t = Transaction()
-        self._storage.tpc_begin(t)
         self.assertRaises(ReadOnlyError, self._storage.store,
                           '\000' * 8, None, '', '', t)
-        self._storage.tpc_abort(t)
 
         if self._storage.supportsTransactionalUndo():
-            t = Transaction()
-            self._storage.tpc_begin(t)
             self.assertRaises(ReadOnlyError, self._storage.transactionalUndo,
                               '\000' * 8, t)
-            self._storage.tpc_abort(t)