summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorNadezhda Ivanova <nivanova@samba.org>2010-11-23 11:21:22 +0200
committerNadezhda Ivanova <nivanova@samba.org>2010-11-23 11:22:26 +0200
commitd6679cb75a68b85c5dc28b5633bead84cc2deba9 (patch)
treede606dda2b005ae4aee8b2c63f5884c9c5a63907 /source4
parenteaa9733a83b23da8c54cc2975c4ff3c854bbc30f (diff)
downloadsamba-d6679cb75a68b85c5dc28b5633bead84cc2deba9.tar.gz
samba-d6679cb75a68b85c5dc28b5633bead84cc2deba9.tar.bz2
samba-d6679cb75a68b85c5dc28b5633bead84cc2deba9.zip
s4-tests: Acl tests now use the get_dsheuristics and set_dsheuristics from SamDB.
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/dsdb/tests/python/acl.py30
1 files changed, 7 insertions, 23 deletions
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 8a1c6a43a4..2b805d6390 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -221,17 +221,6 @@ url: www.example.com
self.create_active_user(self.ldb_admin, self.get_user_dn(username))
self.ldb_admin.enable_account("(sAMAccountName=" + username + ")")
- def set_dsheuristics(self, dsheuristics):
- m = Message()
- m.dn = Dn(self.ldb_admin, "CN=Directory Service, CN=Windows NT, CN=Services, "
- + self.configuration_dn)
- if dsheuristics is not None:
- m["dSHeuristics"] = MessageElement(dsheuristics, FLAG_MOD_REPLACE,
- "dSHeuristics")
- else:
- m["dSHeuristics"] = MessageElement([], FLAG_MOD_DELETE, "dsHeuristics")
- self.ldb_admin.modify(m)
-
#tests on ldap add operations
class AclAddTests(AclTests):
@@ -697,13 +686,8 @@ class AclSearchTests(AclTests):
self.creds_tmp.set_domain(creds.get_domain())
self.creds_tmp.set_realm(creds.get_realm())
self.creds_tmp.set_workstation(creds.get_workstation())
- self.anonymous = SamDB(url=host, credentials=self.creds_tmp, lp=lp);
- res = self.ldb_admin.search("CN=Directory Service, CN=Windows NT, CN=Services, "
- + self.configuration_dn, scope=SCOPE_BASE, attrs=["dSHeuristics"])
- if "dSHeuristics" in res[0]:
- self.dsheuristics = res[0]["dSHeuristics"][0]
- else:
- self.dsheuristics = None
+ self.anonymous = SamDB(url=host, credentials=self.creds_tmp, lp=lp)
+ self.dsheuristics = self.ldb_admin.get_dsheuristics()
self.create_enable_user(self.u1)
self.create_enable_user(self.u2)
self.create_enable_user(self.u3)
@@ -801,7 +785,7 @@ class AclSearchTests(AclTests):
def test_search_anonymous3(self):
"""Set dsHeuristics and repeat"""
- self.set_dsheuristics("0000002")
+ self.ldb_admin.set_dsheuristics("0000002")
self.create_ou(self.ldb_admin, "OU=test_search_ou1," + self.base_dn)
mod = "(A;CI;LC;;;AN)"
self.dacl_add_ace("OU=test_search_ou1," + self.base_dn, mod)
@@ -817,7 +801,7 @@ class AclSearchTests(AclTests):
self.assertEquals(len(res), 1)
self.assertTrue("dn" in res[0])
self.assertTrue(res[0]["dn"] == Dn(self.ldb_admin, self.configuration_dn))
- self.set_dsheuristics(self.dsheuristics)
+ self.ldb_admin.set_dsheuristics(self.dsheuristics)
def test_search1(self):
"""Make sure users can see us if given LC to user and group"""
@@ -1338,14 +1322,14 @@ class AclCARTests(AclTests):
self.minPwdAge = self.ldb_admin.get_minPwdAge()
# Set the "dSHeuristics" to have the tests run against Windows Server
- self.set_dsheuristics("000000001")
-# Set minPwdAge to 0
+ self.ldb_admin.set_dsheuristics("000000001")
+ # Set minPwdAge to 0
self.ldb_admin.set_minPwdAge("0")
def tearDown(self):
super(AclCARTests, self).tearDown()
#restore original values
- self.set_dsheuristics(self.dsheuristics)
+ self.ldb_admin.set_dsheuristics(self.dsheuristics)
self.ldb_admin.set_minPwdAge(self.minPwdAge)
self.delete_force(self.ldb_admin, self.get_user_dn(self.user_with_wp))
self.delete_force(self.ldb_admin, self.get_user_dn(self.user_with_pc))