summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-07-09 22:43:18 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2019-07-09 23:38:20 +0100
commit17ccbda62e05f6ed59a27791643be4b94f7fcdbd (patch)
tree846dcd265f61f66f734f20c94e9ab70d341483a8 /test
parentfa7b17bdbc8c055c475a50791627cd75d257f4f3 (diff)
Expansions: acl expansion error detail
Diffstat (limited to 'test')
-rw-r--r--test/log/57002
-rw-r--r--test/paniclog/57002
-rw-r--r--test/stderr/57002
-rw-r--r--test/stdout/00026
4 files changed, 6 insertions, 6 deletions
diff --git a/test/log/5700 b/test/log/5700
index fc139b29a..7f810e438 100644
--- a/test/log/5700
+++ b/test/log/5700
@@ -25,7 +25,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 . [127.0.0.1] -> [127.0.0.1]:PORT_S
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@expansionfail R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:delivery
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: ERROR from acl "logger"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
diff --git a/test/paniclog/5700 b/test/paniclog/5700
index 4ed4279a2..224bda7d8 100644
--- a/test/paniclog/5700
+++ b/test/paniclog/5700
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: ERROR from acl "logger"
diff --git a/test/stderr/5700 b/test/stderr/5700
index 4ed4279a2..224bda7d8 100644
--- a/test/stderr/5700
+++ b/test/stderr/5700
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: error from acl "logger"
+1999-03-02 09:44:33 10HmaX-0005vi-00 failed to expand event_action msg:delivery in smtp: ERROR from acl "logger"
diff --git a/test/stdout/0002 b/test/stdout/0002
index c9337869d..c1f9d3799 100644
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -138,7 +138,7 @@
>
> Failed: Not enough arguments for 'acl' (min is 1)
> Failed: Not enough arguments for 'acl' (min is 1)
-> Failed: error from acl "a_nosuch"
+> Failed: ERROR from acl "a_nosuch"
> acl: (0) [] []
> acl: (1) [person@dom.ain] []
> acl: (2) [firstarg] [secondarg]
@@ -147,7 +147,7 @@
> acl:
> acl: (0) [] []
> acl: (1) [person@dom.ain] []
-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"
> acl: (2) [new arg1] [top_arg_1]
> acl: (1) [1] [] (1) [2] [] (1) [3] [] (1) [4] []
>
@@ -469,7 +469,7 @@ newline tab\134backslash ~tilde\177DEL\200\201.
> acl if: Y:(0) [] []
> acl if: Y:(1) [argY] []
> acl if: N:(2) [argN] [arg2]
-> Failed: error from acl "a_defer"
+> Failed: DEFER from acl "a_defer"
>
> # Default values for both if strings
>