Browse Source

isolate integ tests a little better.

They are mostly just ES clients, but we can set tempdir and the usual
stuff to contain them better.
Robert Muir 10 years ago
parent
commit
fb62d945aa
2 changed files with 3 additions and 3 deletions
  1. 0 3
      dev-tools/src/main/resources/ant/integration-tests.xml
  2. 3 0
      pom.xml

+ 0 - 3
dev-tools/src/main/resources/ant/integration-tests.xml

@@ -6,9 +6,6 @@
     <istrue value="${skip.integ.tests}"/>
   </condition>
 
-  <!-- this is our working area -->
-  <property name="integ.scratch" location="${project.build.directory}/integ-tests"/>
-
   <!-- our pid file for easy cleanup -->
   <property name="integ.pidfile" location="${integ.scratch}/es.pid"/>
 

+ 3 - 0
pom.xml

@@ -104,6 +104,8 @@
         <tests.ifNoTests>fail</tests.ifNoTests>
         <skip.unit.tests>${skipTests}</skip.unit.tests>
         <skip.integ.tests>${skipTests}</skip.integ.tests>
+        <integ.scratch>${project.build.directory}/integ-tests</integ.scratch>
+        <integ.temp>${integ.scratch}/temp</integ.temp>
     </properties>
 
     <repositories>
@@ -705,6 +707,7 @@
                            <tests.rest.blacklist>${tests.rest.blacklist}</tests.rest.blacklist>
                            <tests.rest.spec>${tests.rest.spec}</tests.rest.spec>
                            <tests.rest.load_packaged>${tests.rest.load_packaged}</tests.rest.load_packaged>
+                           <java.io.tmpdir>${integ.temp}</java.io.tmpdir>
                        </systemPropertyVariables>
                     </configuration>
                     <executions>