[Zodb-checkins] CVS: StandaloneZODB/ZEO/tests - testZEO.py:1.24

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv14866/tests

Modified Files:
	testZEO.py 
Log Message:
Commit the zeo-1_0-debug-branch to the trunk.

I expect this code will become ZEO 1.1.


=== StandaloneZODB/ZEO/tests/testZEO.py 1.23 => 1.24 ===
         """Try to cause the tests to halt"""
         self.running = 0
+        self._storage.status()
         self._storage.close()
         self._server.close()
         os.waitpid(self._pid, 0)
@@ -218,6 +219,7 @@
         oid = self._storage.new_oid()
         self._storage.store(oid, None, '', '', t)
         self._storage.tpc_vote(t)
+        self._storage.status()
         self._storage.tpc_finish(t)
 
         for store, trans in self._storages:
@@ -237,7 +239,7 @@
     def _get_timestamp(self):
         t = time.time()
         t = apply(TimeStamp,(time.gmtime(t)[:5]+(t%60,)))
-        return 't'
+        return `t`
 
 class ZEOFileStorageTests(GenericTests):
     __super_setUp = GenericTests.setUp