You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/04/30 18:38:14 UTC
svn commit: r1477718 - in /servicemix/smx5/trunk/itests: pom.xml
src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
Author: gertv
Date: Tue Apr 30 16:38:14 2013
New Revision: 1477718
URL: http://svn.apache.org/r1477718
Log:
SM-2197: Fix integration tests on Hudson
Thanks to Hans Couder for the patch!
Modified:
servicemix/smx5/trunk/itests/pom.xml
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
Modified: servicemix/smx5/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/pom.xml?rev=1477718&r1=1477717&r2=1477718&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/pom.xml Tue Apr 30 16:38:14 2013
@@ -148,6 +148,7 @@
<version>2.14</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${settings.localRepository}</argLine>
</configuration>
</plugin>
Modified: servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala?rev=1477718&r1=1477717&r2=1477718&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala (original)
+++ servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala Tue Apr 30 16:38:14 2013
@@ -55,6 +55,7 @@ class ActiveMQExamplesTest extends Examp
class ActivitiExamplesTest extends ExamplesIntegrationTests {
@Test
+ @Ignore("This test intermittently seems to lock up the test container")
def testActivitiCamelExample = testWithFeature("examples-activiti-camel") {
val orderId = "001"
Modified: servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala?rev=1477718&r1=1477717&r2=1477718&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala (original)
+++ servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala Tue Apr 30 16:38:14 2013
@@ -27,6 +27,8 @@ import java.io.File
*/
trait IntegrationTestConfigurations {
+ lazy val LOCAL_REPOSITORY = System.getProperty("org.ops4j.pax.url.mvn.localRepository")
+
/**
* The default integration test configuration, using Scala and the Apache ServiceMix default assembly
*/
@@ -55,6 +57,7 @@ trait IntegrationTestConfigurations {
karafVersion("2.3.1").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")),
keepRuntimeFolder(),
+ systemProperty("org.ops4j.pax.url.mvn.localRepository").value(LOCAL_REPOSITORY),
// TODO: investigate why we need this to get Pax Logging going again
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG,stdout,osgi:*"))
}