diff options
| author | Jesus Cea <jcea@jcea.es> | 2008-07-23 11:38:42 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2008-07-23 11:38:42 (GMT) |
| commit | c5a11fabdb03d032f278f86e600bcdaafdb5d783 (patch) | |
| tree | e7db234112c7ac06aebe9c1e7833b0dd4168c664 /Lib/bsddb/test/test_thread.py | |
| parent | 30e208d525cd472446feb91b774cf472e7122918 (diff) | |
| download | cpython-c5a11fabdb03d032f278f86e600bcdaafdb5d783.zip cpython-c5a11fabdb03d032f278f86e600bcdaafdb5d783.tar.gz cpython-c5a11fabdb03d032f278f86e600bcdaafdb5d783.tar.bz2 | |
bsddb module updated to version 4.7.2devel9.
This patch publishes the work done until now
for Python 3.0 compatibility. Still a lot
to be done.
When possible, we use 3.0 features in Python 2.6,
easing development and testing, and exposing internal
changes to a wider audience, for better test coverage.
Some mode details:
http://www.jcea.es/programacion/pybsddb.htm#bsddb3-4.7.2
Diffstat (limited to 'Lib/bsddb/test/test_thread.py')
| -rw-r--r-- | Lib/bsddb/test/test_thread.py | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/Lib/bsddb/test/test_thread.py b/Lib/bsddb/test/test_thread.py index 5ac98ce..bdeaf93 100644 --- a/Lib/bsddb/test/test_thread.py +++ b/Lib/bsddb/test/test_thread.py @@ -7,28 +7,19 @@ import time import errno from random import random -try: - True, False -except NameError: - True = 1 - False = 0 - DASH = '-' try: - from threading import Thread, currentThread - have_threads = True -except ImportError: - have_threads = False - -try: WindowsError except NameError: class WindowsError(Exception): pass import unittest -from test_all import verbose, get_new_environment_path, get_new_database_path +from test_all import verbose, have_threads, get_new_environment_path, get_new_database_path + +if have_threads : + from threading import Thread, currentThread try: @@ -103,8 +94,8 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase): keys=range(self.records) import random random.shuffle(keys) - records_per_writer=self.records/self.writers - readers_per_writer=self.readers/self.writers + records_per_writer=self.records//self.writers + readers_per_writer=self.readers//self.writers self.assertEqual(self.records,self.writers*records_per_writer) self.assertEqual(self.readers,self.writers*readers_per_writer) self.assertTrue((records_per_writer%readers_per_writer)==0) @@ -143,7 +134,7 @@ class ConcurrentDataStoreBase(BaseThreadedTestCase): if verbose: print "%s: creating records %d - %d" % (name, start, stop) - count=len(keys)/len(readers) + count=len(keys)//len(readers) count2=count for x in keys : key = '%04d' % x @@ -218,8 +209,8 @@ class SimpleThreadedBase(BaseThreadedTestCase): keys=range(self.records) import random random.shuffle(keys) - records_per_writer=self.records/self.writers - readers_per_writer=self.readers/self.writers + records_per_writer=self.records//self.writers + readers_per_writer=self.readers//self.writers self.assertEqual(self.records,self.writers*records_per_writer) self.assertEqual(self.readers,self.writers*readers_per_writer) self.assertTrue((records_per_writer%readers_per_writer)==0) @@ -258,7 +249,7 @@ class SimpleThreadedBase(BaseThreadedTestCase): if verbose: print "%s: creating records %d - %d" % (name, start, stop) - count=len(keys)/len(readers) + count=len(keys)//len(readers) count2=count for x in keys : key = '%04d' % x @@ -332,8 +323,8 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): keys=range(self.records) import random random.shuffle(keys) - records_per_writer=self.records/self.writers - readers_per_writer=self.readers/self.writers + records_per_writer=self.records//self.writers + readers_per_writer=self.readers//self.writers self.assertEqual(self.records,self.writers*records_per_writer) self.assertEqual(self.readers,self.writers*readers_per_writer) self.assertTrue((records_per_writer%readers_per_writer)==0) @@ -375,7 +366,7 @@ class ThreadedTransactionsBase(BaseThreadedTestCase): def writerThread(self, d, keys, readers): name = currentThread().getName() - count=len(keys)/len(readers) + count=len(keys)//len(readers) while len(keys): try: txn = self.env.txn_begin(None, self.txnFlag) |
