svn commit: r1212572 - in /cassandra/branches/cassandra-1.0: ./ test/distributed/ test/distributed/org/apache/cassandra/ test/distributed/org/apache/cassandra/utils/

[br...@apache.org]

Author: brandonwilliams
Date: Fri Dec  9 18:45:39 2011
New Revision: 1212572

URL: http://svn.apache.org/viewvc?rev=1212572&view=rev
Log:
Remove old distributed tests.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-3602

Removed:
    cassandra/branches/cassandra-1.0/test/distributed/README.txt
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/CassandraServiceController.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/CountersTest.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/MovementTest.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/MutationTest.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/TestBase.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/utils/BlobUtils.java
    cassandra/branches/cassandra-1.0/test/distributed/org/apache/cassandra/utils/KeyPair.java
Modified:
    cassandra/branches/cassandra-1.0/build.xml

Modified: cassandra/branches/cassandra-1.0/build.xml
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1212572&r1=1212571&r2=1212572&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Fri Dec  9 18:45:39 2011
@@ -60,7 +60,6 @@
     <property name="test.name" value="*Test"/>
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="test.long.src" value="${test.dir}/long"/>
-    <property name="test.distributed.src" value="${test.dir}/distributed"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
     <condition property="version" value="${base.version}">
       <isset property="release"/>
@@ -287,9 +286,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
       <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
       <artifact:remoteRepository id="java.net2" url="${artifact.remoteRepository.java.net2}"/>
       <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
-      <!-- for distributed tests -->
-      <artifact:remoteRepository id="jclouds"   url="${artifact.remoteRepository.jclouds}"/>
-      <artifact:remoteRepository id="oauth"     url="${artifact.remoteRepository.oauth}"/>
 
       <macrodef name="install">
         <attribute name="pomFile"/>
@@ -972,22 +968,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
     </copy>
   </target>
 
-  <target name="build-distributed-test" depends="build-test,maven-ant-tasks-retrieve-test" description="Compile distributed test classes (which have additional deps)">
-    <javac
-     debug="true"
-     debuglevel="${debuglevel}"
-     destdir="${test.classes}">
-      <classpath>
-          <path refid="cassandra.classpath"/>
-          <pathelement location="${test.classes}"/>
-          <fileset dir="${test.lib}">
-            <include name="**/*.jar" />
-          </fileset>
-      </classpath>
-      <src path="${test.distributed.src}"/>
-    </javac>
-  </target>
-
   <macrodef name="testmacro">
     <attribute name="suitename" />
     <attribute name="inputdir" />
@@ -1076,14 +1056,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
                timeout="${test.long.timeout}" />
   </target>
 
-  <!-- Depends on artifacts so that we can push a tarball to remote nodes, and has its own build target for cloudy deps. -->
-  <target name="distributed-test" depends="build-distributed-test,artifacts" description="Execute distributed tests: see ${test.distributed.src}/README.txt">
-    <testmacro suitename="distributed" inputdir="${test.distributed.src}" timeout="1200000" forkmode="once">
-      <jvmarg value="-Dwhirr.config=${whirr.config}"/>
-      <jvmarg value="-Dwhirr.cassandra_tarball=${build.dir}/${final.name}-bin.tar.gz"/>
-    </testmacro>
-  </target>
-
   <!-- instruments the classes to later create code coverage reports -->
   <target name="cobertura-instrument" depends="build,build-test">
     <taskdef resource="tasks.properties">