From 7dd201c541c811069a898403cf28a50152a38737 Mon Sep 17 00:00:00 2001 From: Bikas Saha Date: Tue, 29 Oct 2013 21:11:32 +0000 Subject: [PATCH] Fix inadvertent file changes made via r1536888 (bikas) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1536894 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop/mapreduce/lib/input/TestCombineTextInputFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineTextInputFormat.java index d36b30f863b..0b44ca610a9 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestCombineTextInputFormat.java @@ -72,7 +72,7 @@ public class TestCombineTextInputFormat { new Path(new Path(System.getProperty("test.build.data", "."), "data"), "TestCombineTextInputFormat"); - @Test//(timeout=10000) + @Test(timeout=10000) public void testFormat() throws Exception { Job job = Job.getInstance(new Configuration(defaultConf));