Merge ece7cde into 927f0ca

apache · Dec 16, 2016 · 21cb299 · 21cb299
2 parents 927f0ca + ece7cde
commit 21cb299
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/TestInterleavedReaders.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/TestInterleavedReaders.java
@@ -337,7 +337,7 @@ public void testInterleavedReadersWithRollingEdgeUnPartitioned() throws Exceptio
         dlmreader1.close();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testFactorySharedClients() throws Exception {
         String name = "distrlog-factorysharedclients";
         testFactory(name, true);

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/TestTruncate.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/TestTruncate.java
@@ -111,7 +111,7 @@ public void testPurgeLogs() throws Exception {
         distributedLogManager.close();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testTruncation() throws Exception {
         String name = "distrlog-truncation";
 
@@ -143,7 +143,7 @@ public void testTruncation() throws Exception {
         pair.getLeft().close();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testExplicitTruncation() throws Exception {
         String name = "distrlog-truncation-explicit";
 

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/TestWriteLimiter.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/TestWriteLimiter.java
@@ -43,7 +43,7 @@ SimplePermitLimiter createPermitLimiter(boolean darkmode, int permits, Feature f
         return new SimplePermitLimiter(darkmode, permits, new NullStatsLogger(), false, feature);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testGlobalOnly() throws Exception {
         SimplePermitLimiter streamLimiter = createPermitLimiter(false, Integer.MAX_VALUE);
         SimplePermitLimiter globalLimiter = createPermitLimiter(false, 1);
@@ -59,7 +59,7 @@ public void testGlobalOnly() throws Exception {
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testStreamOnly() throws Exception {
         SimplePermitLimiter streamLimiter = createPermitLimiter(false, 1);
         SimplePermitLimiter globalLimiter = createPermitLimiter(false, Integer.MAX_VALUE);
@@ -73,7 +73,7 @@ public void testStreamOnly() throws Exception {
         assertPermits(streamLimiter, 1, globalLimiter, 1);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testDarkmode() throws Exception {
         SimplePermitLimiter streamLimiter = createPermitLimiter(true, Integer.MAX_VALUE);
         SimplePermitLimiter globalLimiter = createPermitLimiter(true, 1);
@@ -83,7 +83,7 @@ public void testDarkmode() throws Exception {
         assertPermits(streamLimiter, 2, globalLimiter, 2);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testDarkmodeWithDisabledFeature() throws Exception {
         SettableFeature feature = new SettableFeature("test", 10000);
         SimplePermitLimiter streamLimiter = createPermitLimiter(true, 1, feature);
@@ -97,7 +97,7 @@ public void testDarkmodeWithDisabledFeature() throws Exception {
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testDisabledFeature() throws Exception {
         // Disable darkmode, but should still ignore limits because of the feature.
         SettableFeature feature = new SettableFeature("test", 10000);
@@ -112,7 +112,7 @@ public void testDisabledFeature() throws Exception {
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testSetDisableFeatureAfterAcquireAndBeforeRelease() throws Exception {
         SettableFeature feature = new SettableFeature("test", 0);
         SimplePermitLimiter streamLimiter = createPermitLimiter(false, 2, feature);
@@ -127,7 +127,7 @@ public void testSetDisableFeatureAfterAcquireAndBeforeRelease() throws Exception
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testUnsetDisableFeatureAfterPermitsExceeded() throws Exception {
         SettableFeature feature = new SettableFeature("test", 10000);
         SimplePermitLimiter streamLimiter = createPermitLimiter(false, 1, feature);
@@ -153,7 +153,7 @@ public void testUnsetDisableFeatureAfterPermitsExceeded() throws Exception {
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testUnsetDisableFeatureBeforePermitsExceeded() throws Exception {
         SettableFeature feature = new SettableFeature("test", 0);
         SimplePermitLimiter streamLimiter = createPermitLimiter(false, 1, feature);
@@ -171,7 +171,7 @@ public void testUnsetDisableFeatureBeforePermitsExceeded() throws Exception {
         assertPermits(streamLimiter, 2, globalLimiter, 2);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testDarkmodeGlobalUnderStreamOver() throws Exception {
         SimplePermitLimiter streamLimiter = createPermitLimiter(true, 1);
         SimplePermitLimiter globalLimiter = createPermitLimiter(true, 2);
@@ -184,7 +184,7 @@ public void testDarkmodeGlobalUnderStreamOver() throws Exception {
         assertPermits(streamLimiter, 0, globalLimiter, 0);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testDarkmodeGlobalOverStreamUnder() throws Exception {
         SimplePermitLimiter streamLimiter = createPermitLimiter(true, 2);
         SimplePermitLimiter globalLimiter = createPermitLimiter(true, 1);

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/bk/TestLedgerAllocatorPool.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/bk/TestLedgerAllocatorPool.java
@@ -258,7 +258,7 @@ public void testAllocateMultipleLedgers() throws Exception {
         assertEquals(numLedgers, allocatedLedgers.size());
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testConcurrentAllocation() throws Exception {
         final int numAllocators = 5;
         String allocationPath = "/concurrentAllocation";

diff --git a/...core/src/test/java/com/twitter/distributedlog/config/TestConcurrentBaseConfiguration.java b/...core/src/test/java/com/twitter/distributedlog/config/TestConcurrentBaseConfiguration.java
@@ -26,7 +26,7 @@
 public class TestConcurrentBaseConfiguration {
     static final Logger LOG = LoggerFactory.getLogger(TestConcurrentBaseConfiguration.class);
 
-    @Test
+    @Test(timeout = 20000)
     public void testBasicOperations() throws Exception {
         ConcurrentBaseConfiguration conf = new ConcurrentBaseConfiguration();
         conf.setProperty("prop1", "1");

diff --git a/...ibutedlog-core/src/test/java/com/twitter/distributedlog/impl/TestZKLogSegmentFilters.java b/...ibutedlog-core/src/test/java/com/twitter/distributedlog/impl/TestZKLogSegmentFilters.java
@@ -37,7 +37,7 @@ public class TestZKLogSegmentFilters {
 
     static final Logger LOG = LoggerFactory.getLogger(TestZKLogSegmentFilters.class);
 
-    @Test
+    @Test(timeout = 60000)
     public void testWriteFilter() {
         Set<String> expectedFilteredSegments = new HashSet<String>();
         List<String> segments = new ArrayList<String>();

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/limiter/TestRequestLimiter.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/limiter/TestRequestLimiter.java
@@ -39,7 +39,7 @@ public int getCount() {
         }
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testChainedRequestLimiter() throws Exception {
         MockRequestLimiter limiter1 = new MockRequestLimiter();
         MockRequestLimiter limiter2 = new MockRequestLimiter();

diff --git a/...src/test/java/com/twitter/distributedlog/metadata/TestLogSegmentMetadataStoreUpdater.java b/...src/test/java/com/twitter/distributedlog/metadata/TestLogSegmentMetadataStoreUpdater.java
@@ -225,7 +225,7 @@ public void testUpdateLastDLSN() throws Exception {
         assertEquals(inprogressLogSegment, readInprogressLogSegment);
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testChangeTruncationStatus() throws Exception {
         String ledgerPath = "/ledgers2";
         zkc.get().create(ledgerPath, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/util/TestConfUtils.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/util/TestConfUtils.java
@@ -25,7 +25,7 @@
 
 public class TestConfUtils {
 
-    @Test
+    @Test(timeout = 60000)
     public void testLoadConfiguration() {
         Configuration conf1 = new CompositeConfiguration();
         conf1.setProperty("key1", "value1");

diff --git a/distributedlog-core/src/test/java/com/twitter/distributedlog/util/TestPermitManager.java b/distributedlog-core/src/test/java/com/twitter/distributedlog/util/TestPermitManager.java
@@ -29,7 +29,7 @@
 
 public class TestPermitManager {
 
-    @Test
+    @Test(timeout = 60000)
     public void testUnlimitedPermitManager() {
         PermitManager pm = PermitManager.UNLIMITED_PERMIT_MANAGER;
         List<PermitManager.Permit> permits = new ArrayList<PermitManager.Permit>();
@@ -53,7 +53,7 @@ public void testUnlimitedPermitManager() {
         }
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testLimitedPermitManager() {
         ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
         PermitManager pm = new LimitedPermitManager(1, 0, TimeUnit.SECONDS, executorService);

diff --git a/...tedlog-core/src/test/java/com/twitter/distributedlog/util/TestSafeQueueingFuturePool.java b/...tedlog-core/src/test/java/com/twitter/distributedlog/util/TestSafeQueueingFuturePool.java
@@ -73,7 +73,7 @@ public void shutdown() {
         }
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testSimpleSuccess() throws Exception {
         TestFuturePool<Void> pool = new TestFuturePool<Void>();
         final AtomicBoolean result = new AtomicBoolean(false);
@@ -88,7 +88,7 @@ public Void apply() {
         pool.shutdown();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testSimpleFailure() throws Exception {
         TestFuturePool<Void> pool = new TestFuturePool<Void>();
         Future<Void> future = pool.wrapper.apply(new Function0<Void>() {
@@ -104,7 +104,7 @@ public Void apply() {
         pool.shutdown();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testFailedDueToClosed() throws Exception {
         TestFuturePool<Void> pool = new TestFuturePool<Void>();
         pool.wrapper.close();
@@ -121,7 +121,7 @@ public Void apply() {
         pool.shutdown();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testRejectedFailure() throws Exception {
         TestFuturePool<Void> pool = new TestFuturePool<Void>();
         final AtomicBoolean result = new AtomicBoolean(false);
@@ -146,7 +146,7 @@ public Void apply() {
         pool.shutdown();
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testRejectedBackupFailure() throws Exception {
         TestFuturePool<Void> pool = new TestFuturePool<Void>();
         final AtomicBoolean result = new AtomicBoolean(false);

diff --git a/...og-service/src/test/java/com/twitter/distributedlog/service/stream/TestStreamManager.java b/...og-service/src/test/java/com/twitter/distributedlog/service/stream/TestStreamManager.java
@@ -100,7 +100,7 @@ public void testCollectionMethods() throws Exception {
         assertEquals(0, streamManager.numCached());
     }
 
-    @Test
+    @Test(timeout = 60000)
     public void testCreateStream() throws Exception {
         Stream mockStream = mock(Stream.class);
         final String streamName = "stream1";