From: Michael Fritch <mfritch@suse.com>
Date: Thu, 5 Dec 2019 14:53:29 +0000 (-0700)
Subject: ceph-daemon: trap on EXIT
X-Git-Tag: v15.1.0~587^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9e0353044132f3fac306c72b6b6a696cb1ad7a72;p=ceph.git

ceph-daemon: trap on EXIT

tempfiles were not being removed after a standalone test failure

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index cf5760c8a6bb..1aa0f36a3ec6 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -39,7 +39,7 @@ fi
 PYTHONS="python3 python2"  # which pythons we test
 if [ -z "$PYTHON_KLUDGE" ]; then
    TMPBINDIR=`mktemp -d $TMPDIR`
-   trap "rm -rf $TMPBINDIR" TERM HUP INT
+   trap "rm -rf $TMPBINDIR" EXIT
    ORIG_CEPH_DAEMON="$CEPH_DAEMON"
    CEPH_DAEMON="$TMPBINDIR/ceph-daemon"
    for p in $PYTHONS; do
@@ -67,7 +67,7 @@ if ! [ "$loopdev" = "" ]; then
 fi
 
 TMPDIR=`mktemp -d -p .`
-trap "rm -rf $TMPDIR" TERM HUP INT
+trap "rm -rf $TMPDIR" EXIT
 
 function expect_false()
 {