[exim-cvs] Testsuite: unify the fs dependend error messages

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Exim Git Commits Mailing List
Date:  
À: exim-cvs
Sujet: [exim-cvs] Testsuite: unify the fs dependend error messages
Gitweb: http://git.exim.org/exim.git/commitdiff/f4bb1d53d09d28cd6314a9e244d7a31d32e4bbdb
Commit:     f4bb1d53d09d28cd6314a9e244d7a31d32e4bbdb
Parent:     f64398d361f4b24c3be9aa77a408190783b6af54
Author:     Heiko Schlittermann (HS12) <hs@???>
AuthorDate: Mon Apr 6 23:18:41 2015 +0200
Committer:  Heiko Schlittermann (HS12) <hs@???>
CommitDate: Sat Apr 25 20:39:47 2015 +0200


    Testsuite: unify the fs dependend error messages
---
 test/log/5101 |    4 ++--
 test/runtest  |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/test/log/5101 b/test/log/5101
index 091db66..5c1ba43 100644
--- a/test/log/5101
+++ b/test/log/5101
@@ -82,9 +82,9 @@ DATA
QUIT
<<< QUIT
250 OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ has too many links (2)) C="250 Number 1 is OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@???> R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ not a regular file or too many links) C="250 Number 1 is OK"
1999-03-02 09:44:33 10HmaZ-0005vi-00 ** jack@??? R=smartuser T=lmtp: LMTP error after end of data: 550 Number 2 fails
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ has too many links (2)) C="250 Number 3 is OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp ST=local_delivery (mailbox TESTSUITE/test-mail/ not a regular file or too many links) C="250 Number 3 is OK"
1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@???> R=bounces T=local_delivery
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/runtest b/test/runtest
index 9d78ce9..6c98a70 100755
--- a/test/runtest
+++ b/test/runtest
@@ -704,6 +704,9 @@ RESET_AFTER_EXTRA_LINE_READ:
# ======== Other error numbers ========
s/errno=\d+/errno=dd/g;

+ # ======== System Error Messages ======
+ # depending on the underlaying file system the error message seems to differ
+ s/(?: is not a regular file)|(?: has too many links \(\d+\))/ not a regular file or too many links/;

# ======== Output from ls ========
# Different operating systems use different spacing on long output