summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-06 20:55:43 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-06 16:54:09 +0200
commit4654dcaae77264b50600bfcd592f0d1658af5c32 (patch)
tree9260c1c4b9055760c932b87f2b7567edd4dc062c
parentf9d90922f577dfedfca967e2b7112e0714ea414d (diff)
downloadsamba-4654dcaae77264b50600bfcd592f0d1658af5c32.tar.gz
samba-4654dcaae77264b50600bfcd592f0d1658af5c32.tar.bz2
samba-4654dcaae77264b50600bfcd592f0d1658af5c32.zip
s4-selftest: do a dbcheck on our two vampire DCs
However, due to using --domain-critical-only we have to knownfail the vampire DC here, as we do not fill in the backlinks on non-critical objects correctly. Andrew Bartlett Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Fri Jul 6 16:54:10 CEST 2012 on sn-devel-104
-rw-r--r--selftest/knownfail1
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index f68db5ab4d..e5bff1b17e 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -152,6 +152,7 @@
^samba4.ldap.acl.*.AclSearchTests.test_search6\(.*\)$ # ACL search behaviour not enabled by default
^samba4.rpc.lsa.forest.trust #Not fully provided by Samba4
^samba4.blackbox.kinit\(.*\).kinit with user password for expired password\(.*\) # We need to work out why this fails only during the pw change
+^samba4.blackbox.dbcheck\(vampire_dc\).dbcheck\(vampire_dc:local\) # Due to replicating with --domain-critical-only we fail dbcheck on this database
^samba3.smb2.create.gentest
^samba3.smb2.create.blob
^samba3.smb2.create.open
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index e6c7824bc7..25b22b7af5 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -527,5 +527,5 @@ plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.p
for env in ['vampire_dc', 'promoted_vampire_dc']:
plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient])
# check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST
-for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
+for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc", 'vampire_dc', 'promoted_vampire_dc']:
plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration])