diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2017-10-31 08:21:15 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2017-11-24 15:50:16 +0100 |
| commit | b99d2ee122991d0bf1742fa5665656bbbba44057 (patch) | |
| tree | 2e898009e5fabcac6cebb2a1f5b174df76028155 /testprogs | |
| parent | 7be38c605468786894a373e15068b8017323da78 (diff) | |
| download | samba-b99d2ee122991d0bf1742fa5665656bbbba44057.tar.gz | |
selftest: Split out dbcheck runs from dangling_multi_valued test
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/dbcheck-links.sh | 10 |
1 files changed, 7 insertions, 3 deletions
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 |