summaryrefslogtreecommitdiffstats
path: root/Lib/bsddb/test/test_queue.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/bsddb/test/test_queue.py')
-rw-r--r--Lib/bsddb/test/test_queue.py24
1 files changed, 10 insertions, 14 deletions
diff --git a/Lib/bsddb/test/test_queue.py b/Lib/bsddb/test/test_queue.py
index c514bd1..251a8cf 100644
--- a/Lib/bsddb/test/test_queue.py
+++ b/Lib/bsddb/test/test_queue.py
@@ -6,15 +6,7 @@ import os, string
from pprint import pprint
import unittest
-try:
- # For Pythons w/distutils pybsddb
- from bsddb3 import db
-except ImportError:
- # For Python 2.3
- from bsddb import db
-
-from test_all import verbose, get_new_database_path
-
+from test_all import db, verbose, get_new_database_path
#----------------------------------------------------------------------
@@ -47,14 +39,14 @@ class SimpleQueueTestCase(unittest.TestCase):
for x in string.letters:
d.append(x * 40)
- self.assertEqual(len(d), 52)
+ self.assertEqual(len(d), len(string.letters))
d.put(100, "some more data")
d.put(101, "and some more ")
d.put(75, "out of order")
d.put(1, "replacement data")
- self.assertEqual(len(d), 55)
+ self.assertEqual(len(d), len(string.letters)+3)
if verbose:
print "before close" + '-' * 30
@@ -69,7 +61,11 @@ class SimpleQueueTestCase(unittest.TestCase):
print "after open" + '-' * 30
pprint(d.stat())
- d.append("one more")
+ # Test "txn" as a positional parameter
+ d.append("one more", None)
+ # Test "txn" as a keyword parameter
+ d.append("another one", txn=None)
+
c = d.cursor()
if verbose:
@@ -119,14 +115,14 @@ class SimpleQueueTestCase(unittest.TestCase):
for x in string.letters:
d.append(x * 40)
- self.assertEqual(len(d), 52)
+ self.assertEqual(len(d), len(string.letters))
d.put(100, "some more data")
d.put(101, "and some more ")
d.put(75, "out of order")
d.put(1, "replacement data")
- self.assertEqual(len(d), 55)
+ self.assertEqual(len(d), len(string.letters)+3)
if verbose:
print "before close" + '-' * 30