sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4-tests: Modified ldap_schema.py to use samba.tests.delete_force

Browse Source
This commit is contained in:
Nadezhda Ivanova 2010-11-25 01:12:42 +02:00
parent d21d3e7db8
commit 5e7d99a5d8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source4/dsdb/tests/python/ldap_schema.py
View File

@ -24,6 +24,7 @@ from ldb import Message, MessageElement, Dn
from ldb import FLAG_MOD_REPLACE
from samba.samdb import SamDB
from samba.dsdb import DS_DOMAIN_FUNCTION_2003
from samba.tests import delete_force
from subunit.run import SubunitTestRunner
import unittest
@ -49,12 +50,6 @@ creds = credopts.get_credentials(lp)
class SchemaTests(unittest.TestCase):
def delete_force(self, ldb, dn):
try:
ldb.delete(dn)
except LdbError, (num, _):
self.assertEquals(num, ERR_NO_SUCH_OBJECT)
def setUp(self):
super(SchemaTests, self).setUp()
self.ldb = ldb
@ -192,7 +187,7 @@ name: """ + object_name + """
res = self.ldb.search("cn=%s,cn=Users,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["*"])
self.assertEquals(len(res), 1)
# Delete the object
self.delete_force(self.ldb, "cn=%s,cn=Users,%s" % (object_name, self.base_dn))
delete_force(self.ldb, "cn=%s,cn=Users,%s" % (object_name, self.base_dn))
def test_subClassOf(self):
""" Testing usage of custom child schamaClass
@ -248,7 +243,7 @@ instanceType: 4
res = self.ldb.search("ou=%s,%s" % (object_name, self.base_dn), scope=SCOPE_BASE, attrs=["*"])
self.assertEquals(len(res), 1)
# Delete the object
self.delete_force(self.ldb, "ou=%s,%s" % (object_name, self.base_dn))
delete_force(self.ldb, "ou=%s,%s" % (object_name, self.base_dn))
class SchemaTests_msDS_IntId(unittest.TestCase):