You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by co...@apache.org on 2010/07/02 03:39:15 UTC

svn commit: r959827 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml src/test/smoke-tests

Author: cos
Date: Fri Jul  2 01:39:15 2010
New Revision: 959827

URL: http://svn.apache.org/viewvc?rev=959827&view=rev
Log:
HDFS-1199. Extract a subset of tests for smoke (DOA) validation. Contributed by Konstantin Boudnik.

Added:
    hadoop/hdfs/trunk/src/test/smoke-tests
Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=959827&r1=959826&r2=959827&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Jul  2 01:39:15 2010
@@ -255,6 +255,8 @@ Release 0.21.0 - Unreleased
 
   IMPROVEMENTS
 
+    HDFS-1199. Extract a subset of tests for smoke (DOA) validation. (cos)
+
     HDFS-381. Remove blocks from DataNode maps when corresponding file
     is deleted. (Suresh Srinivas via rangadi)
 

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=959827&r1=959826&r2=959827&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Fri Jul  2 01:39:15 2010
@@ -97,6 +97,7 @@
   <property name="test.hdfs.build.classes" value="${test.build.dir}/classes"/>
 
   <property name="test.hdfs.commit.tests.file" value="${test.src.dir}/commit-tests" />
+  <property name="test.hdfs.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
   <property name="test.hdfs.all.tests.file" value="${test.src.dir}/all-tests" />
 
   <property name="test.hdfs.rpc.engine" value=""/>
@@ -532,6 +533,15 @@
   </condition>
 
   <!-- ================================================================== -->
+  <!-- Define exclude lists for different kinds of testing                -->
+  <!-- ================================================================== -->
+  <patternset id="empty.exclude.list.id" />
+    <patternset id="commit.smoke.exclude.list.id">
+    <excludesfile name="${test.hdfs.commit.tests.file}"/>
+    <excludesfile name="${test.hdfs.smoke.tests.file}"/>
+  </patternset>
+
+  <!-- ================================================================== -->
   <!-- Run unit tests                                                     --> 
   <!-- ================================================================== -->
   <macrodef name="macro-test-runner">
@@ -541,6 +551,7 @@
     <attribute name="test.dir" />
     <attribute name="fileset.dir" />
     <attribute name="hadoop.conf.dir.deployed" default="" />
+    <attribute name="exclude.list.id" default="empty.exclude.list.id" />
     <sequential>
       <delete dir="@{test.dir}/data"/>
       <mkdir dir="@{test.dir}/data"/>
@@ -581,6 +592,7 @@
              <patternset>
                <includesfile name="@{test.file}"/>
              </patternset>
+             <patternset refid="@{exclude.list.id}"/>
          </fileset>
         </batchtest>
         <batchtest todir="@{test.dir}" if="tests.notestcase.fi">
@@ -605,13 +617,19 @@
     </sequential>
   </macrodef>
 
-  <target name="run-test-hdfs" depends="compile-hdfs-test" description="Run full set of hdfs unit tests">
+  <target name="run-test-hdfs" depends="run-commit-test, run-smoke-test,
+    run-test-hdfs-excluding-commit-and-smoke"
+    description="Run full set of hdfs unit tests">
+  </target>
+
+  <target name="run-test-hdfs-excluding-commit-and-smoke" depends="compile-hdfs-test">
     <macro-test-runner
       test.file="${test.hdfs.all.tests.file}"
       suite.type="hdfs"
       classpath="${test.classpath.id}"
       test.dir="${test.build.dir}"
-      fileset.dir="${test.src.dir}"/>
+      fileset.dir="${test.src.dir}"
+      exclude.list.id="commit.smoke.exclude.list.id"/>
   </target>
 
   <target name="run-commit-test" depends="compile-hdfs-test" description="Run approximate 10-minute set of unit tests prior to commiting">
@@ -623,6 +641,16 @@
        fileset.dir="${test.src.dir}"/>
   </target>
 
+  <target name="run-smoke-test" depends="compile-hdfs-test"
+    description="Run approximate 30-minute set of functional tests prior to guarantee HDFS viability">
+     <macro-test-runner
+       test.file="${test.hdfs.smoke.tests.file}"
+       suite.type="hdfs"
+       classpath="${test.classpath.id}"
+       test.dir="${test.build.dir}"
+       fileset.dir="${test.src.dir}"/>
+  </target>
+
   <target name="run-test-unit" depends="compile-hdfs-test" description="Run unit tests">
     <macro-test-runner
       test.file="${test.hdfs.all.tests.file}"

Added: hadoop/hdfs/trunk/src/test/smoke-tests
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/smoke-tests?rev=959827&view=auto
==============================================================================
--- hadoop/hdfs/trunk/src/test/smoke-tests (added)
+++ hadoop/hdfs/trunk/src/test/smoke-tests Fri Jul  2 01:39:15 2010
@@ -0,0 +1,49 @@
+**/TestBloomMapFile.java
+**/TestDelegationToken.java
+**/TestDoAsEffectiveUser.java
+**/TestHttpServer.java
+**/TestIndexedSort.java
+**/TestInMemoryNativeS3FileSystemContract.java
+**/TestInMemoryS3FileSystemContract.java
+**/TestINode.java
+**/TestIPC.java
+**/TestIPCServerResponder.java
+**/TestKosmosFileSystem.java
+**/TestLocalDirAllocator.java
+**/TestRecordIO.java
+**/TestRecordVersioning.java
+**/TestReflectionUtils.java
+**/TestRetryProxy.java
+**/TestRPC.java
+**/TestS3Credentials.java
+**/TestS3FileSystem.java
+**/TestSaslRPC.java
+**/TestSequenceFileSerialization.java
+**/TestTFileByteArrays.java
+**/TestTFileComparators.java
+**/TestTFile.java
+**/TestTFileJClassComparatorByteArrays.java
+**/TestTFileLzoCodecsByteArrays.java
+**/TestTFileLzoCodecsStreams.java
+**/TestTFileNoneCodecsByteArrays.java
+**/TestTFileNoneCodecsJClassComparatorByteArrays.java
+**/TestTFileNoneCodecsStreams.java
+**/TestTFileSeek.java
+**/TestTFileSeqFileComparison.java
+**/TestTFileSplit.java
+**/TestTFileStreams.java
+**/TestTFileUnsortedByteArrays.java
+**/TestTruncatedInputBug.java
+**/TestVersionedWritable.java
+**/TestWritableSerialization.java
+**/TestCLI.java
+**/TestFTPFileSystem.java
+**/TestDFSStorageStateRecovery.java
+**/TestDFSRollback.java
+**/TestDFSRename.java
+**/TestDFSMkdirs.java
+**/TestDFSFinalize.java
+**/TestFileCreationNamenodeRestart.java
+**/TestClientProtocolWithDelegationToken.java
+**/TestDelegationTokenAuthMethod.java
+**/TestNameNodeMetrics.java