selftest: fix cleanup of test_printing_var_exp.sh

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14668

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Mar 16 22:08:10 UTC 2021 on sn-devel-184

diff --git a/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh b/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
index 4a56a15eb94f4debfaa730d8e1ff3b756524c2f8..0d99b8ac01edc05363fd22d8a04a1267c332af0c 100755 (executable)
--- a/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
+++ b/source3/script/tests/printing/printing_var_exp_lpr_cmd.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
-rm -f /tmp/printing_var_exp.log
+logfile=/tmp/$USER_printing_var_exp.log
+
+rm -f "$logfile"
 
 for i in $(seq 1 $#) ; do
-    eval echo "arg $i: \$$i" >> /tmp/printing_var_exp.log
+    eval echo "arg $i: \$$i" >> "$logfile"
 done

diff --git a/source3/script/tests/test_printing_var_exp.sh b/source3/script/tests/test_printing_var_exp.sh
index 6cfd6c00f29dac0cc86846f84822449f81eba1c5..21fe5b4913ff16df22633f67360b450520c03dfa 100755 (executable)
--- a/source3/script/tests/test_printing_var_exp.sh
+++ b/source3/script/tests/test_printing_var_exp.sh
@@ -22,15 +22,35 @@ incdir=`dirname $0`/../../../testprogs/blackbox
 smbclient="$BINDIR/smbclient"
 
 test_var_expansion() {
+       logfile=/tmp/$USER_printing_var_exp.log
+
        $smbclient -U $DOMAIN/$USERNAME%$PASSWORD \
                   //$SERVER_IP/print_var_exp \
-                  -c "print $SRCDIR/testdata/printing/example.ps" || return 1
-
-       cat /tmp/printing_var_exp.log
-
-       grep "Windows user: $USERNAME" /tmp/printing_var_exp.log || return 1
-       grep "UNIX user: $USERNAME" /tmp/printing_var_exp.log || return 1
-       grep "Domain: $DOMAIN" /tmp/printing_var_exp.log || return 1
+                  -c "print $SRCDIR/testdata/printing/example.ps"
+       if [ $? -ne 0 ] ; then
+           rm -f "$logfile"
+           return 1
+       fi
+       cat "$logfile"
+
+       grep "Windows user: $USERNAME" "$logfile"
+       if [ $? -ne 0 ] ; then
+           rm -f "$logfile"
+           return 1
+       fi
+       grep "UNIX user: $USERNAME" "$logfile"
+       if [ $? -ne 0 ] ; then
+           rm -f "$logfile"
+           return 1
+       fi
+       grep "Domain: $DOMAIN" "$logfile"
+       if [ $? -ne 0 ] ; then
+           rm -f "$logfile"
+           return 1
+       fi
+
+       rm -f "$logfile"
+       return 0
 }
 
 testit "Test variable expansion for '%U', '%u' and '%D'" \