ph10 2005/06/22 15:18:13 BST
Modified files:
exim-test-orig/AutoTest runtest
exim-test-orig/AutoTest/scripts 194 195 210 211 212 213 214
215 216 217 218 219 220 221
222 223 224 225 228 229 243
245 260 264 289 297 321 328
333 338 349 350 391 395 396
427 429 436 448 486 498 504
509 510 528 533 535 550 560
561 563 571 583 584 606 904
Log:
Tidy up some of the tests to remove unnecessary sleeps and get rid of
some unwanted messages.
Revision Changes Path
1.7 +19 -11 exim/exim-test-orig/AutoTest/runtest
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/194
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/195
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/210
1.3 +0 -3 exim/exim-test-orig/AutoTest/scripts/211
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/212
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/213
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/214
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/215
1.2 +1 -7 exim/exim-test-orig/AutoTest/scripts/216
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/217
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/218
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/219
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/220
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/221
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/222
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/223
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/224
1.3 +0 -6 exim/exim-test-orig/AutoTest/scripts/225
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/228
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/229
1.2 +0 -6 exim/exim-test-orig/AutoTest/scripts/243
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/245
1.3 +0 -3 exim/exim-test-orig/AutoTest/scripts/260
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/264
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/289
1.2 +1 -4 exim/exim-test-orig/AutoTest/scripts/297
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/321
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/328
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/333
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/338
1.5 +0 -9 exim/exim-test-orig/AutoTest/scripts/349
1.3 +0 -3 exim/exim-test-orig/AutoTest/scripts/350
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/391
1.2 +0 -6 exim/exim-test-orig/AutoTest/scripts/395
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/396
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/427
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/429
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/436
1.2 +0 -6 exim/exim-test-orig/AutoTest/scripts/448
1.2 +0 -6 exim/exim-test-orig/AutoTest/scripts/486
1.2 +1 -3 exim/exim-test-orig/AutoTest/scripts/498
1.2 +0 -24 exim/exim-test-orig/AutoTest/scripts/504
1.2 +0 -6 exim/exim-test-orig/AutoTest/scripts/509
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/510
1.2 +1 -3 exim/exim-test-orig/AutoTest/scripts/528
1.2 +1 -3 exim/exim-test-orig/AutoTest/scripts/533
1.2 +1 -6 exim/exim-test-orig/AutoTest/scripts/535
1.3 +0 -6 exim/exim-test-orig/AutoTest/scripts/550
1.3 +0 -3 exim/exim-test-orig/AutoTest/scripts/560
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/561
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/563
1.6 +5 -18 exim/exim-test-orig/AutoTest/scripts/571
1.2 +0 -3 exim/exim-test-orig/AutoTest/scripts/583
1.3 +0 -3 exim/exim-test-orig/AutoTest/scripts/584
1.2 +1 -3 exim/exim-test-orig/AutoTest/scripts/606
1.4 +0 -3 exim/exim-test-orig/AutoTest/scripts/904
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/runtest,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- runtest 6 Apr 2005 10:06:14 -0000 1.6
+++ runtest 22 Jun 2005 14:18:12 -0000 1.7
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.6 2005/04/06 10:06:14 ph10 Exp $
+# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.7 2005/06/22 14:18:12 ph10 Exp $
# A script to run some automatic testing of Exim. This has been needed for
# quite some time. I am finally thinking about it in February 1999.
@@ -1029,12 +1029,13 @@
}
# This should ultimately follow the starting of any Exim daemon with
- # the -bd option.
+ # the -bd option. We kill with SIGINT rather than SIGTERM to stop it
+ # outputting "Terminated" to the terminal when not in the background.
elsif (/^killdaemon/)
{
$pid = `cat $dir/spool/exim-daemon.*`;
- system("sudo /usr/bin/kill $pid");
+ system("sudo /bin/kill -SIGINT $pid");
close DAEMONCMD; # Waits for process
system("sudo /bin/rm -f spool/exim-daemon.*");
while (<S>) { last if /^\*{4}\s*$/; }
@@ -1140,8 +1141,12 @@
# We also send the stderr output to test-stderr-server. The daemon has
# its log files put in a different place too (by configuring with
# log_file_path). This requires the directory to be set up in advance.
+ #
+ # There are also times when we want to run a non-daemon version of Exim
+ # (e.g. a queue runner) with the server configuration. In this case,
+ # we also define -DNOTDAEMON.
- if ($cmd =~ /\s-DSERVER=server\s/)
+ if ($cmd =~ /\s-DSERVER=server\s/ && $cmd !~ /\s-DNOTDAEMON\s/)
{
if ($debug) { printf ">> daemon: $cmd\n"; }
system("sudo mkdir spool/log 2>/dev/null");
@@ -1149,7 +1154,7 @@
open DAEMONCMD, "|${cmd}-server" || die "Failed to run $cmd\n";
DAEMONCMD->autoflush(1);
while (<S>) { last if /^\*{4}\s*$/; } # Ignore any input
- sleep(1); # Let the daemon get going
+ system("./millisleep 300"); # Let the daemon get going
next;
}
}
@@ -1162,12 +1167,15 @@
die "** Abandoned\n";
}
- # Run the command, with stdin connected to a pipe, and write the
- # stdin data to it. Replace \bDIR\b with the current working directory.
- # If a line ends with \NONL\, chop off the terminating newline (and the
- # \NONL\).
-
- open CMD, "|$cmd" || die "Failed to run $cmd\n";
+ # Run the command, with stdin connected to a pipe, and write the stdin data
+ # to it. Replace \bDIR\b with the current working directory. If a line ends
+ # with \NONL\, chop off the terminating newline (and the \NONL\). If the
+ # command contains -DSERVER=server add "-server" to the command, where it
+ # will adjoin the name for the stderr file. See comment above about the
+ # use of -DSERVER.
+
+ $stderrsuffix = ($cmd =~ /\s-DSERVER=server\s/)? "-server" : "";
+ open CMD, "|${cmd}${stderrsuffix}" || die "Failed to run $cmd\n";
CMD->autoflush(1);
while (<S>)
Index: 194
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/194,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 194 8 Oct 2004 14:49:52 -0000 1.1
+++ 194 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Testing
****
Index: 195
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/195,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 195 8 Oct 2004 14:49:52 -0000 1.1
+++ 195 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Testing
****
Index: 210
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/210,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 210 8 Oct 2004 14:49:52 -0000 1.1
+++ 210 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 211
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/211,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 211 10 Nov 2004 15:21:17 -0000 1.2
+++ 211 22 Jun 2005 14:18:12 -0000 1.3
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225
??? 220
ehlo rhu.barb
Index: 212
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/212,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 212 8 Oct 2004 14:49:52 -0000 1.1
+++ 212 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 213
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/213,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 213 8 Oct 2004 14:49:52 -0000 1.1
+++ 213 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
mail from:<ph10@???>
Index: 214
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/214,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 214 8 Oct 2004 14:49:52 -0000 1.1
+++ 214 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 215
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/215,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 215 8 Oct 2004 14:49:52 -0000 1.1
+++ 215 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225
??? 220
ehlo foobar
Index: 216
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/216,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 216 8 Oct 2004 14:49:52 -0000 1.1
+++ 216 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message. Contains FF: ÿ
****
@@ -19,9 +16,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
-****
-0
-sleep 1
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 217
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/217,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 217 8 Oct 2004 14:49:52 -0000 1.1
+++ 217 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message
****
Index: 218
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/218,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 218 8 Oct 2004 14:49:52 -0000 1.1
+++ 218 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message
****
Index: 219
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/219,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 219 8 Oct 2004 14:49:52 -0000 1.1
+++ 219 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Testing
****
Index: 220
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/220,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 220 8 Oct 2004 14:49:52 -0000 1.1
+++ 220 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Testing
****
Index: 221
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/221,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 221 8 Oct 2004 14:49:52 -0000 1.1
+++ 221 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message 1
****
@@ -19,6 +16,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 222
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/222,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 222 8 Oct 2004 14:49:52 -0000 1.1
+++ 222 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message 1
****
@@ -19,6 +16,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 223
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/223,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 223 8 Oct 2004 14:49:52 -0000 1.1
+++ 223 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message
****
@@ -15,6 +12,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 224
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/224,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 224 8 Oct 2004 14:49:52 -0000 1.1
+++ 224 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message
****
Index: 225
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/225,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 225 10 Nov 2004 15:21:17 -0000 1.2
+++ 225 22 Jun 2005 14:18:12 -0000 1.3
@@ -1,9 +1,6 @@
0 TLS (server: mandatory, optional, and revoked certificates)
exim -DSERVER=server -bd -oX 1225
****
-0
-sleep 1
-****
# No certificate, certificate required
0
client ::1 1225
@@ -114,9 +111,6 @@
****
0
exim -DCRL=DIR/aux/crl.pem -DSERVER=server -bd -oX 1225
-****
-0
-sleep 1
****
# Good but revoked certificate, certificate required
0
Index: 228
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/228,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 228 8 Oct 2004 14:49:52 -0000 1.1
+++ 228 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@??? abcd@xoanon
To: ph10@???, abcd@xoanon
@@ -17,5 +14,5 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
Index: 229
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/229,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 229 8 Oct 2004 14:49:52 -0000 1.1
+++ 229 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 243
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/243,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 243 8 Oct 2004 14:49:52 -0000 1.1
+++ 243 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225
??? 220
mail from:<x@???>
@@ -45,7 +42,4 @@
****
0
killdaemon
-****
-0
-sleep 1
****
Index: 245
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/245,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 245 8 Oct 2004 14:49:52 -0000 1.1
+++ 245 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim -t
To: a000@???,a001@???,a002@???,a003@???,a004@???,
a005@???,a006@???,a007@???,a008@???,a009@???,
Index: 260
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/260,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 260 11 Nov 2004 11:57:29 -0000 1.2
+++ 260 22 Jun 2005 14:18:12 -0000 1.3
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 2
-****
-0
client ::1 1225
??? 220
mail from:<x@???>
Index: 264
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/264,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 264 8 Oct 2004 14:49:52 -0000 1.1
+++ 264 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message 1
****
@@ -19,6 +16,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 289
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/289,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 289 8 Oct 2004 14:49:52 -0000 1.1
+++ 289 22 Jun 2005 14:18:12 -0000 1.2
@@ -11,9 +11,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225
??? 220
mail from:<ok@sender>
Index: 297
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/297,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 297 8 Oct 2004 14:49:52 -0000 1.1
+++ 297 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Test message 1
****
@@ -19,6 +16,6 @@
killdaemon
****
0
-exim -DSERVER=server -qf
+exim -DSERVER=server -DNOTDAEMON -qf
****
tls_test
Index: 321
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/321,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 321 8 Oct 2004 14:49:52 -0000 1.1
+++ 321 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 328
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/328,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 328 8 Oct 2004 14:49:52 -0000 1.1
+++ 328 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1227
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 333
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/333,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 333 8 Oct 2004 14:49:52 -0000 1.1
+++ 333 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 338
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/338,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 338 8 Oct 2004 14:49:52 -0000 1.1
+++ 338 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
hosts: 127.0.0.1
interface: <; ::1 ; 131.111.10.206
Index: 349
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/349,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 349 7 Apr 2005 11:15:18 -0000 1.4
+++ 349 22 Jun 2005 14:18:12 -0000 1.5
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo abcd\r\nmail from:<ph10@???>
@@ -30,9 +27,6 @@
??? 250
??? 554
****
-0
-sleep 1
-****
# This time, don't send EHLO
0
client 127.0.0.1 1225
@@ -117,9 +111,6 @@
# banner (there was a bug at one point; missing error check).
0
client -t2 127.0.0.2 1225
-****
-0
-sleep 1
****
0
killdaemon
Index: 350
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/350,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 350 7 Apr 2005 11:15:18 -0000 1.2
+++ 350 22 Jun 2005 14:18:12 -0000 1.3
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo abcd\r\nmail from:<ph10@???>
Index: 391
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/391,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 391 8 Oct 2004 14:49:52 -0000 1.1
+++ 391 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -tls-on-connect -bd -oX 1225
****
0
-sleep 1
-****
-0
client -tls-on-connect 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 395
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/395,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 395 8 Oct 2004 14:49:52 -0000 1.1
+++ 395 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,14 +2,8 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10
Test
-****
-0
-sleep 1
****
0
exim -qf
Index: 396
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/396,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 396 8 Oct 2004 14:49:52 -0000 1.1
+++ 396 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@??? mug99@???
****
0
Index: 427
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/427,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 427 8 Oct 2004 14:49:52 -0000 1.1
+++ 427 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DCOM=# -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim -odi -odqs ok@???
Message 1
****
Index: 429
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/429,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 429 8 Oct 2004 14:49:52 -0000 1.1
+++ 429 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225
??? 220
ehlo rhu.barb
Index: 436
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/436,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 436 8 Oct 2004 14:49:53 -0000 1.1
+++ 436 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim -f ok@??? x@y
****
0
Index: 448
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/448,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 448 8 Oct 2004 14:49:53 -0000 1.1
+++ 448 22 Jun 2005 14:18:12 -0000 1.2
@@ -103,9 +103,6 @@
exim -DSERVER=server -odq -bd -oX 1225
****
0
-sleep 1
-****
-0
client -t5 127.0.0.1 1225
??? 220
mail from:<x@y>
@@ -154,9 +151,6 @@
??? 250
quit
??? 221
-****
-0
-sleep 1
****
0
killdaemon
Index: 486
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/486,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 486 8 Oct 2004 14:49:53 -0000 1.1
+++ 486 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo foobar
@@ -28,9 +25,6 @@
****
0
exim -DSERVER=server -DREMEMBER=true -bd -oX 1225
-****
-0
-sleep 1
****
0
client 127.0.0.1 1225
Index: 498
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/498,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 498 8 Oct 2004 14:49:53 -0000 1.1
+++ 498 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client -t2 127.0.0.1 1225
??? 220
ehlo foobar
@@ -32,6 +29,7 @@
??? 550-
??? 550-
****
+# Wait because of the teergrube
0
sleep 3
****
Index: 504
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/504,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 504 8 Oct 2004 14:49:53 -0000 1.1
+++ 504 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,70 +2,46 @@
exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0'
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE='local_interfaces = <; 0.0.0.0; 127.0.0.1.1228 ; ::0'
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -DPORT=daemon_smtp_port=1225:1226 -DIFACE='local_interfaces = <; 2001:630:200:8100:207:e9ff:fe5d:b693'
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -oX 1224 -DPORT=daemon_smtp_port=1225:1226 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0'
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -oX '<; 1224;1225;127.0.0.1' -DPORT=daemon_smtp_port=1225:1226 -DIFACE='local_interfaces = <; ::0 ; 127.0.0.1.1228 ; 0.0.0.0'
****
0
-millisleep 50
-****
-0
killdaemon
****
0
exim -d -bd -DSERVER=server -oX '<; ::0.1225; 0.0.0.0.1225;0.0.0.0.1226'
-****
-0
-millisleep 50
****
0
killdaemon
Index: 509
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/509,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 509 8 Oct 2004 14:49:53 -0000 1.1
+++ 509 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,17 +2,11 @@
exim -d -DSERVER=server -bd -oX 1225
****
0
-millisleep 100
-****
-0
killdaemon
****
# PID file must be DIR/spool/exim-daemon.* in order for "killdaemon" to work
0
exim -d -DSERVER=server -bd -oX 1225 -oP DIR/spool/exim-daemon.anotherpid
-****
-0
-millisleep 100
****
0
killdaemon
Index: 510
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/510,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 510 8 Oct 2004 14:49:53 -0000 1.1
+++ 510 22 Jun 2005 14:18:12 -0000 1.2
@@ -8,9 +8,6 @@
0
exim -DSERVER=server -bd -oX 1225
****
-0
-millisleep 100
-****
0
client 127.0.0.1 1225
??? 421
Index: 528
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/528,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 528 8 Oct 2004 14:49:53 -0000 1.1
+++ 528 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -bd -DSERVER=server -oX 1225
****
0
-millisleep 50
-****
-0
client 127.0.0.1 1225
??? 220
helo rhu.barb
@@ -24,6 +21,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
Index: 533
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/533,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 533 8 Oct 2004 14:49:53 -0000 1.1
+++ 533 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -bd -DSERVER=server -oX 1225
****
0
-millisleep 50
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -123,6 +120,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
Index: 535
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/535,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 535 8 Oct 2004 14:49:53 -0000 1.1
+++ 535 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -bd -DSERVER=server -oX 1225
****
0
-millisleep 50
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -44,11 +41,9 @@
??? 221
****
0
-millisleep 50
-****
-0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
Index: 550
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/550,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 550 25 Nov 2004 10:26:05 -0000 1.2
+++ 550 22 Jun 2005 14:18:12 -0000 1.3
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client ::1 1225 aux/cert2 aux/cert2
??? 220
ehlo rhu.barb
@@ -21,9 +18,6 @@
****
0
exim -DSERVER=server -DCERT=/non/exist -bd -oX 1225
-****
-0
-sleep 1
****
0
client ::1 1225 aux/cert2 aux/cert2
Index: 560
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/560,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 560 22 Dec 2004 12:05:46 -0000 1.2
+++ 560 22 Jun 2005 14:18:12 -0000 1.3
@@ -22,9 +22,6 @@
exim -DSERVER=server -DIP1=127.0.0.1 -DIP2=::1 -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
helo foobar
Index: 561
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/561,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 561 8 Oct 2004 14:49:53 -0000 1.1
+++ 561 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim ph10@???
Testing
****
Index: 563
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/563,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 563 8 Oct 2004 14:49:53 -0000 1.1
+++ 563 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
helo foobar
Index: 571
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/571,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 571 17 May 2005 15:00:05 -0000 1.5
+++ 571 22 Jun 2005 14:18:12 -0000 1.6
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -79,6 +76,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
@@ -86,9 +84,6 @@
exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=another.domain -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -113,6 +108,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
@@ -120,9 +116,6 @@
exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -147,6 +140,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
@@ -154,9 +148,6 @@
exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain= -DAUTH_ID_DOMAIN=@auth.id.domain -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -182,6 +173,7 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
@@ -189,9 +181,6 @@
exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
@@ -215,14 +204,12 @@
0
killdaemon
****
+# Wait for delivery process
0
sleep 1
****
0
exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX 1225
-****
-0
-sleep 1
****
0
client 127.0.0.1 1225
Index: 583
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/583,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 583 8 Oct 2004 14:49:53 -0000 1.1
+++ 583 22 Jun 2005 14:18:12 -0000 1.2
@@ -1,9 +1,6 @@
0 Cyrus SASL authentication (server only)
exim -DSERVER=server -bd -oX 1225
****
-0
-sleep 1
-****
0
client 127.0.0.1 1225
??? 220
Index: 584
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/584,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 584 21 Dec 2004 09:26:32 -0000 1.2
+++ 584 22 Jun 2005 14:18:12 -0000 1.3
@@ -2,9 +2,6 @@
exim -DSERVER=server -bd -oX 1225:1226:1237
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
ehlo rhu.barb
Index: 606
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/606,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 606 6 Apr 2005 15:26:52 -0000 1.1
+++ 606 22 Jun 2005 14:18:12 -0000 1.2
@@ -2,11 +2,9 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
exim -odi philip hazel
****
+# Wait for delivery process
0
sleep 1
****
Index: 904
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/904,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 904 27 Jan 2005 15:00:39 -0000 1.3
+++ 904 22 Jun 2005 14:18:12 -0000 1.4
@@ -45,9 +45,6 @@
exim -DSERVER=server -bd -oX 1225
****
0
-sleep 1
-****
-0
client 127.0.0.1 1225
??? 220
helo x.y.z
