hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject hadoop git commit: HADOOP-14377. Increase Common test timeouts from 1 second to 10 seconds. Contributed by Eric Badger
Date Tue, 09 May 2017 21:24:00 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 5b8564f98 -> 7489f0fd1


HADOOP-14377. Increase Common test timeouts from 1 second to 10 seconds. Contributed by Eric
Badger

(cherry picked from commit f9ba4ef7d5e50be86ffca71b6c4bbc5575f64326)

Conflicts:
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7489f0fd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7489f0fd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7489f0fd

Branch: refs/heads/branch-2.8
Commit: 7489f0fd1abcaac7da3ab06cc89f20eb8f58cd54
Parents: 5b8564f
Author: Jason Lowe <jlowe@yahoo-inc.com>
Authored: Tue May 9 16:08:34 2017 -0500
Committer: Jason Lowe <jlowe@yahoo-inc.com>
Committed: Tue May 9 16:23:31 2017 -0500

----------------------------------------------------------------------
 .../crypto/TestCryptoStreamsForLocalFS.java       | 10 +++++-----
 .../hadoop/crypto/TestCryptoStreamsNormal.java    | 16 ++++++++--------
 .../hadoop/fs/TestSymlinkLocalFSFileSystem.java   |  8 ++++----
 .../apache/hadoop/io/TestSortedMapWritable.java   |  2 +-
 .../apache/hadoop/io/compress/TestCodecPool.java  | 12 ++++++------
 .../hadoop/security/TestUserGroupInformation.java |  2 +-
 .../hadoop/service/TestCompositeService.java      | 18 +++++++++---------
 .../org/apache/hadoop/util/TestClassUtil.java     |  2 +-
 .../org/apache/hadoop/portmap/TestPortmap.java    |  4 ++--
 9 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java
index 235e9c2..1ef6f3c 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsForLocalFS.java
@@ -88,28 +88,28 @@ public class TestCryptoStreamsForLocalFS extends CryptoStreamsTestBase
{
   
   @Ignore("ChecksumFSInputChecker doesn't support ByteBuffer read")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testByteBufferRead() throws Exception {}
   
   @Ignore("ChecksumFSOutputSummer doesn't support Syncable")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSyncable() throws IOException {}
   
   @Ignore("ChecksumFSInputChecker doesn't support ByteBuffer read")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCombinedOp() throws Exception {}
   
   @Ignore("ChecksumFSInputChecker doesn't support enhanced ByteBuffer access")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testHasEnhancedByteBufferAccess() throws Exception {
   }
   
   @Ignore("ChecksumFSInputChecker doesn't support seekToNewSource")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSeekToNewSource() throws Exception {
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java
index e9c313f..b5382c1 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/TestCryptoStreamsNormal.java
@@ -83,41 +83,41 @@ public class TestCryptoStreamsNormal extends CryptoStreamsTestBase {
   
   @Ignore("Wrapped stream doesn't support Syncable")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSyncable() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support PositionedRead")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testPositionedRead() throws IOException {}
 
   @Ignore("Wrapped stream doesn't support ReadFully")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testReadFully() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support Seek")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSeek() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support ByteBufferRead")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testByteBufferRead() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support ByteBufferRead, Seek")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCombinedOp() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support SeekToNewSource")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSeekToNewSource() throws IOException {}
   
   @Ignore("Wrapped stream doesn't support HasEnhancedByteBufferAccess")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testHasEnhancedByteBufferAccess() throws IOException {}
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java
index a945ddd..2bb5574 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestSymlinkLocalFSFileSystem.java
@@ -42,24 +42,24 @@ public class TestSymlinkLocalFSFileSystem extends TestSymlinkLocalFS {
   @Ignore("RawLocalFileSystem#mkdir does not treat existence of directory" +
       " as an error")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testMkdirExistingLink() throws IOException {}
 
   @Ignore("FileSystem#create defaults to creating parents," +
       " throwing an IOException instead of FileNotFoundException")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCreateFileViaDanglingLinkParent() throws IOException {}
 
   @Ignore("RawLocalFileSystem does not throw an exception if the path" +
       " already exists")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testCreateFileDirExistingLink() throws IOException {}
   
   @Ignore("ChecksumFileSystem does not support append")
   @Override
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testAccessFileViaInterSymlinkAbsTarget() throws IOException {}
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
index 5ed1db2..023d46e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSortedMapWritable.java
@@ -165,7 +165,7 @@ public class TestSortedMapWritable {
     assertTrue(failureReason, !mapB.equals(mapA));
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testPutAll() {
     SortedMapWritable map1 = new SortedMapWritable();
     SortedMapWritable map2 = new SortedMapWritable();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java
index c889a59..1fb25cb 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java
@@ -43,7 +43,7 @@ public class TestCodecPool {
     this.codec.setConf(new Configuration());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testCompressorPoolCounts() {
     // Get two compressors and return them
     Compressor comp1 = CodecPool.getCompressor(codec);
@@ -64,7 +64,7 @@ public class TestCodecPool {
         CodecPool.getLeasedCompressorsCount(codec));
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testCompressorNotReturnSameInstance() {
     Compressor comp = CodecPool.getCompressor(codec);
     CodecPool.returnCompressor(comp);
@@ -79,7 +79,7 @@ public class TestCodecPool {
     }
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testDecompressorPoolCounts() {
     // Get two decompressors and return them
     Decompressor decomp1 = CodecPool.getDecompressor(codec);
@@ -100,7 +100,7 @@ public class TestCodecPool {
         CodecPool.getLeasedCompressorsCount(codec));
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testMultiThreadedCompressorPool() throws InterruptedException {
     final int iterations = 4;
     ExecutorService threadpool = Executors.newFixedThreadPool(3);
@@ -137,7 +137,7 @@ public class TestCodecPool {
     assertEquals(LEASE_COUNT_ERR, 0, CodecPool.getLeasedCompressorsCount(codec));
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testMultiThreadedDecompressorPool() throws InterruptedException {
     final int iterations = 4;
     ExecutorService threadpool = Executors.newFixedThreadPool(3);
@@ -175,7 +175,7 @@ public class TestCodecPool {
         CodecPool.getLeasedDecompressorsCount(codec));
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testDecompressorNotReturnSameInstance() {
     Decompressor decomp = CodecPool.getDecompressor(codec);
     CodecPool.returnDecompressor(decomp);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
index 9f5de14..c3e02bc 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestUserGroupInformation.java
@@ -822,7 +822,7 @@ public class TestUserGroupInformation {
     assertEquals("guest@DEFAULT.REALM", ugi.getUserName());
   }
 
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testSetLoginUser() throws IOException {
     UserGroupInformation ugi = UserGroupInformation.createRemoteUser("test-user");
     UserGroupInformation.setLoginUser(ugi);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java
index f2ede7d..c0a325a 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/TestCompositeService.java
@@ -312,7 +312,7 @@ public class TestCompositeService {
     assertInState(STATE.INITED, child);
   }
 
-  @Test (timeout = 1000)
+  @Test (timeout = 10000)
   public void testAddIfService() {
     CompositeService testService = new CompositeService("TestService") {
       Service service;
@@ -332,7 +332,7 @@ public class TestCompositeService {
                  1, testService.getServices().size());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddInitedSiblingInInit() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();
@@ -347,7 +347,7 @@ public class TestCompositeService {
                  2, parent.getServices().size());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddUninitedSiblingInInit() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();
@@ -393,7 +393,7 @@ public class TestCompositeService {
         2, testService.getServices().size());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddStartedChildBeforeInit() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService child = new BreakableService();
@@ -409,7 +409,7 @@ public class TestCompositeService {
     parent.stop();
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddStoppedChildBeforeInit() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService child = new BreakableService();
@@ -426,7 +426,7 @@ public class TestCompositeService {
     parent.stop();
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddStartedSiblingInStart() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();
@@ -442,7 +442,7 @@ public class TestCompositeService {
                  2, parent.getServices().size());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddUninitedSiblingInStart() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();
@@ -457,7 +457,7 @@ public class TestCompositeService {
                  2, parent.getServices().size());
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddStartedSiblingInInit() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();
@@ -476,7 +476,7 @@ public class TestCompositeService {
     assertInState(STATE.STOPPED, sibling);
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testAddStartedSiblingInStop() throws Throwable {
     CompositeService parent = new CompositeService("parent");
     BreakableService sibling = new BreakableService();

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
index 4bc36e2..98e1822 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
 import org.junit.Test;
 
 public class TestClassUtil {
-  @Test(timeout=1000)
+  @Test(timeout=10000)
   public void testFindContainingJar() {
     String containingJar = ClassUtil.findContainingJar(Logger.class);
     Assert.assertNotNull("Containing jar not found for Logger", 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7489f0fd/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java
b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java
index f217e84..ba132bb 100644
--- a/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java
+++ b/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/portmap/TestPortmap.java
@@ -53,7 +53,7 @@ public class TestPortmap {
     pm.shutdown();
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testIdle() throws InterruptedException, IOException {
     Socket s = new Socket();
     try {
@@ -75,7 +75,7 @@ public class TestPortmap {
     }
   }
 
-  @Test(timeout = 1000)
+  @Test(timeout = 10000)
   public void testRegistration() throws IOException, InterruptedException {
     XDR req = new XDR();
     RpcCall.getInstance(++xid, RpcProgramPortmap.PROGRAM,


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message