ph10 2005/05/31 11:24:19 BST
Modified files:
exim-test-orig/AutoTest/confs 614
exim-test-orig/AutoTest/scripts 614
exim-test-orig/AutoTest/stderr 614
Log:
Update test results after Tony's tweak to the ratelimit code.
Revision Changes Path
1.2 +2 -2 exim/exim-test-orig/AutoTest/confs/614
1.2 +2 -2 exim/exim-test-orig/AutoTest/scripts/614
1.2 +33 -26 exim/exim-test-orig/AutoTest/stderr/614
Index: 614
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/614,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 614 24 May 2005 10:34:11 -0000 1.1
+++ 614 31 May 2005 10:24:19 -0000 1.2
@@ -1,7 +1,7 @@
# Exim test configuration 614
-RRATELIMIT=0/1h
-DRATELIMIT=0/1h/per_byte
+RRATELIMIT=0/1h/strict
+DRATELIMIT=0/1h/per_byte/strict
# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
Index: 614
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/614,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 614 24 May 2005 10:34:12 -0000 1.1
+++ 614 31 May 2005 10:24:19 -0000 1.2
@@ -19,7 +19,7 @@
quit
****
0
-exim -bh 10.9.8.7 -DRRATELIMIT=0/1h/per_conn -DDRATELIMIT=0/1h/per_conn
+exim -bh 10.9.8.7 -DRRATELIMIT=0/1h/per_conn/strict -DDRATELIMIT=0/1h/per_conn/strict
ehlo test.ex
mail from:<>
rcpt to:<a@b>
@@ -29,7 +29,7 @@
quit
****
0
-exim -bh 10.9.8.7 -DRRATELIMIT=0/1h/per_conn -DDRATELIMIT=0/1h/per_conn
+exim -bh 10.9.8.7 -DRRATELIMIT=0/1h/per_conn/strict -DDRATELIMIT=0/1h/per_conn/strict
ehlo test.ex
mail from:<>
rcpt to:<a@b>
Index: 614
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/614,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 614 24 May 2005 10:34:12 -0000 1.1
+++ 614 31 May 2005 10:24:19 -0000 1.2
@@ -11,21 +11,23 @@
>>> host in tls_advertise_hosts? no (option unset)
>>> using ACL "check_rcpt"
>>> processing "warn"
->>> check ratelimit = 0/1h
->>> ratelimit condition limit=0 period=3600 key=0/1h / 10.9.8.7
+>>> check ratelimit = 0/1h/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
->>> warn: condition test failed
+>>> warn: condition test succeeded
+LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "accept"
>>> accept: condition test succeeded
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_data"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_byte
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte / 10.9.8.7
+>>> check ratelimit = 0/1h/per_byte/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
->>> warn: condition test failed
+>>> warn: condition test succeeded
+LOG: 10HmaX-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "deny"
>>> deny: condition test succeeded
LOG: 10HmaX-0005vi-00 H=(test.ex) [10.9.8.7] F=<> rejected after DATA
@@ -42,8 +44,8 @@
>>> host in tls_advertise_hosts? no (option unset)
>>> using ACL "check_rcpt"
>>> processing "warn"
->>> check ratelimit = 0/1h
->>> ratelimit condition limit=0 period=3600 key=0/1h / 10.9.8.7
+>>> check ratelimit = 0/1h/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/strict / 10.9.8.7
>>> ratelimit computed rate 1.0
>>> warn: condition test succeeded
LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -52,8 +54,8 @@
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_data"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_byte
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte / 10.9.8.7
+>>> check ratelimit = 0/1h/per_byte/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_byte/strict / 10.9.8.7
>>> ratelimit computed rate 19.0
>>> warn: condition test succeeded
LOG: 10HmaY-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=19.0 sender_rate_limit=0 sender_rate_period=1h
@@ -73,20 +75,22 @@
>>> host in tls_advertise_hosts? no (option unset)
>>> using ACL "check_rcpt"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
+>>> check ratelimit = 0/1h/per_conn/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
->>> warn: condition test failed
+>>> warn: condition test succeeded
+LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "accept"
>>> accept: condition test succeeded
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_data"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
+>>> check ratelimit = 0/1h/per_conn/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
>>> ratelimit found pre-computed rate 0.0
->>> warn: condition test failed
+>>> warn: condition test succeeded
+LOG: 10HmaZ-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "deny"
>>> deny: condition test succeeded
LOG: 10HmaZ-0005vi-00 H=(test.ex) [10.9.8.7] F=<> rejected after DATA
@@ -103,8 +107,8 @@
>>> host in tls_advertise_hosts? no (option unset)
>>> using ACL "check_rcpt"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
+>>> check ratelimit = 0/1h/per_conn/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
>>> ratelimit computed rate 1.0
>>> warn: condition test succeeded
LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -113,8 +117,8 @@
>>> host in ignore_fromline_hosts? no (option unset)
>>> using ACL "check_data"
>>> processing "warn"
->>> check ratelimit = 0/1h/per_conn
->>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
+>>> check ratelimit = 0/1h/per_conn/strict
+>>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn/strict / 10.9.8.7
>>> ratelimit found pre-computed rate 1.0
>>> warn: condition test succeeded
LOG: 10HmbA-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
@@ -138,23 +142,25 @@
>>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
>>> ratelimit initializing new key's data
>>> ratelimit computed rate 0.0
->>> warn: condition test failed
+>>> warn: condition test succeeded
+LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "accept"
>>> accept: condition test succeeded
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_rcpt
>>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
->>> ratelimit computed rate 1.0
+>>> ratelimit initializing new key's data
+>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
-LOG: H=(test.ex) [10.9.8.7] Warning: RCPT: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "accept"
>>> accept: condition test succeeded
>>> using ACL "check_rcpt"
>>> processing "warn"
>>> check ratelimit = 0/1h/per_rcpt
>>> ratelimit condition limit=0 period=3600 key=0/1h/per_rcpt / 10.9.8.7
->>> ratelimit computed rate 1.0
+>>> ratelimit initializing new key's data
+>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
>>> processing "accept"
>>> accept: condition test succeeded
@@ -163,9 +169,10 @@
>>> processing "warn"
>>> check ratelimit = 0/1h/per_conn
>>> ratelimit condition limit=0 period=3600 key=0/1h/per_conn / 10.9.8.7
->>> ratelimit computed rate 1.0
+>>> ratelimit initializing new key's data
+>>> ratelimit computed rate 0.0
>>> warn: condition test succeeded
-LOG: 10HmbB-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=1.0 sender_rate_limit=0 sender_rate_period=1h
+LOG: 10HmbB-0005vi-00 H=(test.ex) [10.9.8.7] Warning: DATA: sender_rate=0.0 sender_rate_limit=0 sender_rate_period=1h
>>> processing "deny"
>>> deny: condition test succeeded
LOG: 10HmbB-0005vi-00 H=(test.ex) [10.9.8.7] F=<> rejected after DATA
