Fixed last problems with Python 3

[mimedecode.git] / test / test_all

diff --git a/test/test_all b/test/test_all
index 7eb656e6ef108f268193283a39d102402d95c4cf..d5b06e1923b9bc4b1148af56d94d3005bcd086c8 100755 (executable)
--- a/test/test_all
+++ b/test/test_all
@@ -8,14 +8,22 @@ rm -rf save tmp &&
 mkdir tmp || exit 1
 
 RC=0
+if [ `$PYTHON -c "import sys; print(sys.version[0])"` -eq 2 ]; then
+   PY3=NO
+else
+   PY3=YES
+fi
 
 test1() {
    infile="$1"
    shift
    expfile="$1"
+   if [ $PY3 = YES -a -f expected/"$expfile"-py3 ]; then
+      expfile="$expfile"-py3
+   fi
    shift
 
-   ../mimedecode.py -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
+   $PYTHON ../mimedecode.py -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
    if cmp -s expected/"$expfile" tmp/"$expfile"; then
       rm tmp/"$expfile" && return 0 || return 1
    else
@@ -97,9 +105,17 @@ test_save msg_07.txt msg_07.txt 1-dingusfish.gif msg_07-2.txt --save-body image/
 test_save msg_07.txt msg_07.txt 1-dingusfish.gif msg_07-3.txt --save-message image/gif
 test_save msg_07-1.txt msg_07-1.txt 1-dingusfish.gif msg_07-4.txt --save-message image/gif
 
+test_save msg_07.txt msg_07.txt 1.dig msg_07-5.txt --save-headers multipart/mixed
+test_save msg_07.txt msg_07.txt 1.dig msg_07-6.txt --save-body multipart/mixed
+test_save msg_07.txt msg_07.txt 1.dig msg_07-7.txt --save-message multipart/mixed
+
+echo
+
 if [ "$RC" -eq 0 ]; then
    echo "All tests passed!"
    rmdir save tmp
+else
+   echo "ERRORS!"
 fi
 
 exit $RC