Browse Source

MAPREDUCE-6172. TestDbClasses timeouts are too aggressive. Contributed by Varun Saxena
(cherry picked from commit 2b30fb1053e70c128b98013fb63cf9a095623be6)

Jason Lowe 10 years ago
parent
commit
2bdef5697b

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -28,6 +28,9 @@ Release 2.7.0 - UNRELEASED
     correctly in case the number of mappers or reducers is zero. (MinJi Kim via
     correctly in case the number of mappers or reducers is zero. (MinJi Kim via
     jianhe)
     jianhe)
  
  
+    MAPREDUCE-6172. TestDbClasses timeouts are too aggressive (Varun Saxena
+    via jlowe)
+
 Release 2.6.0 - 2014-11-18
 Release 2.6.0 - 2014-11-18
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 4 - 4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/db/TestDbClasses.java

@@ -39,7 +39,7 @@ public class TestDbClasses {
    * test splitters from DataDrivenDBInputFormat. For different data types may
    * test splitters from DataDrivenDBInputFormat. For different data types may
    * be different splitter
    * be different splitter
    */
    */
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testDataDrivenDBInputFormatSplitter() {
   public void testDataDrivenDBInputFormatSplitter() {
     DataDrivenDBInputFormat<NullDBWritable> format = new DataDrivenDBInputFormat<NullDBWritable>();
     DataDrivenDBInputFormat<NullDBWritable> format = new DataDrivenDBInputFormat<NullDBWritable>();
     testCommonSplitterTypes(format);
     testCommonSplitterTypes(format);
@@ -49,7 +49,7 @@ public class TestDbClasses {
     assertEquals(DateSplitter.class, format.getSplitter(Types.TIME).getClass());
     assertEquals(DateSplitter.class, format.getSplitter(Types.TIME).getClass());
   }
   }
 
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testDataDrivenDBInputFormat() throws Exception {
   public void testDataDrivenDBInputFormat() throws Exception {
     JobContext jobContext = mock(JobContext.class);
     JobContext jobContext = mock(JobContext.class);
     Configuration configuration = new Configuration();
     Configuration configuration = new Configuration();
@@ -79,7 +79,7 @@ public class TestDbClasses {
         configuration.get(DBConfiguration.INPUT_BOUNDING_QUERY));
         configuration.get(DBConfiguration.INPUT_BOUNDING_QUERY));
   }
   }
 
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testOracleDataDrivenDBInputFormat() throws Exception {
   public void testOracleDataDrivenDBInputFormat() throws Exception {
     OracleDataDrivenDBInputFormat<NullDBWritable> format = 
     OracleDataDrivenDBInputFormat<NullDBWritable> format = 
         new OracleDataDrivenDBInputFormatForTest();
         new OracleDataDrivenDBInputFormatForTest();
@@ -96,7 +96,7 @@ public class TestDbClasses {
    * test generate sql script for OracleDBRecordReader.
    * test generate sql script for OracleDBRecordReader.
    */
    */
 
 
-  @Test(timeout = 2000)
+  @Test(timeout = 20000)
   public void testOracleDBRecordReader() throws Exception {
   public void testOracleDBRecordReader() throws Exception {
     DBInputSplit splitter = new DBInputSplit(1, 10);
     DBInputSplit splitter = new DBInputSplit(1, 10);
     Configuration configuration = new Configuration();
     Configuration configuration = new Configuration();