sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

selftest: Split out dbcheck runs from dangling_multi_valued test

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2017-10-31 08:21:15 +13:00 committed by Stefan Metzmacher
parent 7be38c6054
commit b99d2ee122
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/knownfail
View File

@ -328,7 +328,7 @@
^samba3.smb2.credits.session_setup_credits_granted.* ^samba3.smb2.credits.session_setup_credits_granted.*
^samba3.smb2.credits.single_req_credits_granted.* ^samba3.smb2.credits.single_req_credits_granted.*
^samba3.smb2.credits.skipped_mid.* ^samba3.smb2.credits.skipped_mid.*
^samba4.blackbox.dbcheck-links.release-4-5-0-pre1.dangling_multi_valued_dbcheck ^samba4.blackbox.dbcheck-links.release-4-5-0-pre1.dbcheck_dangling_multi_valued_clean
^samba4.blackbox.dbcheck-links.release-4-5-0-pre1.dangling_multi_valued_check_missing ^samba4.blackbox.dbcheck-links.release-4-5-0-pre1.dangling_multi_valued_check_missing
# #
# rap password tests don't function in the ad_dc_ntvfs:local environment # rap password tests don't function in the ad_dc_ntvfs:local environment

10
testprogs/blackbox/dbcheck-links.sh
View File

@ -263,7 +263,7 @@ dangling_one_way_link() {
fi fi
} }
dangling_multi_valued() { add_dangling_multi_valued() {
# multi1 - All 4 backlinks # multi1 - All 4 backlinks
# multi2 - Missing all 4 backlinks # multi2 - Missing all 4 backlinks
# multi3 - Missing 2 backlinks # multi3 - Missing 2 backlinks
@ -292,6 +292,9 @@ dangling_multi_valued() {
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
return 1 return 1
fi fi
}
dbcheck_dangling_multi_valued() {
$PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --fix --yes $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --fix --yes
if [ "$?" != "1" ]; then if [ "$?" != "1" ]; then
@ -358,11 +361,12 @@ if [ -d $release_dir ]; then
testit "dangling_one_way_dn" dangling_one_way_dn testit "dangling_one_way_dn" dangling_one_way_dn
testit "deleted_one_way_dn" deleted_one_way_dn testit "deleted_one_way_dn" deleted_one_way_dn
testit "dbcheck_clean3" dbcheck_clean testit "dbcheck_clean3" dbcheck_clean
testit "dangling_multi_valued" dangling_multi_valued testit "add_dangling_multi_valued" add_dangling_multi_valued
testit "dbcheck_dangling_multi_valued" dbcheck_dangling_multi_valued
testit "dangling_multi_valued_check_missing" dangling_multi_valued_check_missing testit "dangling_multi_valued_check_missing" dangling_multi_valued_check_missing
testit "dangling_multi_valued_check_equal_or_too_many" dangling_multi_valued_check_equal_or_too_many testit "dangling_multi_valued_check_equal_or_too_many" dangling_multi_valued_check_equal_or_too_many
# Currently this cannot pass # Currently this cannot pass
testit "dangling_multi_valued_dbcheck" dbcheck_clean testit "dbcheck_dangling_multi_valued_clean" dbcheck_clean
else else
subunit_start_test $RELEASE subunit_start_test $RELEASE
subunit_skip_test $RELEASE <<EOF subunit_skip_test $RELEASE <<EOF