summaryrefslogtreecommitdiff
path: root/testprogs
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2016-11-07 11:58:04 +1300
committerGarming Sam <garming@samba.org>2016-11-22 02:10:16 +0100
commit44d209c893d28030cb9928b974c8aa31348ac395 (patch)
treee6ee88cd1128b071677a1f91a7e0041a0fabd5d6 /testprogs
parent04eb95a46b069f0238dbd232528fd1fadb745066 (diff)
downloadsamba-44d209c893d28030cb9928b974c8aa31348ac395.tar.gz
selftest: Ensure we catch errors from samba-tool domain tombstones expunge
The previous code would overwrite $? before the return, so always returned 0 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12297
Diffstat (limited to 'testprogs')
-rwxr-xr-xtestprogs/blackbox/tombstones-expunge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/testprogs/blackbox/tombstones-expunge.sh b/testprogs/blackbox/tombstones-expunge.sh
index 33cb0b1be13..e7e861fa3d3 100755
--- a/testprogs/blackbox/tombstones-expunge.sh
+++ b/testprogs/blackbox/tombstones-expunge.sh
@@ -52,7 +52,7 @@ tombstones_expunge() {
$PYTHON $BINDIR/samba-tool domain tombstones expunge -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --current-time=2016-07-30 --tombstone-lifetime=4 > $tmpfile
if [ "$?" != "0" ]; then
- return $?
+ return 1
fi
diff $tmpfile $release_dir/expected-expunge-output.txt
if [ "$?" != "0" ]; then