diff options
| -rw-r--r-- | selftest/knownfail | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck-links.sh | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/selftest/knownfail b/selftest/knownfail index 3c910fb3d6f..a28329cd449 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -328,7 +328,7 @@ ^samba3.smb2.credits.session_setup_credits_granted.* ^samba3.smb2.credits.single_req_credits_granted.* ^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 # # rap password tests don't function in the ad_dc_ntvfs:local environment diff --git a/testprogs/blackbox/dbcheck-links.sh b/testprogs/blackbox/dbcheck-links.sh index 655e1aa2de0..208ec00dfc0 100755 --- a/testprogs/blackbox/dbcheck-links.sh +++ b/testprogs/blackbox/dbcheck-links.sh @@ -263,7 +263,7 @@ dangling_one_way_link() { fi } -dangling_multi_valued() { +add_dangling_multi_valued() { # multi1 - All 4 backlinks # multi2 - Missing all 4 backlinks # multi3 - Missing 2 backlinks @@ -292,6 +292,9 @@ dangling_multi_valued() { if [ "$?" != "0" ]; then return 1 fi +} + +dbcheck_dangling_multi_valued() { $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --fix --yes if [ "$?" != "1" ]; then @@ -358,11 +361,12 @@ if [ -d $release_dir ]; then testit "dangling_one_way_dn" dangling_one_way_dn testit "deleted_one_way_dn" deleted_one_way_dn 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_equal_or_too_many" dangling_multi_valued_check_equal_or_too_many # Currently this cannot pass - testit "dangling_multi_valued_dbcheck" dbcheck_clean + testit "dbcheck_dangling_multi_valued_clean" dbcheck_clean else subunit_start_test $RELEASE subunit_skip_test $RELEASE <<EOF |