summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/tests
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-19 23:55:45 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-19 23:55:45 +0100
commit759a3bcc88230c5232b748bb8f5a0c6e0cce128c (patch)
tree25c15bb606cf573ac217f82b2110166a45520734 /source4/lib/ldb/tests
parent9617a3945b804bf2d1409285df2a7add12690063 (diff)
parent04bef7fe2ab689a9ab569d5581034e0c02237771 (diff)
downloadsamba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.gz
samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.bz2
samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.zip
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
Conflicts: source4/lib/ldb/ldb_wrap.c
Diffstat (limited to 'source4/lib/ldb/tests')
-rwxr-xr-xsource4/lib/ldb/tests/python/api.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 4b3501839f..cdf9abe9b2 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -6,7 +6,6 @@ import os, sys
import unittest
# Required for the standalone LDB build
-sys.path.append("swig")
sys.path.append("build/lib.linux-i686-2.4")
import ldb
@@ -422,7 +421,7 @@ class LdbMsgTests(unittest.TestCase):
self.assertEquals("bar", self.msg.get("foo")[0])
def test_get_unknown(self):
- self.assertRaises(KeyError, self.msg.get, "lalalala")
+ self.assertEquals(None, self.msg.get("lalalala"))
class MessageElementTests(unittest.TestCase):
@@ -459,6 +458,7 @@ class MessageElementTests(unittest.TestCase):
x = ldb.MessageElement(["foo"])
self.assertEquals("foo", x)
+
class ModuleTests(unittest.TestCase):
def test_register_module(self):
class ExampleModule: