[exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Philip Hazel
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test/confs 0206 0256 0461 exim/exim-test/log 0256 exim/exim-test/mail 0256.abcd+test.ex+ph10 0256.abcd+test.ex+xxxx exim/exim-test/scripts/00
ph10 2007/08/30 14:35:29 BST

  Modified files:
    exim-test            runtest 
    exim-test/confs      0206 0256 0461 
    exim-test/log        0256 
    exim-test/scripts/0000-Basic 0206 0333 0374 0461 0542 0553 
    exim-test/stdout     0542 
  Added files:
    exim-test/mail       0256.abcd+test.ex+xxxx 
  Removed files:
    exim-test/mail       0256.abcd+test.ex+ph10 
  Log:
  Update tests for 4.68 (after testing on tahini).


  Revision  Changes    Path
  1.2       +1 -1      exim/exim-test/confs/0206
  1.3       +2 -1      exim/exim-test/confs/0256
  1.2       +4 -2      exim/exim-test/confs/0461
  1.3       +1 -1      exim/exim-test/log/0256
  1.2       +0 -31     exim/exim-test/mail/0256.abcd+test.ex+ph10 (dead)
  1.1       +31 -0     exim/exim-test/mail/0256.abcd+test.ex+xxxx (new)
  1.30      +3 -0      exim/exim-test/runtest
  1.2       +2 -2      exim/exim-test/scripts/0000-Basic/0206
  1.2       +1 -1      exim/exim-test/scripts/0000-Basic/0333
  1.2       +1 -1      exim/exim-test/scripts/0000-Basic/0374
  1.4       +2 -2      exim/exim-test/scripts/0000-Basic/0461
  1.6       +0 -3      exim/exim-test/scripts/0000-Basic/0542
  1.2       +1 -0      exim/exim-test/scripts/0000-Basic/0553
  1.7       +0 -3      exim/exim-test/stdout/0542


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/runtest,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- runtest    29 Aug 2007 15:06:47 -0000    1.29
  +++ runtest    30 Aug 2007 13:35:29 -0000    1.30
  @@ -1,6 +1,6 @@
   #! /usr/bin/perl -w


-# $Cambridge: exim/exim-test/runtest,v 1.29 2007/08/29 15:06:47 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.30 2007/08/30 13:35:29 ph10 Exp $

   ###############################################################################
   # This is the controlling script for the "new" test suite for Exim. It should #
  @@ -339,6 +339,9 @@
     s/^\d+:error:/pppp:error:/;
     s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/;


  +  # There are differences in error messages between OpenSSL versions
  +  s/SSL_CTX_set_cipher_list/SSL_connect/;
  +
     # One error test in expansions mentions base 62 or 36
     s/is not a base (36|62) number/is not a base 36\/62 number/;



  Index: 0206
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0206,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0206    7 Feb 2006 10:34:25 -0000    1.1
  +++ 0206    30 Aug 2007 13:35:29 -0000    1.2
  @@ -13,7 +13,7 @@
   # ----- Main settings -----


ignore_bounce_errors_after = 2s
-timeout_frozen_after = 4s
+timeout_frozen_after = 5s
queue_run_in_order



  Index: 0256
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0256,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0256    29 Aug 2007 15:06:47 -0000    1.2
  +++ 0256    30 Aug 2007 13:35:29 -0000    1.3
  @@ -13,7 +13,8 @@


acl_smtp_rcpt = accept
qualify_domain = test.ex
-errors_copy = *@* ${quote_local_part::abcd+$domain+$local_part}@???
+errors_copy = *@* ${quote_local_part::abcd+$domain+\
+ ${if eq{$local_part}{CALLER}{xxxx}{$local_part}}}@???
trusted_users = CALLER



  Index: 0461
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/0461,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0461    7 Feb 2006 10:34:26 -0000    1.1
  +++ 0461    30 Aug 2007 13:35:29 -0000    1.2
  @@ -2,6 +2,8 @@


FALLBACK=fallback_hosts = 127.0.0.1
ROUTE_DATA=V4NET.0.0.1
+RETRY1=1s
+RETRY2=2s

exim_path = EXIM_PATH
host_lookup_order = bydns
@@ -53,8 +55,8 @@

begin retry

  -V4NET.0.0.1  * F,1s,1s
  -V4NET.0.0.2  * F,1s,2s
  +V4NET.0.0.1  * F,1s,RETRY1
  +V4NET.0.0.2  * F,1s,RETRY2
   *            * F,1d,1s




  Index: 0256
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/log/0256,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0256    29 Aug 2007 15:06:47 -0000    1.2
  +++ 0256    30 Aug 2007 13:35:29 -0000    1.3
  @@ -2,7 +2,7 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 ** unknown@???: Unrouteable address
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
   1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@???> R=r1 T=t1
  -1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd+test.ex+CALLER <abcd+test.ex+CALLER@???> R=r1 T=t1
  +1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd+test.ex+xxxx <abcd+test.ex+xxxx@???> R=r1 T=t1
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= "abc@??? U=CALLER P=local-smtp S=sss


  Index: 0256.abcd+test.ex+xxxx
  ====================================================================
  From MAILER-DAEMON Tue Mar 02 09:44:33 1999
  Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
      id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  X-Failed-Recipients: unknown@???
  Auto-Submitted: auto-replied
  From: Mail Delivery System <Mailer-Daemon@???>
  To: CALLER@???
  Subject: Mail delivery failed: returning message to sender
  Message-Id: <E10HmaY-0005vi-00@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000


This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

    unknown@???
      Unrouteable address


------ This is a copy of the message, including all the headers. ------

  Return-path: <CALLER@???>
  Received: from CALLER by myhost.test.ex with local (Exim x.yz)
      (envelope-from <CALLER@???>)
      id 10HmaX-0005vi-00
      for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
  Message-Id: <E10HmaX-0005vi-00@???>
  From: CALLER_NAME <CALLER@???>
  Date: Tue, 2 Mar 1999 09:44:33 +0000




  Index: 0206
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0206,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0206    7 Feb 2006 10:54:33 -0000    1.1
  +++ 0206    30 Aug 2007 13:35:29 -0000    1.2
  @@ -1,12 +1,12 @@
   # timeout_frozen_after with ignore_bounce_errors_after
   sudo exim -odi -f unknown@??? nonexist@??? freeze@???
   ****
  -sleep 2
  +sleep 1
   sudo exim -Mf $msg1
   ****
   exim -qf
   ****
  -sleep 2
  +sleep 3
   exim -q
   ****
   no_msglog_check


  Index: 0333
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0333,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0333    7 Feb 2006 10:54:33 -0000    1.1
  +++ 0333    30 Aug 2007 13:35:29 -0000    1.2
  @@ -34,4 +34,4 @@
   ****
   exim -d-all+route -M $msg1 
   ****
  -millisleep 100
  +millisleep 500


  Index: 0374
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0374,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0374    7 Feb 2006 10:54:33 -0000    1.1
  +++ 0374    30 Aug 2007 13:35:29 -0000    1.2
  @@ -1,7 +1,7 @@
   # unseen without disable_logging and errors_to = ""
   need_ipv4
   #
  -server PORT_S 3
  +server -t 10 PORT_S 3
   220
   EHLO
   220 OK


  Index: 0461
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0461,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 0461    17 Jan 2007 12:44:25 -0000    1.3
  +++ 0461    30 Aug 2007 13:35:29 -0000    1.4
  @@ -54,7 +54,7 @@
   QUIT
   221 OK
   ****
  -exim -odi userx@???
  +exim -DRETRY1=5s -odi userx@???
   Short message
   ****
   exim -DFALLBACK= -odi userx@???
  @@ -64,7 +64,7 @@
   Short message
   ****
   sleep 3
  -exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -q
  +exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -DRETRY2=5s -q
   ****
   exim -DFALLBACK= -DROUTE_DATA=V4NET.0.0.2 -odi userx@???
   Short message


  Index: 0542
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0542,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 0542    29 Jun 2007 09:20:38 -0000    1.5
  +++ 0542    30 Aug 2007 13:35:29 -0000    1.6
  @@ -10,7 +10,6 @@
   From: $h_from:
   Subject: $h_subject:
   message_body_size=$message_body_size
  -message_size=$message_size
   message_id=$message_id
   message_exim_id=$message_exim_id
   max_received_linelength=$max_received_linelength
  @@ -33,7 +32,6 @@
   From: $h_from:
   Subject: $h_subject:
   message_body_size=$message_body_size
  -message_size=$message_size
   message_id=$message_id
   message_exim_id=$message_exim_id
   max_received_linelength=$max_received_linelength
  @@ -51,7 +49,6 @@
   from: $h_from:
   to: $h_to:
   subject: $h_subject:
  -message_size=$message_size
   message_body_size=$message_body_size
   message_exim_id=$message_exim_id
   message_linecount=$message_linecount


  Index: 0553
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0553,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0553    6 Feb 2007 12:19:27 -0000    1.1
  +++ 0553    30 Aug 2007 13:35:29 -0000    1.2
  @@ -11,6 +11,7 @@
   ****
   sleep 1
   killdaemon
  +sleep 1
   #
   # This daemon should flush before delaying
   exim -DSERVER=server -bd -oX PORT_D


  Index: 0542
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0542,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- 0542    29 Jun 2007 09:20:38 -0000    1.6
  +++ 0542    30 Aug 2007 13:35:29 -0000    1.7
  @@ -1,7 +1,6 @@
   > From: Himself <himself@???>
   > Subject: The subject is not the object
   > message_body_size=71
  -> message_size=407
   > message_id=10HmaX-0005vi-00
   > message_exim_id=10HmaX-0005vi-00
   > max_received_linelength=70
  @@ -17,7 +16,6 @@
   > From: Himself <himself@???>
   > Subject: The subject is not the object
   > message_body_size=76
  -> message_size=416
   > message_id=10HmaY-0005vi-00
   > message_exim_id=10HmaY-0005vi-00
   > max_received_linelength=75
  @@ -26,7 +24,6 @@
   > from: A Person <a.person@???>
   > to: First <first@???>, Second <second@???>
   > subject: The subject is moot
  -> message_size=197
   > message_body_size=77
   > message_exim_id=10HmaZ-0005vi-00
   > message_linecount=6