tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject [1/2] tez git commit: TEZ-1762. Lots of unit tests do not have timeout parameter set (zjffdu)
Date Tue, 23 Dec 2014 01:38:44 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 e5e10a6d5 -> a23e740db


http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestInputIdentifiers.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestInputIdentifiers.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestInputIdentifiers.java
index b173054..6b82a9d 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestInputIdentifiers.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/TestInputIdentifiers.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 public class TestInputIdentifiers {
   
-  @Test
+  @Test(timeout = 5000)
   public void testInputAttemptIdentifier() {
     Set<InputAttemptIdentifier> set = new HashSet<InputAttemptIdentifier>();
     InputAttemptIdentifier i1 = new InputAttemptIdentifier(1, 1, InputAttemptIdentifier.PATH_PREFIX);

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java
index 441feff..fb887bf 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/comparator/TestProxyComparator.java
@@ -56,7 +56,7 @@ public class TestProxyComparator {
   public void cleanup() throws Exception {
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testProxyComparator() {
     final ProxyComparator<BytesWritable> comparator = new TezBytesComparator();
     BytesWritable lhs = new BytesWritable();

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
index 57d5e2c..43edf15 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestShuffleInputEventHandlerImpl.java
@@ -45,7 +45,7 @@ public class TestShuffleInputEventHandlerImpl {
   private static final int PORT = 8080;
   private static final String PATH_COMPONENT = "attempttmp";
 
-  @Test
+  @Test(timeout = 5000)
   public void testSimple() throws IOException {
     InputContext inputContext = mock(InputContext.class);
     ShuffleManager shuffleManager = mock(ShuffleManager.class);
@@ -67,7 +67,7 @@ public class TestShuffleInputEventHandlerImpl {
     verify(shuffleManager).addKnownInput(eq(HOST), eq(PORT), eq(expectedIdentifier), eq(0));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testCurrentPartitionEmpty() throws IOException {
     InputContext inputContext = mock(InputContext.class);
     ShuffleManager shuffleManager = mock(ShuffleManager.class);
@@ -88,7 +88,7 @@ public class TestShuffleInputEventHandlerImpl {
     verify(shuffleManager).addCompletedInputWithNoData(eq(expectedIdentifier));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testOtherPartitionEmpty() throws IOException {
     InputContext inputContext = mock(InputContext.class);
     ShuffleManager shuffleManager = mock(ShuffleManager.class);
@@ -108,7 +108,7 @@ public class TestShuffleInputEventHandlerImpl {
     verify(shuffleManager).addKnownInput(eq(HOST), eq(PORT), eq(expectedIdentifier), eq(0));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testMultipleEvents1() throws IOException {
     InputContext inputContext = mock(InputContext.class);
     ShuffleManager shuffleManager = mock(ShuffleManager.class);

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java
index be7fef6..a125378 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/impl/TestSimpleFetchedInputAllocator.java
@@ -36,7 +36,7 @@ public class TestSimpleFetchedInputAllocator {
 
   private static final Log LOG = LogFactory.getLog(TestSimpleFetchedInputAllocator.class);
   
-  @Test
+  @Test(timeout = 5000)
   public void testInMemAllocation() throws IOException {
     String localDirs = "/tmp/" + this.getClass().getName();
     Configuration conf = new Configuration();

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java
index 9915cbc..0c6c437 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestFetcher.java
@@ -211,7 +211,7 @@ public class TestFetcher {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testWithRetry() throws Exception {
     Configuration conf = new TezConfiguration();
     conf.setInt(TezRuntimeConfiguration.TEZ_RUNTIME_SHUFFLE_READ_TIMEOUT, 3000);

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestShuffleInputEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestShuffleInputEventHandler.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestShuffleInputEventHandler.java
index 504838c..b3334b4 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestShuffleInputEventHandler.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestShuffleInputEventHandler.java
@@ -83,7 +83,7 @@ public class TestShuffleInputEventHandler {
     handler = new ShuffleInputEventHandlerOrderedGrouped(inputContext, scheduler, false);
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void basicTest() throws IOException {
     List<Event> events = new LinkedList<Event>();
     int srcIdx = 0;
@@ -100,7 +100,7 @@ public class TestShuffleInputEventHandler {
         eq(baseUri), eq(expectedIdentifier));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testFailedEvent() throws IOException {
     List<Event> events = new LinkedList<Event>();
     int targetIdx = 1;
@@ -111,7 +111,7 @@ public class TestShuffleInputEventHandler {
     verify(scheduler).obsoleteInput(eq(expectedIdentifier));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testAllPartitionsEmpty() throws IOException {
     List<Event> events = new LinkedList<Event>();
     int srcIdx = 0;
@@ -126,7 +126,7 @@ public class TestShuffleInputEventHandler {
         eq(0l), eq(0l), any(MapOutput.class));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testCurrentPartitionEmpty() throws IOException {
     List<Event> events = new LinkedList<Event>();
     int srcIdx = 0;
@@ -142,7 +142,7 @@ public class TestShuffleInputEventHandler {
         eq(0l), eq(0l), any(MapOutput.class));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testOtherPartitionEmpty() throws IOException {
     List<Event> events = new LinkedList<Event>();
     int srcIdx = 0;

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
index 2518bbb..3bcdfc8 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/sort/impl/TestIFile.java
@@ -96,14 +96,14 @@ public class TestIFile {
     localFs.delete(workDir, true);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //empty IFile
   public void testWithEmptyIFile() throws IOException {
     testWriterAndReader(new LinkedList<KVPair>());
     testWithDataBuffer(new LinkedList<KVPair>());
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testCompressedFlag() throws IOException {
     byte[] HEADER = new byte[] { (byte) 'T', (byte) 'I', (byte) 'F' , (byte) 1};
     ByteArrayInputStream bin = new ByteArrayInputStream(HEADER);
@@ -121,7 +121,7 @@ public class TestIFile {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Write empty key value pairs
   public void testWritingEmptyKeyValues() throws IOException {
     DataInputBuffer key = new DataInputBuffer();
@@ -148,7 +148,7 @@ public class TestIFile {
     reader.close();
   }
 
-  @Test
+  @Test(timeout = 5000)
   //test with unsorted data and repeat keys
   public void testWithUnsortedData() throws IOException {
     List<KVPair> unsortedData = KVDataGen.generateTestData(false, rnd.nextInt(100));
@@ -156,7 +156,7 @@ public class TestIFile {
     testWithDataBuffer(unsortedData);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //test with sorted data and repeat keys
   public void testWithSortedData() throws IOException {
     List<KVPair> sortedData = KVDataGen.generateTestData(true, rnd.nextInt(100));
@@ -165,7 +165,7 @@ public class TestIFile {
   }
 
 
-  @Test
+  @Test(timeout = 5000)
   //test with sorted data and repeat keys
   public void testWithRLEMarker() throws IOException {
     //Test with append(Object, Object)
@@ -231,7 +231,7 @@ public class TestIFile {
     out.close();
   }
 
-  @Test
+  @Test(timeout = 5000)
   //test with unique keys
   public void testWithUniqueKeys() throws IOException {
     //all keys are unique
@@ -240,7 +240,7 @@ public class TestIFile {
     testWithDataBuffer(sortedData);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Test InMemoryWriter
   public void testInMemoryWriter() throws IOException {
     InMemoryWriter writer = null;
@@ -272,7 +272,7 @@ public class TestIFile {
     readUsingInMemoryReader(bout.getBuffer(), data);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Test appendValue feature
   public void testAppendValue() throws IOException {
     List<KVPair> data = KVDataGen.generateTestData(false, rnd.nextInt(100));
@@ -294,7 +294,7 @@ public class TestIFile {
     readAndVerifyData(writer.getRawLength(), writer.getCompressedLength(), data, codec);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Test appendValues feature
   public void testAppendValues() throws IOException {
     List<KVPair> data = new ArrayList<KVPair>();
@@ -322,7 +322,7 @@ public class TestIFile {
     readAndVerifyData(writer.getRawLength(), writer.getCompressedLength(), data, codec);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Test appendKeyValues feature
   public void testAppendKeyValues() throws IOException {
     List<KVPair> data = new ArrayList<KVPair>();
@@ -349,7 +349,7 @@ public class TestIFile {
     readAndVerifyData(writer.getRawLength(), writer.getCompressedLength(), data, codec);
   }
 
-  @Test
+  @Test(timeout = 5000)
   //Test appendValue with DataInputBuffer
   public void testAppendValueWithDataInputBuffer() throws IOException {
     List<KVPair> data = KVDataGen.generateTestData(false, rnd.nextInt(100));

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedGroupedMergedKVInputConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedGroupedMergedKVInputConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedGroupedMergedKVInputConfig.java
index 7ea5f90..674d4b4 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedGroupedMergedKVInputConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedGroupedMergedKVInputConfig.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 public class TestOrderedGroupedMergedKVInputConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       OrderedGroupedKVInputConfig.newBuilder(null, "VALUE");
@@ -52,7 +52,7 @@ public class TestOrderedGroupedMergedKVInputConfig {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSetters() {
     Configuration fromConf = new Configuration(false);
     fromConf.set("test.conf.key.1", "confkey1");
@@ -111,7 +111,7 @@ public class TestOrderedGroupedMergedKVInputConfig {
     assertNull(conf.get("test.key.2"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testDefaultConfigsUsed() {
     OrderedGroupedKVInputConfig.Builder builder =
         OrderedGroupedKVInputConfig.newBuilder("KEY", "VALUE");
@@ -134,7 +134,7 @@ public class TestOrderedGroupedMergedKVInputConfig {
     assertEquals("VALUE", conf.get(TezRuntimeConfiguration.TEZ_RUNTIME_VALUE_CLASS, ""));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testCombinerConfigs() {
     Map<String, String> combinerConf = Maps.newHashMap();
     combinerConf.put("combiner.test.key", "COMBINERKEY");

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVEdgeConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVEdgeConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVEdgeConfig.java
index 35fd3cb..c72dd52 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVEdgeConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVEdgeConfig.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 
 public class TestOrderedPartitionedKVEdgeConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       OrderedPartitionedKVEdgeConfig.newBuilder(null, "VALUE", "PARTITIONER");

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVOutputConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVOutputConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVOutputConfig.java
index 68690ea..ac31cf5 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVOutputConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestOrderedPartitionedKVOutputConfig.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 public class TestOrderedPartitionedKVOutputConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       OrderedPartitionedKVOutputConfig.newBuilder(
@@ -62,7 +62,7 @@ public class TestOrderedPartitionedKVOutputConfig {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSetters() {
     Configuration fromConf = new Configuration(false);
     fromConf.set("test.conf.key.1", "confkey1");
@@ -117,7 +117,7 @@ public class TestOrderedPartitionedKVOutputConfig {
     assertNull(conf.get("test.key.2"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testDefaultConfigsUsed() {
     OrderedPartitionedKVOutputConfig.Builder builder =
         OrderedPartitionedKVOutputConfig.newBuilder("KEY", "VALUE", "PARTITIONER", null);
@@ -141,7 +141,7 @@ public class TestOrderedPartitionedKVOutputConfig {
     assertEquals("PARTITIONER", conf.get(TezRuntimeConfiguration.TEZ_RUNTIME_PARTITIONER_CLASS,
""));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testPartitionerConfigs() {
     Map<String, String> partitionerConf = Maps.newHashMap();
     partitionerConf.put("partitioner.test.key", "PARTITIONERKEY");
@@ -165,7 +165,7 @@ public class TestOrderedPartitionedKVOutputConfig {
     assertEquals("PARTITIONERKEY", conf.get("partitioner.test.key"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testCombinerConfigs() {
     Map<String, String> combinerConf = Maps.newHashMap();
     combinerConf.put("combiner.test.key", "COMBINERKEY");

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVInputConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVInputConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVInputConfig.java
index 4c8c4fb..5e6e8e9 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVInputConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVInputConfig.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 
 public class TestUnorderedKVInputConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       UnorderedKVInputConfig.newBuilder(null, "VALUE");
@@ -51,7 +51,7 @@ public class TestUnorderedKVInputConfig {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSetters() {
     Configuration fromConf = new Configuration(false);
     fromConf.set("test.conf.key.1", "confkey1");
@@ -106,7 +106,7 @@ public class TestUnorderedKVInputConfig {
     assertNull(conf.get("test.key.2"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testDefaultConfigsUsed() {
     UnorderedKVInputConfig.Builder builder =
         UnorderedKVInputConfig.newBuilder("KEY", "VALUE");

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVOutputConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVOutputConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVOutputConfig.java
index 8588ef1..10ed199 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVOutputConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedKVOutputConfig.java
@@ -34,7 +34,7 @@ import org.junit.Test;
 
 public class TestUnorderedKVOutputConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       UnorderedKVOutputConfig.newBuilder(
@@ -53,7 +53,7 @@ public class TestUnorderedKVOutputConfig {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSetters() {
     Configuration fromConf = new Configuration(false);
     fromConf.set("test.conf.key.1", "confkey1");
@@ -102,7 +102,7 @@ public class TestUnorderedKVOutputConfig {
     assertNull(conf.get("test.key.2"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testDefaultConfigsUsed() {
     UnorderedKVOutputConfig.Builder builder =
         UnorderedKVOutputConfig

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedPartitionedKVOutputConfig.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedPartitionedKVOutputConfig.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedPartitionedKVOutputConfig.java
index 1b7c65f..83ea707 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedPartitionedKVOutputConfig.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/conf/TestUnorderedPartitionedKVOutputConfig.java
@@ -36,7 +36,7 @@ import org.junit.Test;
 
 public class TestUnorderedPartitionedKVOutputConfig {
 
-  @Test
+  @Test(timeout = 5000)
   public void testNullParams() {
     try {
       UnorderedPartitionedKVOutputConfig.newBuilder(
@@ -63,7 +63,7 @@ public class TestUnorderedPartitionedKVOutputConfig {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSetters() {
     Configuration fromConf = new Configuration(false);
     fromConf.set("test.conf.key.1", "confkey1");
@@ -118,7 +118,7 @@ public class TestUnorderedPartitionedKVOutputConfig {
     assertNull(conf.get("test.key.2"));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testDefaultConfigsUsed() {
     UnorderedPartitionedKVOutputConfig.Builder builder =
         UnorderedPartitionedKVOutputConfig
@@ -150,7 +150,7 @@ public class TestUnorderedPartitionedKVOutputConfig {
     assertNull(conf.get(TezRuntimeConfiguration.TEZ_RUNTIME_KEY_COMPARATOR_CLASS));
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testPartitionerConfigs() {
     Map<String, String> partitionerConf = Maps.newHashMap();
     partitionerConf.put("partitioner.test.key", "PARTITIONERKEY");

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/input/TestSortedGroupedMergedInput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/input/TestSortedGroupedMergedInput.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/input/TestSortedGroupedMergedInput.java
index cde0bd2..570deb7 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/input/TestSortedGroupedMergedInput.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/input/TestSortedGroupedMergedInput.java
@@ -46,7 +46,7 @@ public class TestSortedGroupedMergedInput {
         mock(InputReadyTracker.class), null);
   }
   
-  @Test
+  @Test(timeout = 5000)
   public void testSimple() throws Exception {
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] { 1, 2,
3 },
         new int[][] { { 1, 1 }, { 2, 2 }, { 3, 3 } });
@@ -84,7 +84,7 @@ public class TestSortedGroupedMergedInput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSkippedKey() throws Exception {
 
 
@@ -128,7 +128,7 @@ public class TestSortedGroupedMergedInput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testPartialValuesSkip() throws Exception {
 
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] { 1, 2,
3 },
@@ -174,7 +174,7 @@ public class TestSortedGroupedMergedInput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testOrdering() throws Exception {
 
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] { 2, 4
},
@@ -225,7 +225,7 @@ public class TestSortedGroupedMergedInput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testSkippedKey2() throws Exception {
 
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] { 2, 4
},
@@ -280,7 +280,7 @@ public class TestSortedGroupedMergedInput {
   }
   
   // Reads all values for a key, but doesn't trigger the last hasNext() call.
-  @Test
+  @Test(timeout = 5000)
   public void testSkippedKey3() throws Exception {
 
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] { 1, 2,
3, 4 },
@@ -326,7 +326,7 @@ public class TestSortedGroupedMergedInput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testEmptySources() throws Exception {
 
     SortedTestKeyValuesReader kvsReader1 = new SortedTestKeyValuesReader(new int[] {},

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java
index 905fdb9..cd02655 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileSortedOutput.java
@@ -158,7 +158,7 @@ public class TestOnFileSortedOutput {
     writer = sortedOutput.getWriter();
   }
 
-  @Test
+  @Test (timeout = 5000)
   public void testSortBufferSize() throws Exception{
     OutputContext context = createTezOutputContext();
     conf.setInt(TezRuntimeConfiguration.TEZ_RUNTIME_IO_SORT_MB, 2048);
@@ -183,7 +183,7 @@ public class TestOnFileSortedOutput {
     }
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void baseTest() throws Exception {
     startSortedOutput(partitions);
 
@@ -210,7 +210,7 @@ public class TestOnFileSortedOutput {
     assertEquals(UniqueID, payload.getPathComponent());
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testWithSomeEmptyPartition() throws Exception {
     //ensure atleast 2 partitions are available
     partitions = Math.max(2, partitions);
@@ -238,7 +238,7 @@ public class TestOnFileSortedOutput {
     assertEquals(UniqueID, payload.getPathComponent());
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testAllEmptyPartition() throws Exception {
     startSortedOutput(partitions);
 

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
----------------------------------------------------------------------
diff --git a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
index 9e053da..b5d1975 100644
--- a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
+++ b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/output/TestOnFileUnorderedKVOutput.java
@@ -91,7 +91,7 @@ public class TestOnFileUnorderedKVOutput {
     localFs.delete(workDir, true);
   }
 
-  @Test
+  @Test(timeout = 5000)
   public void testGeneratedDataMovementEvent() throws Exception {
     Configuration conf = new Configuration();
     conf.set(TezRuntimeConfiguration.TEZ_RUNTIME_KEY_CLASS, Text.class.getName());

http://git-wip-us.apache.org/repos/asf/tez/blob/a23e740d/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java
index 86dcc64..c32d311 100644
--- a/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java
+++ b/tez-tests/src/test/java/org/apache/tez/mapreduce/TestMRRJobsDAGApi.java
@@ -271,7 +271,7 @@ public class TestMRRJobsDAGApi {
   }
   
   
-  @Test
+  @Test(timeout = 60000)
   public void testNonDefaultFSStagingDir() throws Exception {
     SleepProcessorConfig spConf = new SleepProcessorConfig(1);
 


Mime
View raw message