s4-tests: Adapted acl.py to use set_minPwdAge from SamDB.
authorNadezhda Ivanova <nivanova@samba.org>
Mon, 22 Nov 2010 16:50:35 +0000 (18:50 +0200)
committerNadezhda Ivanova <nivanova@samba.org>
Mon, 22 Nov 2010 16:52:04 +0000 (18:52 +0200)
source4/dsdb/tests/python/acl.py

index 14800053c98e51b1da91e499d708246387d49e10..8a1c6a43a480158c5456d068dea750f569b200af 100755 (executable)
@@ -232,12 +232,6 @@ url: www.example.com
             m["dSHeuristics"] = MessageElement([], FLAG_MOD_DELETE, "dsHeuristics")
         self.ldb_admin.modify(m)
 
-    def set_minPwdAge(self, value):
-        m = Message()
-        m.dn = Dn(self.ldb_admin, self.base_dn)
-        m["minPwdAge"] = MessageElement(value, FLAG_MOD_REPLACE, "minPwdAge")
-        self.ldb_admin.modify(m)
-
 #tests on ldap add operations
 class AclAddTests(AclTests):
 
@@ -1341,19 +1335,18 @@ class AclCARTests(AclTests):
         else:
             self.dsheuristics = None
 
-        res = self.ldb_admin.search(self.base_dn, scope=SCOPE_BASE, attrs=["minPwdAge"])
-        self.minPwdAge = res[0]["minPwdAge"][0]
+        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.set_minPwdAge("0")
+        self.ldb_admin.set_minPwdAge("0")
 
     def tearDown(self):
         super(AclCARTests, self).tearDown()
         #restore original values
         self.set_dsheuristics(self.dsheuristics)
-        self.set_minPwdAge(self.minPwdAge)
+        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))