[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1030-g41e4f12

[Andrew Bartlett]

The branch, master has been updated
       via  41e4f12c482082d6e622d1fdc830e38853cdbd8b (commit)
       via  82ad66e9dfd30f7ffe912f6c9198908c40802ac4 (commit)
      from  fc056e561b95fb7869053bdec810e8c47e6c6dc2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 41e4f12c482082d6e622d1fdc830e38853cdbd8b
Merge: 82ad66e9dfd30f7ffe912f6c9198908c40802ac4 fc056e561b95fb7869053bdec810e8c47e6c6dc2
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 14 10:55:53 2009 +1000

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel

commit 82ad66e9dfd30f7ffe912f6c9198908c40802ac4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Apr 14 10:52:33 2009 +1000

    s4:ldb Make it possible to re-run ldap.py again
    
    The parentGUID test didn't clean up after itself correctly.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/tests/python/ldap.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 7d2c7d0..caa1c47 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -78,7 +78,10 @@ class BasicTests(unittest.TestCase):
         self.delete_force(self.ldb, "cn=ldaptestgroup2,cn=users," + self.base_dn)
         self.delete_force(self.ldb, "cn=ldaptestutf8user èùéìòà ,cn=users," + self.base_dn)
         self.delete_force(self.ldb, "cn=ldaptestutf8user2  èùéìòà ,cn=users," + self.base_dn)
-  
+        self.delete_force(self.ldb, "cn=parentguidtest,cn=users," + self.base_dn)
+        self.delete_force(self.ldb, "cn=parentguidtest,cn=testotherusers," + self.base_dn)
+        self.delete_force(self.ldb, "cn=testotherusers," + self.base_dn)
+      
     def test_group_add_invalid_member(self):
         """Testing group add with invalid member"""
         try:
@@ -118,7 +121,8 @@ class BasicTests(unittest.TestCase):
                           scope=SCOPE_BASE,
                           attrs=["parentGUID"]);
         self.assertEquals(res1[0]["objectGUID"], res2[0]["parentGUID"]);
-        
+        ldb.delete("cn=parentguidtest,cn=testotherusers," + self.base_dn)
+        ldb.delete("cn=testotherusers," + self.base_dn)
 
     def test_all(self):
         """Basic tests"""


-- 
Samba Shared Repository