Return-Path: 
 <hdfs-commits-return-1043-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: (qmail 75516 invoked from network); 16 Jan 2011 08:11:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 16 Jan 2011 08:11:04 -0000
Received: (qmail 64632 invoked by uid 500); 16 Jan 2011 08:11:03 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 64535 invoked by uid 500); 16 Jan 2011 08:11:01 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 64426 invoked by uid 99); 16 Jan 2011 08:10:59 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jan 2011 08:10:59 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jan 2011 08:10:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id ADDAF2388A38; Sun, 16 Jan 2011 08:10:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1059508 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml
Date: Sun, 16 Jan 2011 08:10:30 -0000
To: hdfs-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110116081030.ADDAF2388A38@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cos
Date: Sun Jan 16 08:10:30 2011
New Revision: 1059508

URL: http://svn.apache.org/viewvc?rev=1059508&view=rev
Log:
HDFS-996. JUnit tests should never depend on anything in conf. Contributed by Konstantin Boudnik

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=1059508&r1=1059507&r2=1059508&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Sun Jan 16 08:10:30 2011
@@ -522,6 +522,8 @@ Release 0.21.1 - Unreleased
 
     HDFS-1552. Remove java5 dependencies from build. (cos) 
 
+    HDFS-996. JUnit tests should never depend on anything in conf (cos)
+
   INCOMPATIBLE CHANGES
 
     HDFS-538. Per the contract elucidated in HADOOP-6201, throw

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1059508&r1=1059507&r2=1059508&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Sun Jan 16 08:10:30 2011
@@ -93,6 +93,7 @@
   <property name="test.junit.printsummary" value="yes" />
   <property name="test.junit.haltonfailure" value="no" />
   <property name="test.junit.maxmemory" value="512m" />
+  <property name="test.conf.dir" value="${build.dir}/test/conf" />
 
   <property name="test.hdfs.build.classes" value="${test.build.dir}/hdfs/classes"/>
 
@@ -228,7 +229,9 @@
       <include name="hadoop-common-test-${hadoop-common.version}.jar" />
       <exclude name="**/excluded/" />
     </fileset>
-    <path refid="classpath"/>
+    <pathelement location="${build.classes}"/>
+    <pathelement location="${test.conf.dir}"/>
+    <path refid="ivy-common.classpath"/>
   </path>
 
   <!-- the cluster test classpath: uses conf.dir for configuration -->
@@ -288,6 +291,12 @@
       <mapper type="glob" from="*.template" to="*"/>
     </copy>
 
+    <mkdir dir="${test.conf.dir}"/>
+    <copy todir="${test.conf.dir}" verbose="true">
+      <fileset dir="${conf.dir}" includes="**/*.template"/>
+      <mapper type="glob" from="*.template" to="*"/>
+    </copy>
+
     <copy todir="${contrib.dir}" verbose="true">
       <fileset dir="${contrib.dir}" includes="**/*.template"/>
       <mapper type="glob" from="*.template" to="*"/>