JAMES-2342 Avoid failing when SpamAssassin is not started

Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d504c0e6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d504c0e6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d504c0e6

Branch: refs/heads/master
Commit: d504c0e6c23472830e2b910488b00a1083a6ff8a
Parents: 04b3d79
Author: benwa <[email protected]>
Authored: Thu Mar 8 12:09:48 2018 +0700
Committer: Antoine Duprat <[email protected]>
Committed: Thu Mar 8 11:01:21 2018 +0100

----------------------------------------------------------------------
 .../src/test/resources/mailetcontainer.xml                          | 1 +
 .../src/test/resources/mailetcontainer.xml                          | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/d504c0e6/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 2c40aa6..6c27de9 100644
--- 
a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ 
b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -54,6 +54,7 @@
             <mailet match="RecipientIsLocal" 
class="org.apache.james.jmap.mailet.VacationMailet"/>
             <mailet match="RecipientIsLocal" class="Sieve"/>
             <mailet match="RecipientIsLocal" class="SpamAssassin">
+                <onMailetException>ignore</onMailetException>
                 <spamdHost>localhost</spamdHost>
                 <spamdPort>783</spamdPort>
             </mailet>

http://git-wip-us.apache.org/repos/asf/james-project/blob/d504c0e6/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git 
a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
 
b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
index 8027b3e..8c8e2dd 100644
--- 
a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
+++ 
b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/resources/mailetcontainer.xml
@@ -54,6 +54,7 @@
             <mailet match="RecipientIsLocal" 
class="org.apache.james.jmap.mailet.VacationMailet"/>
             <mailet match="RecipientIsLocal" class="Sieve"/>
             <mailet match="RecipientIsLocal" class="SpamAssassin">
+                <onMailetException>ignore</onMailetException>
                 <spamdHost>localhost</spamdHost>
                 <spamdPort>783</spamdPort>
             </mailet>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to