]> git.ipfire.org Git - thirdparty/mlmmj.git/commitdiff
mlmmj-sub: fix test when default text are not installed
authorBaptiste Daroussin <bapt@FreeBSD.org>
Thu, 4 Nov 2021 13:47:57 +0000 (14:47 +0100)
committerBaptiste Daroussin <bapt@FreeBSD.org>
Thu, 4 Nov 2021 13:47:57 +0000 (14:47 +0100)
tests/mlmmj-sub.sh

index c1b89f1fc703cd058517f32717f28e9e16584a2f..6d513b4e36ea74a306ba304c7bc7200d296ae1e6 100644 (file)
@@ -33,10 +33,8 @@ add_normal_owner_body()
        echo test@mlmmjtest > ml/control/listaddress
        echo owner@mlmmjtest > ml/control/owner
        touch ml/control/notifysub
-       socat TCP-LISTEN:25678,bind=127.0.0.1,reuseport OPEN:output.log,creat,append &
-       atf_check -s exit:0 $mlmmjsub -L ml -a john@doe.org
+       atf_check -s exit:0 $mlmmjsub -L ml -q -a john@doe.org
        atf_check -o inline:"john@doe.org\n" cat ml/subscribers.d/j
-       atf_check -o inline:"MAIL FROM:<test+bounces-help@mlmmjtest>\r\nRSET\r\n" cat output.log
 }
 
 add_digest_body()
@@ -70,7 +68,7 @@ remove_normal_body()
        echo "rebecca@doe.org" >> ml/subscribers.d/j
        atf_check -s exit:0 $mlmmjsub -L ml -a john@doe.org
        atf_check -o inline:"bob@doe.org\nrebecca@doe.org\n" cat ml/subscribers.d/j
-       atf_check -s exit:0 $mlmmjsub -L ml -a jane@doe.org
+       atf_check -s exit:0 $mlmmjsub -L ml -a -q -s jane@doe.org
        atf_check -o inline:"bob@doe.org\nrebecca@doe.org\n" cat ml/subscribers.d/j
 }
 
@@ -86,10 +84,8 @@ remove_normal_owner_body()
        echo "bob@doe.org" >> ml/subscribers.d/j
        echo "rebecca@doe.org" >> ml/subscribers.d/j
        touch ml/control/notifysub
-       socat TCP-LISTEN:25678,bind=127.0.0.1,reuseport OPEN:output.log,creat,append &
-       atf_check -s exit:0 $mlmmjsub -L ml -a john@doe.org
+       atf_check -s exit:0 $mlmmjsub -L ml -q -a john@doe.org
        atf_check -o inline:"bob@doe.org\nrebecca@doe.org\n" cat ml/subscribers.d/j
-       atf_check -o inline:"MAIL FROM:<test+bounces-help@mlmmjtest>\r\nRSET\r\n" cat output.log
 }
 
 remove_digest_body()