aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-04-24 15:44:01 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-04-24 15:44:01 +0000
commit23c190d057f68de84cb17bf8555397642fc6f6a9 (patch)
tree48272c668c3c1986fefd49ab657396b8a2976247 /tests
parent2e708415a056624b4845467c9eebbbab7c1ef0f2 (diff)
downloadmailfromd-23c190d057f68de84cb17bf8555397642fc6f6a9.tar.gz
mailfromd-23c190d057f68de84cb17bf8555397642fc6f6a9.tar.bz2
* src/lex.l (parse_require): Bugfix
* src/bi_mail.m4: Bugfix * src/mtasim.c: Implement help, fix directory removal at exit, implement readline history file. Bugfixes in smtp() * tests/testsuite.at, tests/accept.at, tests/greylist.at, tests/arg.at, tests/reject.at, tests/numrcpt.at, tests/tempfail.at: Use mtasim -Xauto when necessary * configure.ac, NEWS: Raise patchlevel to 92 * doc/mailfromd.texi: Update * doc/mtasim.texi: mtasim documentation * doc/Makefile.am: Add mtasim.texi * gacopyz/gacopyz_priv.h (struct gacopyz_conn): Keep information about children pids * gacopyz/proc.c (gacopyz_register_child) (gacopyz_unregister_child): New functions (cleanup_children): Call gacopyz_unregister_child (gacopyz_cleanup_conn): Terminate children individualy instead of sending TERM to the whole process group, because we might be not the group leader. * gacopyz/gacopyz.c (gacopyz_handle_connection): Register child pid after startup. * bootstrap: Require save-cwd. Test if lib/daemon.c exists before attempting to create it. git-svn-id: file:///svnroot/mailfromd/trunk@1379 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'tests')
-rw-r--r--tests/accept.at7
-rw-r--r--tests/arg.at7
-rw-r--r--tests/greylist.at6
-rw-r--r--tests/numrcpt.at7
-rw-r--r--tests/reject.at7
-rw-r--r--tests/tempfail.at8
-rw-r--r--tests/testsuite.at7
7 files changed, 18 insertions, 31 deletions
diff --git a/tests/accept.at b/tests/accept.at
index 0f0c3817..50ef4ff9 100644
--- a/tests/accept.at
+++ b/tests/accept.at
@@ -19,9 +19,8 @@
AT_SETUP([Accept action])
AT_KEYWORDS([actions accept])
-mailfromd_start accept.rc
-
-AT_MTA_TEST([
+AT_MTA_TEST([accept.rc],
+[
\E250
HELO localhost
\E250
@@ -30,8 +29,6 @@ MAIL FROM: <gray@localhost>
QUIT
])
-mailfromd_stop
-
AT_CLEANUP
diff --git a/tests/arg.at b/tests/arg.at
index f2492929..af1696b2 100644
--- a/tests/arg.at
+++ b/tests/arg.at
@@ -19,9 +19,8 @@
AT_SETUP([Function arguments])
AT_KEYWORDS([arg])
-mailfromd_start arg.rc
-
-AT_MTA_TEST([
+AT_MTA_TEST([arg.rc],
+[
\E250
HELO localhost
\E550
@@ -30,8 +29,6 @@ MAIL FROM: gray@localhost
QUIT
])
-mailfromd_stop
-
AT_CLEANUP
diff --git a/tests/greylist.at b/tests/greylist.at
index f7d7001b..4c8ffdc0 100644
--- a/tests/greylist.at
+++ b/tests/greylist.at
@@ -23,7 +23,7 @@ cleardb
mailfromd_start greylist.rc
-AT_MTA_TEST([
+AT_MTA_TEST_X([
\E250
HELO localhost
\E450
@@ -34,7 +34,7 @@ QUIT
sleep 2
-AT_MTA_TEST([
+AT_MTA_TEST_X([
\E250
HELO localhost
\E450
@@ -45,7 +45,7 @@ QUIT
sleep 15
-AT_MTA_TEST([
+AT_MTA_TEST_X([
\E250
HELO localhost
\E250
diff --git a/tests/numrcpt.at b/tests/numrcpt.at
index ee339bca..fa9a7f35 100644
--- a/tests/numrcpt.at
+++ b/tests/numrcpt.at
@@ -19,9 +19,8 @@
AT_SETUP([rcpt_count])
AT_KEYWORDS([rcpt_count numrcpt])
-mailfromd_start numrcpt.rc
-
-AT_MTA_TEST([
+AT_MTA_TEST([numrcpt.rc],
+[
\E250
HELO localhost
\E250
@@ -36,8 +35,6 @@ RCPT TO: <devnull@localhost>
QUIT
])
-mailfromd_stop
-
AT_CLEANUP
diff --git a/tests/reject.at b/tests/reject.at
index 828bfa37..b5701d9e 100644
--- a/tests/reject.at
+++ b/tests/reject.at
@@ -19,9 +19,8 @@
AT_SETUP([Reject action])
AT_KEYWORDS([actions reject])
-mailfromd_start reject.rc
-
-AT_MTA_TEST([
+AT_MTA_TEST([reject.rc],
+[
\E250
HELO localhost
\E550 5.7.1 (.* )?Message rejected
@@ -30,8 +29,6 @@ MAIL FROM: <gray@localhost>
QUIT
])
-mailfromd_stop
-
AT_CLEANUP
diff --git a/tests/tempfail.at b/tests/tempfail.at
index 26d124ab..44758789 100644
--- a/tests/tempfail.at
+++ b/tests/tempfail.at
@@ -19,9 +19,7 @@
AT_SETUP([Tempfail action])
AT_KEYWORDS([actions tempfail])
-mailfromd_start tempfail.rc
-
-AT_MTA_TEST([
+AT_MTA_TEST([tempfail.rc],[
\E250
HELO localhost
\E450 4.1.1 .*Try again later
@@ -30,9 +28,5 @@ MAIL FROM: <gray@localhost>
QUIT
])
-mailfromd_stop
-
AT_CLEANUP
-
-
diff --git a/tests/testsuite.at b/tests/testsuite.at
index a64a2825..303aac52 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -24,11 +24,16 @@ m4_define([AT_SKIP_TEST],[exit 77])
m4_define([AT_REQUIRE_DNS],
[host puszcza.gnu.org.ua || AT_SKIP_TEST])
-m4_define([AT_MTA_TEST],[
+m4_define([AT_MTA_TEST_X],[
AT_DATA([script],$1)
AT_CHECK([mtasim $MTAOPTS < script > /dev/null],
$2,$3,$4,[mailfromd_stop])])
+m4_define([AT_MTA_TEST],[
+ AT_DATA([script],$2)
+ AT_CHECK([mtasim --stdio -Xauto --statedir -- [$ETCDIR]/$1 < script > /dev/null],
+ $3,$4,$5)])
+
AT_INIT
AT_TESTED([mailfromd])

Return to:

Send suggestions and report system problems to the System administrator.