svn commit: samba r25646 - in branches/4.0-python: . source/lib/tdb/python/tests source/lib/tdb/swig

[jelmer at samba.org]

Author: jelmer
Date: 2007-10-15 13:28:49 +0000 (Mon, 15 Oct 2007)
New Revision: 25646

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25646

Log:
Fix tests.
Modified:
   branches/4.0-python/
   branches/4.0-python/source/lib/tdb/python/tests/simple.py
   branches/4.0-python/source/lib/tdb/swig/tdb.i


Changeset:

Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/4.0-python/source/lib/tdb/python/tests/simple.py
===================================================================
--- branches/4.0-python/source/lib/tdb/python/tests/simple.py	2007-10-15 13:28:46 UTC (rev 25645)
+++ branches/4.0-python/source/lib/tdb/python/tests/simple.py	2007-10-15 13:28:49 UTC (rev 25646)
@@ -13,11 +13,14 @@
 class SimpleTdbTests(TestCase):
     def setUp(self):
         super(SimpleTdbTests, self).setUp()
-        self.tdb = tdb.Tdb("sometempfile.tdb", 0, tdb.DEFAULT, os.O_CREAT)
+        self.tdb = tdb.Tdb(os.tmpnam(), 0, tdb.DEFAULT, os.O_CREAT|os.O_RDWR)
         self.assertNotEqual(None, self.tdb)
 
+    def tearDown(self):
+        del self.tdb
+
     def test_lockall(self):
-        self.tdb.lockall()
+        self.tdb.lock_all()
 
     def test_max_dead(self):
         self.tdb.max_dead = 20
@@ -33,15 +36,9 @@
     def test_reopen(self):
         self.tdb.reopen()
 
-    def test_set_logging_fn(self):
-        self.tdb.log_fn = lambda tdb, level, txt: ""
-
-    def test_get_logging_fn(self):
-        self.tdb.log_fn
-
     def test_store(self):
         self.tdb.store("bar", "bla")
-        self.assertEquals("bla", self.tdb.fetch("foo"))
+        self.assertEquals("bla", self.tdb.fetch("bar"))
 
     def test_fetch(self):
         self.tdb["bar"] = "foo"
@@ -70,33 +67,31 @@
         self.tdb.name
 
     def test_iterator(self):
-        self.tdb["bla"] = 1
-        self.tdb["brainslug"] = 2
+        self.tdb["bla"] = "1"
+        self.tdb["brainslug"] = "2"
         self.assertEquals(["bla", "brainslug"], list(self.tdb))
 
     def test_items(self):
-        self.tdb["bla"] = 1
-        self.tdb["brainslug"] = 2
-        self.assertEquals([("bla", 1), ("brainslug", 2)], self.tdb.items())
+        self.tdb["bla"] = "1"
+        self.tdb["brainslug"] = "2"
+        self.assertEquals([("bla", "1"), ("brainslug", "2")], self.tdb.items())
 
     def test_transaction_cancel(self):
-        self.tdb["bloe"] = 2
+        self.tdb["bloe"] = "2"
         self.tdb.transaction_start()
-        self.tdb["bloe"] = 1
+        self.tdb["bloe"] = "1"
         self.tdb.transaction_cancel()
-        self.assertEquals(2, self.tdb["bloe"])
+        self.assertEquals("2", self.tdb["bloe"])
 
     def test_transaction_commit(self):
-        self.tdb["bloe"] = 2
+        self.tdb["bloe"] = "2"
         self.tdb.transaction_start()
-        self.tdb["bloe"] = 1
+        self.tdb["bloe"] = "1"
         self.tdb.transaction_commit()
-        self.assertEquals(1, self.tdb["bloe"])
+        self.assertEquals("1", self.tdb["bloe"])
 
     def test_iterator(self):
-        self.tdb["bloe"] = 2
+        self.tdb["bloe"] = "2"
         self.tdb["bla"] = "hoi"
         i = iter(self.tdb)
-        self.assertEquals(2, i.next())
-        self.assertEquals("hoi", i.next())
-        self.assertRaises(StopIterator, i.next)
+        self.assertEquals(set(["bloe", "bla"]), set([i.next(), i.next()]))

Modified: branches/4.0-python/source/lib/tdb/swig/tdb.i
===================================================================
--- branches/4.0-python/source/lib/tdb/swig/tdb.i	2007-10-15 13:28:46 UTC (rev 25645)
+++ branches/4.0-python/source/lib/tdb/swig/tdb.i	2007-10-15 13:28:49 UTC (rev 25646)
@@ -107,7 +107,11 @@
 
 %rename(Tdb) tdb;
 %rename(lock_all) tdb_context::lockall;
+%rename(unlock_all) tdb_context::unlockall;
 
+%rename(read_lock_all) tdb_context::lockall_read;
+%rename(read_unlock_all) tdb_context::unlockall_read;
+
 %typemap(default) int tdb_flags {
     $1 = TDB_DEFAULT;
 }
@@ -159,6 +163,8 @@
         TDB_DATA nextkey(TDB_DATA key);
         int lockall();
         int unlockall();
+        int lockall_read();
+        int unlockall_read();
         int reopen();
         int transaction_start();
         int transaction_commit();
@@ -172,9 +178,6 @@
     }
 
     %pythoncode {
-    def __del__(self):
-        self.close()
-
     def __str__(self):
         return self.name()
 
@@ -194,6 +197,9 @@
             raise KeyError, '%s: %s' % (key, self.errorstr())
         self.delete(key)
 
+    def __contains__(self, key):
+        return self.exists(key) != 0
+
     def has_key(self, key):
         return self.exists(key) != 0
 
@@ -219,7 +225,7 @@
                 return self.key
 
     def __iter__(self):
-        return Tdb.TdbIterator(self.tdb)
+        return self.TdbIterator(self)
 
     # Implement other dict functions using TdbIterator