1.1 --- a/tests/test_resource_invitation.sh Wed May 20 18:39:06 2015 +0200
1.2 +++ b/tests/test_resource_invitation.sh Wed May 20 18:42:49 2015 +0200
1.3 @@ -2,9 +2,9 @@
1.4
1.5 THIS_DIR=`dirname $0`
1.6
1.7 -TEMPLATES=$THIS_DIR/templates
1.8 -RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
1.9 -SHOWMAIL=$THIS_DIR/../tools/showmail.py
1.10 +TEMPLATES="$THIS_DIR/templates"
1.11 +RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py"
1.12 +SHOWMAIL="$THIS_DIR/../tools/showmail.py"
1.13 STORE=/tmp/store
1.14 STATIC=/tmp/static
1.15 ARGS="-S $STORE -P $STATIC -d"
1.16 @@ -12,8 +12,8 @@
1.17 rm -r $STORE
1.18 rm -r $STATIC
1.19
1.20 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
1.21 -| $SHOWMAIL \
1.22 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
1.23 +| "$SHOWMAIL" \
1.24 > out0.tmp
1.25
1.26 grep -q 'METHOD:REPLY' out0.tmp \
1.27 @@ -21,8 +21,8 @@
1.28 && echo "Success" \
1.29 || echo "Failed"
1.30
1.31 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
1.32 -| $SHOWMAIL \
1.33 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
1.34 +| "$SHOWMAIL" \
1.35 > out1.tmp
1.36
1.37 grep -q 'METHOD:REPLY' out1.tmp \
1.38 @@ -30,8 +30,8 @@
1.39 && echo "Success" \
1.40 || echo "Failed"
1.41
1.42 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request.txt 2> /dev/null \
1.43 -| $SHOWMAIL \
1.44 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null \
1.45 +| "$SHOWMAIL" \
1.46 > out2.tmp
1.47
1.48 grep -q 'METHOD:REPLY' out2.tmp \
1.49 @@ -39,8 +39,8 @@
1.50 && echo "Success" \
1.51 || echo "Failed"
1.52
1.53 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
1.54 -| $SHOWMAIL \
1.55 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
1.56 +| "$SHOWMAIL" \
1.57 > out3.tmp
1.58
1.59 grep -q 'METHOD:REPLY' out3.tmp \
1.60 @@ -48,8 +48,8 @@
1.61 && echo "Success" \
1.62 || echo "Failed"
1.63
1.64 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-conflict.txt 2> /dev/null \
1.65 -| $SHOWMAIL \
1.66 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2> /dev/null \
1.67 +| "$SHOWMAIL" \
1.68 > out4.tmp
1.69
1.70 grep -q 'METHOD:REPLY' out4.tmp \
1.71 @@ -57,8 +57,8 @@
1.72 && echo "Success" \
1.73 || echo "Failed"
1.74
1.75 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
1.76 -| $SHOWMAIL \
1.77 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
1.78 +| "$SHOWMAIL" \
1.79 > out5.tmp
1.80
1.81 grep -q 'METHOD:REPLY' out5.tmp \
1.82 @@ -67,11 +67,11 @@
1.83 && echo "Success" \
1.84 || echo "Failed"
1.85
1.86 -$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null
1.87 +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null
1.88 echo "Cancel..."
1.89
1.90 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
1.91 -| $SHOWMAIL \
1.92 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
1.93 +| "$SHOWMAIL" \
1.94 > out6.tmp
1.95
1.96 grep -q 'METHOD:REPLY' out6.tmp \
1.97 @@ -79,11 +79,11 @@
1.98 && echo "Success" \
1.99 || echo "Failed"
1.100
1.101 -$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-spoofed.txt 2> /dev/null
1.102 +"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2> /dev/null
1.103 echo "Spoof..."
1.104
1.105 - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
1.106 -| $SHOWMAIL \
1.107 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
1.108 +| "$SHOWMAIL" \
1.109 > out7.tmp
1.110
1.111 grep -q 'METHOD:REPLY' out7.tmp \