From 9f0776e6aefe657671fdee5fcb5301053168e285 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Thu, 15 Dec 2016 16:23:17 -0800 Subject: [PATCH] tests: ensure unique temporary config file names Some unit tests share the same ocserv config file. Ensure that the file written and used by each test script has a unique name. Resolves #83 Signed-off-by: Mike Miller --- tests/common.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index c508d615..7b3ec6dd 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -48,12 +48,12 @@ update_config() { file=$1 username=$(whoami) group=$(groups|cut -f 1 -d ' ') - cp "${srcdir}/data/${file}" "$file.tmp" - sed -i 's|@USERNAME@|'${username}'|g' "$file.tmp" - sed -i 's|@GROUP@|'${group}'|g' "$file.tmp" - sed -i 's|@SRCDIR@|'${srcdir}'|g' "$file.tmp" - sed -i 's|@CRLNAME@|'${CRLNAME}'|g' "$file.tmp" - CONFIG="$file.tmp" + cp "${srcdir}/data/${file}" "$file.$$.tmp" + sed -i 's|@USERNAME@|'${username}'|g' "$file.$$.tmp" + sed -i 's|@GROUP@|'${group}'|g' "$file.$$.tmp" + sed -i 's|@SRCDIR@|'${srcdir}'|g' "$file.$$.tmp" + sed -i 's|@CRLNAME@|'${CRLNAME}'|g' "$file.$$.tmp" + CONFIG="$file.$$.tmp" } fail() {