From 252b62c54ed5a4aabbdccf315f1a0ae3d958d11c Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Sun, 31 May 2015 02:10:34 +0300 Subject: [PATCH] dsdb: Disable tombstone_reanimation module until we isolate what causes flaky tests Change-Id: I323a2cd5eb2449a44a9cb53abab5a127d21c5967 Signed-off-by: Kamen Mazdrashki Reviewed-by: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 1 - source4/dsdb/samdb/ldb_modules/tombstone_reanimate.c | 8 ++++++++ source4/selftest/tests.py | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source4/dsdb/samdb/ldb_modules/samba_dsdb.c b/source4/dsdb/samdb/ldb_modules/samba_dsdb.c index 75553ad42e0..26c583ef58a 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 add6c572ec8..0c6c500c7e9 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 7c9a61c70cf..6a30164e932 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") -- 2.11.4.GIT