diff options
| author | Kamen Mazdrashki <kamenim@samba.org> | 2014-10-26 04:29:16 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-02-03 05:02:10 +0100 |
| commit | 1afd50fed016841bd4ffedba3674447d08184fa6 (patch) | |
| tree | a05dbc511a8c74c8c91085da8a6d847b1d79d0c6 /source4/dsdb | |
| parent | bb1337170c1059a8dce02d9c3d8f3bad647890dd (diff) | |
| download | samba-1afd50fed016841bd4ffedba3674447d08184fa6.tar.gz | |
s4-dsdb-tests: Make unique object names to test with in deletetest
This way we can re-run the test again and again
Change-Id: I29bd878b77073d94a279c38bd0afc2f0befa6f9d
Signed-off-by: Kamen Mazdrashki <kamenim@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4/dsdb')
| -rwxr-xr-x | source4/dsdb/tests/python/deletetest.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py index c4b38223a34..1d0848bea96 100755 --- a/source4/dsdb/tests/python/deletetest.py +++ b/source4/dsdb/tests/python/deletetest.py @@ -252,13 +252,21 @@ class BasicDeleteTests(BaseDeleteTests): print self.base_dn - usr1="cn=testuser,cn=users," + self.base_dn - usr2="cn=testuser2,cn=users," + self.base_dn - grp1="cn=testdelgroup1,cn=users," + self.base_dn - sit1="cn=testsite1,cn=sites," + self.configuration_dn - ss1="cn=NTDS Site Settings,cn=testsite1,cn=sites," + self.configuration_dn - srv1="cn=Servers,cn=testsite1,cn=sites," + self.configuration_dn - srv2="cn=TESTSRV,cn=Servers,cn=testsite1,cn=sites," + self.configuration_dn + # user current time in ms to make unique objects + import time + marker = str(int(round(time.time()*1000))) + usr1_name = "u_" + marker + usr2_name = "u2_" + marker + grp_name = "g1_" + marker + site_name = "s1_" + marker + + usr1 = "cn=%s,cn=users,%s" % (usr1_name, self.base_dn) + usr2 = "cn=%s,cn=users,%s" % (usr2_name, self.base_dn) + grp1 = "cn=%s,cn=users,%s" % (grp_name, self.base_dn) + sit1 = "cn=%s,cn=sites,%s" % (site_name, self.configuration_dn) + ss1 = "cn=NTDS Site Settings,cn=%s,cn=sites,%s" % (site_name, self.configuration_dn) + srv1 = "cn=Servers,cn=%s,cn=sites,%s" % (site_name, self.configuration_dn) + srv2 = "cn=TESTSRV,cn=Servers,cn=%s,cn=sites,%s" % (site_name, self.configuration_dn) delete_force(self.ldb, usr1) delete_force(self.ldb, usr2) @@ -272,19 +280,19 @@ class BasicDeleteTests(BaseDeleteTests): "dn": usr1, "objectclass": "user", "description": "test user description", - "samaccountname": "testuser"}) + "samaccountname": usr1_name}) self.ldb.add({ "dn": usr2, "objectclass": "user", "description": "test user 2 description", - "samaccountname": "testuser2"}) + "samaccountname": usr2_name}) self.ldb.add({ "dn": grp1, "objectclass": "group", "description": "test group", - "samaccountname": "testdelgroup1", + "samaccountname": grp_name, "member": [ usr1, usr2 ], "isDeleted": "FALSE" }) |