You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/26 15:10:26 UTC

svn commit: r1175853 - in /maven/wagon/trunk/wagon-providers: wagon-ssh-external/pom.xml wagon-ssh/pom.xml

Author: olamy
Date: Mon Sep 26 13:10:25 2011
New Revision: 1175853

URL: http://svn.apache.org/viewvc?rev=1175853&view=rev
Log:
move tests with embedded ssh in a profile : not very stable...

Modified:
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml?rev=1175853&r1=1175852&r2=1175853&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml Mon Sep 26 13:10:25 2011
@@ -109,11 +109,12 @@ under the License.
       </build>
     </profile>
     <profile>
-      <id>ssh-tests</id>
+      <id>ssh-embedded</id>
       <activation>
-        <file>
-          <exists>/usr/bin/scp</exists>
-        </file>
+        <property>
+          <name>ssh-embedded</name>
+          <value>true</value>
+        </property>
       </activation>
       <build>
         <plugins>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=1175853&r1=1175852&r2=1175853&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Mon Sep 26 13:10:25 2011
@@ -100,6 +100,7 @@ under the License.
                 <exclude>**/SshCommandExecutorTest.*</exclude>
                 <exclude>**/KnownHostsProviderTest.*</exclude>
                 <exclude>**/ScpWagon*Test.*</exclude>
+                <exclude>**/Embedded*Test.*</exclude>
               </excludes>
               <systemPropertyVariables>
                 <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
@@ -140,5 +141,35 @@ under the License.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>ssh-embedded</id>
+      <activation>
+        <property>
+          <name>ssh-embedded</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <!-- Tests that currently doesn't work with embedded ssh server -->
+              <excludes>
+                <exclude>**/SftpWagonTest.*</exclude>
+                <exclude>**/SshCommandExecutorTest.*</exclude>
+                <exclude>**/KnownHostsProviderTest.*</exclude>
+                <exclude>**/ScpWagon*Test.*</exclude>
+              </excludes>
+              <systemPropertyVariables>
+                <java.io.tmpdir>${project.build.outputDirectory}</java.io.tmpdir>
+                <test.user>olamy</test.user>
+                <sshd.stopImmediatly>${sshd.stopImmediatly}</sshd.stopImmediatly>
+              </systemPropertyVariables>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>