From 9e0353044132f3fac306c72b6b6a696cb1ad7a72 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 5 Dec 2019 07:53:29 -0700 Subject: [PATCH] ceph-daemon: trap on EXIT tempfiles were not being removed after a standalone test failure Signed-off-by: Michael Fritch --- qa/standalone/test_ceph_daemon.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index cf5760c8a6b..1aa0f36a3ec 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() { -- 2.39.5