NXP-8693 - don't cleanup env after tests

nuxeo-archives · Jan 20, 2012 · 505a4cb · 505a4cb
1 parent 9987402
commit 505a4cb
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 64 deletions.
diff --git a/nuxeo-distribution-cmf/ftest/selenium/pom.xml b/nuxeo-distribution-cmf/ftest/selenium/pom.xml
@@ -1,6 +1,4 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,21 +14,14 @@
   <description>Nuxeo CMF Functional Tests</description>
   <packaging>pom</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-server-standalone</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.nuxeo.build</groupId>
         <artifactId>nuxeo-distribution-tools</artifactId>
         <executions>
-         <execution>
-          <id>start-nuxeo</id>
+          <execution>
+            <id>start-nuxeo</id>
             <phase>pre-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -54,8 +45,8 @@
               <target>run-selenium-tests</target>
             </configuration>
           </execution>
-         <execution>
-          <id>stop-nuxeo</id>
+          <execution>
+            <id>stop-nuxeo</id>
             <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -64,7 +55,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>

diff --git a/nuxeo-distribution-dam/ftest/selenium/pom.xml b/nuxeo-distribution-dam/ftest/selenium/pom.xml
@@ -1,6 +1,4 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,21 +14,14 @@
   <description>Nuxeo DAM Functional Tests</description>
   <packaging>pom</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-server-standalone</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.nuxeo.build</groupId>
         <artifactId>nuxeo-distribution-tools</artifactId>
         <executions>
-         <execution>
-          <id>start-nuxeo</id>
+          <execution>
+            <id>start-nuxeo</id>
             <phase>pre-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -57,8 +48,8 @@
               <target>run-selenium-tests</target>
             </configuration>
           </execution>
-         <execution>
-          <id>stop-nuxeo</id>
+          <execution>
+            <id>stop-nuxeo</id>
             <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -67,7 +58,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>

diff --git a/nuxeo-distribution-dm/ftest/cmis/pom.xml b/nuxeo-distribution-dm/ftest/cmis/pom.xml
@@ -1,6 +1,4 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -26,9 +24,9 @@
       <plugin>
         <groupId>org.nuxeo.build</groupId>
         <artifactId>nuxeo-distribution-tools</artifactId>
-         <executions>
-           <execution>
-          <id>start-nuxeo</id>
+        <executions>
+          <execution>
+            <id>start-nuxeo</id>
             <phase>pre-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -55,8 +53,8 @@
               <testFailureIgnore>true</testFailureIgnore>
             </configuration>
           </execution>
-           <execution>
-          <id>stop-nuxeo</id>
+          <execution>
+            <id>stop-nuxeo</id>
             <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -65,7 +63,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>

diff --git a/nuxeo-distribution-dm/ftest/funkload/pom.xml b/nuxeo-distribution-dm/ftest/funkload/pom.xml
@@ -1,6 +1,4 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -26,9 +24,9 @@
       <plugin>
         <groupId>org.nuxeo.build</groupId>
         <artifactId>nuxeo-distribution-tools</artifactId>
-         <executions>
-           <execution>
-          <id>start-nuxeo</id>
+        <executions>
+          <execution>
+            <id>start-nuxeo</id>
             <phase>pre-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -56,8 +54,8 @@
               <testFailureIgnore>true</testFailureIgnore>
             </configuration>
           </execution>
-           <execution>
-          <id>stop-nuxeo</id>
+          <execution>
+            <id>stop-nuxeo</id>
             <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -66,7 +64,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>

diff --git a/nuxeo-distribution-dm/ftest/selenium/pom.xml b/nuxeo-distribution-dm/ftest/selenium/pom.xml
@@ -60,7 +60,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>

diff --git a/nuxeo-distribution-social-collaboration/ftest/selenium/pom.xml b/nuxeo-distribution-social-collaboration/ftest/selenium/pom.xml
@@ -1,6 +1,4 @@
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,21 +14,14 @@
   <description>Nuxeo Social Collaboration Functional Tests</description>
   <packaging>pom</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>selenium-server-standalone</artifactId>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.nuxeo.build</groupId>
         <artifactId>nuxeo-distribution-tools</artifactId>
         <executions>
-         <execution>
-          <id>start-nuxeo</id>
+          <execution>
+            <id>start-nuxeo</id>
             <phase>pre-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -55,8 +46,8 @@
               <target>run-selenium-tests</target>
             </configuration>
           </execution>
-         <execution>
-          <id>stop-nuxeo</id>
+          <execution>
+            <id>stop-nuxeo</id>
             <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
@@ -65,7 +56,6 @@
               <buildFile>${basedir}/itests.xml</buildFile>
               <targets>
                 <target>stop</target>
-                <target>cleanup-environment</target>
               </targets>
             </configuration>
           </execution>