You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/09/01 11:52:22 UTC

svn commit: r1758762 - in /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests: pom.xml src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Author: olli
Date: Thu Sep  1 11:52:22 2016
New Revision: 1758762

URL: http://svn.apache.org/viewvc?rev=1758762&view=rev
Log:
SLING-3821 Run launchpad integration tests against Sling on Karaf

fix repoinit filename

Modified:
    sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
    sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1758762&r1=1758761&r2=1758762&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml Thu Sep  1 11:52:22 2016
@@ -38,6 +38,7 @@
   <properties>
     <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
     <org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
+    <repoinit.filename>${project.basedir}/src/test/resources/repoinit.txt</repoinit.filename>
   </properties>
 
   <dependencies>
@@ -228,7 +229,10 @@
             <artifactId>exam-maven-plugin</artifactId>
             <configuration>
               <configClass>org.apache.sling.karaf.tests.configuration.SlingLaunchpadOakTarConfiguration</configClass>
-              <propagatedProperties>http.port</propagatedProperties>
+              <propagatedProperties>
+                repoinit.filename,
+                http.port
+              </propagatedProperties>
             </configuration>
             <executions>
               <execution>

Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1758762&r1=1758761&r2=1758762&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java Thu Sep  1 11:52:22 2016
@@ -36,7 +36,8 @@ import static org.ops4j.pax.exam.karaf.o
 public class SlingLaunchpadOakTarConfiguration extends KarafTestSupport {
 
     private Option testBundle() throws Exception {
-        final InputStream repoinit = new FileInputStream("src/test/resources/repoinit.txt");
+        final String filename = System.getProperty("repoinit.filename");
+        final InputStream repoinit = new FileInputStream(filename);
         return streamBundle(
             TinyBundles.bundle()
                 .add("repoinit.txt", repoinit)