[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  2a8b507 selftest: Add cleanup of ForeignSecurityPrincipal in samba.dsdb test
       via  d2b14b7 selftest: Fix flapping samba.dsdb test
      from  dfc4670 pthreadpool: Fix deadlock

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


- Log -----------------------------------------------------------------
commit 2a8b5070845f87c597f44c5bb81f7a5a6a383a13
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Dec 13 14:47:59 2017 +1300

    selftest: Add cleanup of ForeignSecurityPrincipal in samba.dsdb test
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Dec 13 08:47:05 CET 2017 on sn-devel-144

commit d2b14b7578897b23570f269aeb84a81901e1d606
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Dec 13 14:46:00 2017 +1300

    selftest: Fix flapping samba.dsdb test
    
    The check for the final digit in the SID was wrong, any domain SID
    ending with a zero would fail the test.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>

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

Summary of changes:
 python/samba/tests/dsdb.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 34a9435..94b21f2 100644
--- a/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
@@ -207,7 +207,7 @@ class DsdbTests(TestCase):
         # i.e a  SID not in the current domain.
         #
         dom_sid = self.samdb.get_domain_sid()
-        if str(dom_sid)[:-1] == "0":
+        if str(dom_sid).endswith("0"):
             c = "9"
         else:
             c = "0"
@@ -229,6 +229,9 @@ class DsdbTests(TestCase):
             self.fail("Got unexpected exception %d - %s "
                       % (code, msg))
 
+        # cleanup
+        self.samdb.delete(dn)
+
     #
     # Duplicate objectSID's should not be permitted for sids in the local
     # domain. The test sequence is add an object, delete it, then attempt to


-- 
Samba Shared Repository