[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  e0fa422 selftest: Add knownfail entry required to disable tombstone_reanimation
       via  252b62c dsdb: Disable tombstone_reanimation module until we isolate what causes flaky tests
      from  01ed85c docs: Bump version up to 4.3.

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


- Log -----------------------------------------------------------------
commit e0fa42201b5ff1b2d67f1c3cdb0d3dbcce9b6e40
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jul 20 13:23:30 2015 +1200

    selftest: Add knownfail entry required to disable tombstone_reanimation
    
    Pair-programmed-with: Garming Sam <garming at catalyst.net.nz>
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Jul 20 09:21:33 CEST 2015 on sn-devel-104

commit 252b62c54ed5a4aabbdccf315f1a0ae3d958d11c
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun May 31 02:10:34 2015 +0300

    dsdb: Disable tombstone_reanimation module until we isolate what causes flaky tests
    
    Change-Id: I323a2cd5eb2449a44a9cb53abab5a127d21c5967
    Signed-off-by: Kamen Mazdrashki <kamenim at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 selftest/knownfail                                   | 4 ++++
 source4/dsdb/samdb/ldb_modules/samba_dsdb.c          | 1 -
 source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c | 8 ++++++++
 source4/selftest/tests.py                            | 5 -----
 4 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index 71c3601..901ed39 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -286,3 +286,7 @@
 # This will fail against the classic DC, because it requires kerberos
 #
 ^samba4.winbind.pac.*\(nt4_member:local\) # No KDC on a classic DC
+#
+# This fails because it requires the tombstone_reanimation module to be enabled
+#
+^samba4.ldap.acl.python\(.*\).__main__.AclUndeleteTests.test_undelete\(.*\)
diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
index 75553ad..26c583e 100644
--- a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
+++ b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c
@@ -273,7 +273,6 @@ static int samba_dsdb_init(struct ldb_module *module)
 					     NULL };
 	/* extended_dn_in or extended_dn_in_openldap goes here */
 	static const char *modules_list1a[] = {"objectclass",
-					     "tombstone_reanimate",
 					     "descriptor",
 					     "acl",
 					     "aclread",
diff --git a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
index add6c57..0c6c500 100644
--- a/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
+++ b/source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c
@@ -426,5 +426,13 @@ static const struct ldb_module_ops ldb_reanimate_module_ops = {
 int ldb_tombstone_reanimate_module_init(const char *version)
 {
 	LDB_MODULE_CHECK_VERSION(version);
+	/*
+	 * Skip module registration for now.
+	 * In order to enable the module again, it should be
+	 * included in samba_dsdb.c between "objectclass" and
+	 * "descriptor" modules.
 	return ldb_register_module(&ldb_reanimate_module_ops);
+	*/
+	DEBUG(5,("Module 'tombstone_reanimate' is disabled. Skip registration."));
+	return LDB_SUCCESS;
 }
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 7c9a61c..6a30164 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -502,11 +502,6 @@ for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
         # therefore skip it in that configuration
         plantestsuite_loadlist("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", '$LOADLIST', '$LISTOPT'])
         plantestsuite_loadlist("samba4.ldap.password_lockout.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/password_lockout.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", "--realm=$REALM", '$LOADLIST', '$LISTOPT'])
-    planoldpythontestsuite(env, "tombstone_reanimation",
-                           name="samba4.tombstone_reanimation.python",
-                           environ={'TEST_SERVER': '$SERVER', 'TEST_USERNAME': '$USERNAME', 'TEST_PASSWORD': '$PASSWORD'},
-                           extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')]
-                           )
 
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.upgradeprovisionneeddc")
 planpythontestsuite("ad_dc:local", "samba.tests.posixacl")


-- 
Samba Shared Repository