diff options
| -rw-r--r-- | selftest/knownfail.d/dbcheck-deleted-objects | 2 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck-oldrelease.sh | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/selftest/knownfail.d/dbcheck-deleted-objects b/selftest/knownfail.d/dbcheck-deleted-objects new file mode 100644 index 00000000000..9b32ddbb50a --- /dev/null +++ b/selftest/knownfail.d/dbcheck-deleted-objects @@ -0,0 +1,2 @@ +^samba4.blackbox.dbcheck.alpha13.dbcheck_deleted_objects +^samba4.blackbox.dbcheck.alpha13.quick.dbcheck_deleted_objects diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index 9e9924654be..64c08c57981 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -297,6 +297,17 @@ dbcheck_objectclass() { fi } +# This should 'fail', because it returns the number of wrong records, which it must if we did not skip the deleted objects +dbcheck_deleted_objects() { + if [ x$RELEASE = x"alpha13" ]; then + basedn=$($ldbsearch -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb -s base -b "" defaultNamingContext| grep -i defaultNamingContext| cut -d\ -f 2) + + $PYTHON $BINDIR/samba-tool dbcheck -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb "cn=deleted objects,$basedn" --scope base $@ + else + return 1 + fi +} + # This should 'fail', because it returns the number of modified records dbcheck() { $PYTHON $BINDIR/samba-tool dbcheck --selftest-check-expired-tombstones --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ @@ -488,6 +499,7 @@ testit $RELEASE undump || failed=`expr $failed + 1` testit "reindex" reindex || failed=`expr $failed + 1` testit "current_version_mod" do_current_version_mod || failed=`expr $failed + 1` testit "check_expected_before_values" check_expected_before_values || failed=`expr $failed + 1` +testit_expect_failure "dbcheck_deleted_objects" dbcheck_deleted_objects || failed=`expr $failed + 1` testit_expect_failure "dbcheck_objectclass" dbcheck_objectclass || failed=`expr $failed + 1` testit_expect_failure "dbcheck" dbcheck || failed=`expr $failed + 1` testit "check_expected_after_values" check_expected_after_values || failed=`expr $failed + 1` |