You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2014/05/04 08:59:57 UTC
svn commit: r1592312 - in /james/server/trunk: ./
karaf/integration/src/test/java/org/apache/james/karaf/features/
Author: eric
Date: Sun May 4 06:59:55 2014
New Revision: 1592312
URL: http://svn.apache.org/r1592312
Log:
karaf integration tests randomly failing due to external repository availability/connectivity, patch contributed by Mark (JAMES-1546)
Added:
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java
Modified:
james/server/trunk/BUILD.txt
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java
james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java
james/server/trunk/pom.xml
Modified: james/server/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/BUILD.txt?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/BUILD.txt (original)
+++ james/server/trunk/BUILD.txt Sun May 4 06:59:55 2014
@@ -13,3 +13,9 @@ and should contain everything you need t
For just building without running junit tests:
$ mvn clean package -DskipTests=true
+
+Some tests have been disabled by default (*TestLive.java) because they
+are not reliable enough for continuous integration testing. To run the
+full set of tests, do:
+$ mvn clean install -Plivetests
+
Modified: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java (original)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java Sun May 4 06:59:55 2014
@@ -1,14 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.junit.Test;
-
-public class CommonsConfigurationLiveTest extends KarafLiveTestSupport {
-
- @Test
- public void testInstallCommonsConfigurationFeature() throws Exception {
- addJamesFeaturesRepository();
- features.installFeature("commons-configuration");
- assertInstalled("commons-configuration");
- assertBundlesAreActive();
- }
-}
Added: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java?rev=1592312&view=auto
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java (added)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java Sun May 4 06:59:55 2014
@@ -0,0 +1,14 @@
+package org.apache.james.karaf.features;
+
+import org.junit.Test;
+
+public class CommonsConfigurationTestLive extends KarafLiveTestSupport {
+
+ @Test
+ public void testInstallCommonsConfigurationFeature() throws Exception {
+ addJamesFeaturesRepository();
+ features.installFeature("commons-configuration");
+ assertInstalled("commons-configuration");
+ assertBundlesAreActive();
+ }
+}
Modified: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java (original)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java Sun May 4 06:59:55 2014
@@ -1,16 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.dnsservice.api.DNSService;
-import org.junit.Test;
-
-public class DnsServiceLiveTest extends KarafLiveTestSupport {
-
- @Test
- public void testInstallJamesDnsServiceDnsJava() throws Exception {
- addJamesFeaturesRepository();
- features.installFeature("james-server-dnsservice-dnsjava");
- assertInstalled("james-server-dnsservice-dnsjava");
- assertBundlesAreActive();
- assertOSGiServiceStartsIn(DNSService.class, WAIT_30_SECONDS);
- }
-}
Added: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java?rev=1592312&view=auto
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java (added)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java Sun May 4 06:59:55 2014
@@ -0,0 +1,16 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.dnsservice.api.DNSService;
+import org.junit.Test;
+
+public class DnsServiceTestLive extends KarafLiveTestSupport {
+
+ @Test
+ public void testInstallJamesDnsServiceDnsJava() throws Exception {
+ addJamesFeaturesRepository();
+ features.installFeature("james-server-dnsservice-dnsjava");
+ assertInstalled("james-server-dnsservice-dnsjava");
+ assertBundlesAreActive();
+ assertOSGiServiceStartsIn(DNSService.class, WAIT_30_SECONDS);
+ }
+}
Modified: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java (original)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java Sun May 4 06:59:55 2014
@@ -1,15 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.fetchmail.FetchScheduler;
-import org.junit.Test;
-
-public class FetchMailLiveTest extends KarafLiveTestSupport {
- @Test
- public void testInstallJamesFetchMailFeature() throws Exception {
- addJamesFeaturesRepository();
- features.installFeature("james-server-fetchmail");
- assertInstalled("james-server-fetchmail");
- assertBundlesAreActive();
- assertOSGiServiceStartsIn(FetchScheduler.class, WAIT_30_SECONDS);
- }
-}
Added: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java?rev=1592312&view=auto
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java (added)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java Sun May 4 06:59:55 2014
@@ -0,0 +1,15 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.fetchmail.FetchScheduler;
+import org.junit.Test;
+
+public class FetchMailTestLive extends KarafLiveTestSupport {
+ @Test
+ public void testInstallJamesFetchMailFeature() throws Exception {
+ addJamesFeaturesRepository();
+ features.installFeature("james-server-fetchmail");
+ assertInstalled("james-server-fetchmail");
+ assertBundlesAreActive();
+ assertOSGiServiceStartsIn(FetchScheduler.class, WAIT_30_SECONDS);
+ }
+}
Modified: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java (original)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java Sun May 4 06:59:55 2014
@@ -1,21 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.mailetcontainer.api.MailProcessor;
-import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean;
-import org.apache.mailet.MailetContext;
-import org.junit.Test;
-
-public class MailetContainerLiveTest extends KarafLiveTestSupport {
-
- @Test
- public void testInstallMailetContainerFeature() throws Exception {
- addJamesFeaturesRepository();
- String mailetContainerFeature = "james-server-mailet-container-camel";
- features.installFeature(mailetContainerFeature);
- assertInstalled(mailetContainerFeature);
- assertBundlesAreActive();
- assertOSGiServiceStartsIn(MailetContext.class, WAIT_30_SECONDS);
- assertOSGiServiceStartsIn(MailProcessor.class, WAIT_30_SECONDS);
- assertOSGiServiceStartsIn(MailSpoolerMBean.class, WAIT_30_SECONDS);
- }
-}
Added: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java?rev=1592312&view=auto
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java (added)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java Sun May 4 06:59:55 2014
@@ -0,0 +1,21 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean;
+import org.apache.mailet.MailetContext;
+import org.junit.Test;
+
+public class MailetContainerTestLive extends KarafLiveTestSupport {
+
+ @Test
+ public void testInstallMailetContainerFeature() throws Exception {
+ addJamesFeaturesRepository();
+ String mailetContainerFeature = "james-server-mailet-container-camel";
+ features.installFeature(mailetContainerFeature);
+ assertInstalled(mailetContainerFeature);
+ assertBundlesAreActive();
+ assertOSGiServiceStartsIn(MailetContext.class, WAIT_30_SECONDS);
+ assertOSGiServiceStartsIn(MailProcessor.class, WAIT_30_SECONDS);
+ assertOSGiServiceStartsIn(MailSpoolerMBean.class, WAIT_30_SECONDS);
+ }
+}
Modified: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java (original)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java Sun May 4 06:59:55 2014
@@ -1,14 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.junit.Test;
-
-public class Mime4jLiveTest extends KarafLiveTestSupport{
-
- @Test
- public void testInstallApacheMime4jFeature() throws Exception {
- addJamesFeaturesRepository();
- features.installFeature("apache-james-mime4j");
- assertInstalled("apache-james-mime4j");
- assertBundlesAreActive();
- }
-}
Added: james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java
URL: http://svn.apache.org/viewvc/james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java?rev=1592312&view=auto
==============================================================================
--- james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java (added)
+++ james/server/trunk/karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java Sun May 4 06:59:55 2014
@@ -0,0 +1,14 @@
+package org.apache.james.karaf.features;
+
+import org.junit.Test;
+
+public class Mime4jTestLive extends KarafLiveTestSupport{
+
+ @Test
+ public void testInstallApacheMime4jFeature() throws Exception {
+ addJamesFeaturesRepository();
+ features.installFeature("apache-james-mime4j");
+ assertInstalled("apache-james-mime4j");
+ assertBundlesAreActive();
+ }
+}
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1592312&r1=1592311&r2=1592312&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun May 4 06:59:55 2014
@@ -1270,5 +1270,23 @@
<javax.mail.artifactId>mail</javax.mail.artifactId>
</properties>
</profile>
+ <profile>
+ <!-- run live tests, ie. ones that do not run stably enough in
+ a CI environment (for example, karaf integration tests accessing external network
+ resources) -->
+ <id>livetests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestLive.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org