You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2012/12/29 16:31:48 UTC
svn commit: r1426772 [2/2] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/
bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/
bookkeeper-server/src/test/java/org/apache/bookkeeper/clie...
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java Sat Dec 29 15:31:46 2012
@@ -357,7 +357,7 @@ public class TestBackwardCompat {
/*
* Test old cookie accessing the new version formatted cluster.
*/
- @Test
+ @Test(timeout=60000)
public void testOldCookieAccessingNewCluster() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -415,7 +415,7 @@ public class TestBackwardCompat {
* - 4.0.0 client will not be able to fence ledgers on current server.
* - Current server won't start with 4.0.0 server directories without upgrade.
*/
- @Test
+ @Test(timeout=60000)
public void testCompat400() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -503,7 +503,7 @@ public class TestBackwardCompat {
* version due to a change in the ledger metadata format.
* - Otherwise, they should be compatible.
*/
- @Test
+ @Test(timeout=60000)
public void testCompat410() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestDiskChecker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestDiskChecker.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestDiskChecker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestDiskChecker.java Sat Dec 29 15:31:46 2012
@@ -83,7 +83,7 @@ public class TestDiskChecker {
/**
* Check disk error for valid dir.
*/
- @Test
+ @Test(timeout=60000)
public void testCheckDiskErrorForDir() throws Exception {
File parent = File.createTempFile("DiskCheck", "test");
parent.delete();
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestFileUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestFileUtils.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestFileUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestFileUtils.java Sat Dec 29 15:31:46 2012
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
public class TestFileUtils extends TestCase {
- @Test
+ @Test(timeout=60000)
public void testCreateTmpDirectory() throws Exception {
String prefix = "abc";
String suffix = "def";
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java Sat Dec 29 15:31:46 2012
@@ -32,35 +32,35 @@ public class TestHedwigSocketAddress ext
private int invalidPort = -9999;
private String COLON = ":";
- @Test
+ @Test(timeout=60000)
public void testCreateWithSSLPort() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress(hostname, port, sslPort);
assertTrue(addr.getSocketAddress().equals(new InetSocketAddress(hostname, port)));
assertTrue(addr.getSSLSocketAddress().equals(new InetSocketAddress(hostname, sslPort)));
}
- @Test
+ @Test(timeout=60000)
public void testCreateWithNoSSLPort() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress(hostname, port);
assertTrue(addr.getSocketAddress().equals(new InetSocketAddress(hostname, port)));
assertTrue(addr.getSSLSocketAddress() == null);
}
- @Test
+ @Test(timeout=60000)
public void testCreateFromStringWithSSLPort() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress(hostname+COLON+port+COLON+sslPort);
assertTrue(addr.getSocketAddress().equals(new InetSocketAddress(hostname, port)));
assertTrue(addr.getSSLSocketAddress().equals(new InetSocketAddress(hostname, sslPort)));
}
- @Test
+ @Test(timeout=60000)
public void testCreateFromStringWithNoSSLPort() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress(hostname+COLON+port);
assertTrue(addr.getSocketAddress().equals(new InetSocketAddress(hostname, port)));
assertTrue(addr.getSSLSocketAddress() == null);
}
- @Test
+ @Test(timeout=60000)
public void testCreateWithInvalidRegularPort() throws Exception {
boolean success = false;
try {
@@ -72,7 +72,7 @@ public class TestHedwigSocketAddress ext
assertTrue(success);
}
- @Test
+ @Test(timeout=60000)
public void testCreateWithInvalidSSLPort() throws Exception {
boolean success = false;
try {
@@ -84,7 +84,7 @@ public class TestHedwigSocketAddress ext
assertTrue(success);
}
- @Test
+ @Test(timeout=60000)
public void testToStringConversion() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress(hostname, port, sslPort);
HedwigSocketAddress addr2 = new HedwigSocketAddress(addr.toString());
@@ -93,7 +93,7 @@ public class TestHedwigSocketAddress ext
addr.toString().equals(addr2.toString());
}
- @Test
+ @Test(timeout=60000)
public void testIsSSLEnabledFlag() throws Exception {
HedwigSocketAddress sslAddr = new HedwigSocketAddress(hostname, port, sslPort);
assertTrue(sslAddr.isSSLEnabled());
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestPathUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestPathUtils.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestPathUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestPathUtils.java Sat Dec 29 15:31:46 2012
@@ -25,14 +25,14 @@ import org.junit.Test;
public class TestPathUtils extends TestCase {
- @Test
+ @Test(timeout=60000)
public void testPrefixes() {
assertEquals(Arrays.asList(new String[] { "/a", "/a/b", "/a/b/c" }), PathUtils.prefixes("/a/b/c"));
assertEquals(Arrays.asList(new String[] { "/a", "/a/b", "/a/b/c" }), PathUtils.prefixes("///a///b///c"));
}
- @Test
+ @Test(timeout=60000)
public void testIsPrefix() {
String[] paths = new String[] { "/", "/a", "/a/b" };
for (int i = 0; i < paths.length; i++) {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java Sat Dec 29 15:31:46 2012
@@ -194,7 +194,7 @@ public class TestPubSubClient extends Pu
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testSyncPublish() throws Exception {
boolean publishSuccess = true;
try {
@@ -206,7 +206,7 @@ public class TestPubSubClient extends Pu
assertTrue(publishSuccess);
}
- @Test
+ @Test(timeout=60000)
public void testSyncPublishWithResponse() throws Exception {
ByteString topic = ByteString.copyFromUtf8("testSyncPublishWithResponse");
ByteString subid = ByteString.copyFromUtf8("mysubid");
@@ -261,14 +261,14 @@ public class TestPubSubClient extends Pu
}
}
- @Test
+ @Test(timeout=60000)
public void testAsyncPublish() throws Exception {
publisher.asyncPublish(ByteString.copyFromUtf8("myAsyncTopic"), Message.newBuilder().setBody(
ByteString.copyFromUtf8("Hello Async World!")).build(), new TestCallback(), null);
assertTrue(queue.take());
}
- @Test
+ @Test(timeout=60000)
public void testAsyncPublishWithResponse() throws Exception {
ByteString topic = ByteString.copyFromUtf8("testAsyncPublishWithResponse");
ByteString subid = ByteString.copyFromUtf8("mysubid");
@@ -341,7 +341,7 @@ public class TestPubSubClient extends Pu
}
}
- @Test
+ @Test(timeout=60000)
public void testMultipleAsyncPublish() throws Exception {
ByteString topic1 = ByteString.copyFromUtf8("myFirstTopic");
ByteString topic2 = ByteString.copyFromUtf8("myNewTopic");
@@ -357,7 +357,7 @@ public class TestPubSubClient extends Pu
assertTrue(queue.take());
}
- @Test
+ @Test(timeout=60000)
public void testSyncSubscribe() throws Exception {
boolean subscribeSuccess = true;
try {
@@ -368,14 +368,14 @@ public class TestPubSubClient extends Pu
assertTrue(subscribeSuccess);
}
- @Test
+ @Test(timeout=60000)
public void testAsyncSubscribe() throws Exception {
subscriber.asyncSubscribe(ByteString.copyFromUtf8("myAsyncSubscribeTopic"), ByteString.copyFromUtf8("1"),
CreateOrAttach.CREATE_OR_ATTACH, new TestCallback(), null);
assertTrue(queue.take());
}
- @Test
+ @Test(timeout=60000)
public void testStartDeliveryAfterCloseSub() throws Exception {
ByteString topic = ByteString.copyFromUtf8("testStartDeliveryAfterCloseSub");
ByteString subid = ByteString.copyFromUtf8("mysubid");
@@ -402,7 +402,7 @@ public class TestPubSubClient extends Pu
assertTrue(consumeQueue.take());
}
- @Test
+ @Test(timeout=60000)
public void testSubscribeAndConsume() throws Exception {
ByteString topic = ByteString.copyFromUtf8("myConsumeTopic");
ByteString subscriberId = ByteString.copyFromUtf8("1");
@@ -436,7 +436,7 @@ public class TestPubSubClient extends Pu
assertTrue(consumeQueue.take());
}
- @Test
+ @Test(timeout=60000)
public void testAsyncSubscribeAndUnsubscribe() throws Exception {
ByteString topic = ByteString.copyFromUtf8("myAsyncUnsubTopic");
ByteString subscriberId = ByteString.copyFromUtf8("1");
@@ -446,7 +446,7 @@ public class TestPubSubClient extends Pu
assertTrue(queue.take());
}
- @Test
+ @Test(timeout=60000)
public void testSyncUnsubscribeWithoutSubscription() throws Exception {
boolean unsubscribeSuccess = false;
try {
@@ -459,7 +459,7 @@ public class TestPubSubClient extends Pu
assertTrue(unsubscribeSuccess);
}
- @Test
+ @Test(timeout=60000)
public void testAsyncSubscribeAndCloseSubscription() throws Exception {
ByteString topic = ByteString.copyFromUtf8("myAsyncSubAndCloseSubTopic");
ByteString subscriberId = ByteString.copyFromUtf8("1");
@@ -469,7 +469,7 @@ public class TestPubSubClient extends Pu
assertTrue(true);
}
- @Test
+ @Test(timeout=60000)
public void testSyncSubscribeWithListener() throws Exception {
ByteString topic = ByteString.copyFromUtf8("mySyncSubscribeWithListener");
ByteString subscriberId = ByteString.copyFromUtf8("mysub");
@@ -488,7 +488,7 @@ public class TestPubSubClient extends Pu
assertEquals(SubscriptionEvent.TOPIC_MOVED, eventQueue.take());
}
- @Test
+ @Test(timeout=60000)
public void testAsyncSubscribeWithListener() throws Exception {
ByteString topic = ByteString.copyFromUtf8("myAsyncSubscribeWithListener");
ByteString subscriberId = ByteString.copyFromUtf8("mysub");
@@ -505,7 +505,7 @@ public class TestPubSubClient extends Pu
assertEquals(SubscriptionEvent.TOPIC_MOVED, eventQueue.take());
}
- @Test
+ @Test(timeout=60000)
public void testSyncSubscribeForceAttach() throws Exception {
ByteString topic = ByteString.copyFromUtf8("mySyncSubscribeForceAttach");
ByteString subscriberId = ByteString.copyFromUtf8("mysub");
@@ -562,7 +562,7 @@ public class TestPubSubClient extends Pu
client2.close();
}
- @Test
+ @Test(timeout=60000)
public void testSyncSubscribeWithListenerWhenReleasingTopic() throws Exception {
client.close();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java Sat Dec 29 15:31:46 2012
@@ -252,7 +252,7 @@ public class TestMultiplexing extends He
return new TestServerConfiguration(port, sslPort);
}
- @Test
+ @Test(timeout=60000)
public void testStopDelivery() throws Exception {
ByteString topic1 = ByteString.copyFromUtf8("testStopDelivery-1");
ByteString topic2 = ByteString.copyFromUtf8("testStopDelivery-2");
@@ -312,7 +312,7 @@ public class TestMultiplexing extends He
csHandler21.checkSecondRun();
}
- @Test
+ @Test(timeout=60000)
public void testCloseSubscription() throws Exception {
ByteString topic1 = ByteString.copyFromUtf8("testCloseSubscription-1");
ByteString topic2 = ByteString.copyFromUtf8("testCloseSubscription-2");
@@ -372,7 +372,7 @@ public class TestMultiplexing extends He
csHandler21.checkSecondRun();
}
- @Test
+ @Test(timeout=60000)
public void testThrottle() throws Exception {
ByteString topic1 = ByteString.copyFromUtf8("testThrottle-1");
ByteString topic2 = ByteString.copyFromUtf8("testThrottle-2");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java Sat Dec 29 15:31:46 2012
@@ -872,7 +872,7 @@ public class TestBackwardCompat extends
* 1) message bound doesn't take effects on 4.0.0 server.
* 2) message bound take effects on both 4.1.0 and current server
*/
- @Test
+ @Test(timeout=60000)
public void testMessageBoundCompat() throws Exception {
ByteString topic = ByteString.copyFromUtf8("testMessageBoundCompat");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -945,7 +945,7 @@ public class TestBackwardCompat extends
* 2) current client could talk with 4.1.0 server,
* but no message seq id would be returned
*/
- @Test
+ @Test(timeout=60000)
public void testPublishCompat410() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestPublishCompat410");
ByteString data = ByteString.copyFromUtf8("testdata");
@@ -996,7 +996,7 @@ public class TestBackwardCompat extends
*
* A current server could read subscription data recorded by 4.1.0 server.
*/
- @Test
+ @Test(timeout=60000)
public void testSubscriptionDataCompat410() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestCompat410");
ByteString sub410 = ByteString.copyFromUtf8("sub410");
@@ -1058,7 +1058,7 @@ public class TestBackwardCompat extends
*
* A 4.1.0 client could not update message bound, while current could do it.
*/
- @Test
+ @Test(timeout=60000)
public void testUpdateMessageBoundCompat410() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestUpdateMessageBoundCompat410");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -1119,7 +1119,7 @@ public class TestBackwardCompat extends
*
* A current client running message filter would fail on 4.1.0 hub servers.
*/
- @Test
+ @Test(timeout=60000)
public void testClientMessageFilterCompat410() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestUpdateMessageBoundCompat410");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -1160,7 +1160,7 @@ public class TestBackwardCompat extends
* Server side throttling does't work when current client connects to old version
* server.
*/
- @Test
+ @Test(timeout=60000)
public void testServerSideThrottleCompat410() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestServerSideThrottleCompat410");
ByteString subid = ByteString.copyFromUtf8("mysub");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java Sat Dec 29 15:31:46 2012
@@ -55,7 +55,7 @@ public class TestPubSubServerStartup {
* connected, the pubsub server will fail at startup.
*
*/
- @Test
+ @Test(timeout=60000)
public void testPubSubServerInstantiationWithConfig() throws Exception {
for (int i = 0; i < 10; i++) {
logger.info("iteration " + i);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java Sat Dec 29 15:31:46 2012
@@ -188,7 +188,7 @@ public class TestThrottlingDelivery exte
return new ThrottleDeliveryServerConfiguration(port, sslPort);
}
- @Test
+ @Test(timeout=60000)
public void testServerSideThrottle() throws Exception {
int messageWindowSize = DEFAULT_MESSAGE_WINDOW_SIZE;
ThrottleDeliveryClientConfiguration conf =
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/filter/TestMessageFilter.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/filter/TestMessageFilter.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/filter/TestMessageFilter.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/filter/TestMessageFilter.java Sat Dec 29 15:31:46 2012
@@ -248,7 +248,7 @@ public class TestMessageFilter extends H
subscriber.closeSubscription(topic, subid);
}
- @Test
+ @Test(timeout=60000)
public void testServerSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -259,7 +259,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, ModMessageFilter.class.getName(), null, 0, 50, 2, true);
}
- @Test
+ @Test(timeout=60000)
public void testInvalidServerSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestInvalidMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -277,7 +277,7 @@ public class TestMessageFilter extends H
}
}
- @Test
+ @Test(timeout=60000)
public void testChangeSubscriptionPreferences() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestChangeSubscriptionPreferences");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -299,7 +299,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, ModMessageFilter.class.getName(), null, 200, 14, 7, true);
}
- @Test
+ @Test(timeout=60000)
public void testChangeServerSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestChangeMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -316,7 +316,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, HeaderMessageFilter.class.getName(), null, 200, 14, 7, true);
}
- @Test
+ @Test(timeout=60000)
public void testFixInvalidServerSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestFixMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -336,7 +336,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, HeaderMessageFilter.class.getName(), null, 0, 33, 3, true);
}
- @Test
+ @Test(timeout=60000)
public void testNullClientMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestNullClientMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -359,7 +359,7 @@ public class TestMessageFilter extends H
}
}
- @Test
+ @Test(timeout=60000)
public void testClientSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestClientMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -370,7 +370,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, null, new ModMessageFilter(), 0, 50, 2, true);
}
- @Test
+ @Test(timeout=60000)
public void testChangeSubscriptionPreferencesForClientFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestChangeSubscriptionPreferencesForClientFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
@@ -384,7 +384,7 @@ public class TestMessageFilter extends H
receiveNumModM(topic, subid, null, new ModMessageFilter(), 0, 33, 3, true);
}
- @Test
+ @Test(timeout=60000)
public void testChangeClientSideMessageFilter() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestChangeClientSideMessageFilter");
ByteString subid = ByteString.copyFromUtf8("mysub");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestBaseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestBaseHandler.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestBaseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestBaseHandler.java Sat Dec 29 15:31:46 2012
@@ -78,7 +78,7 @@ public class TestBaseHandler extends Tes
return (PubSubResponse) message;
}
- @Test
+ @Test(timeout=60000)
public void testHandleRequestOnRedirect() throws Exception {
tm.setShouldOwnEveryNewTopic(false);
handler.handleRequest(request, channel);
@@ -90,7 +90,7 @@ public class TestBaseHandler extends Tes
}
- @Test
+ @Test(timeout=60000)
public void testHandleRequestOnOwner() throws Exception {
tm.setShouldOwnEveryNewTopic(true);
@@ -100,7 +100,7 @@ public class TestBaseHandler extends Tes
}
- @Test
+ @Test(timeout=60000)
public void testHandleRequestOnError() throws Exception {
tm.setShouldError(true);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java Sat Dec 29 15:31:46 2012
@@ -91,7 +91,7 @@ public class TestSubUnsubHandler extends
ush = new UnsubscribeHandler(conf, tm, sm, dm, subChannelMgr);
}
- @Test
+ @Test(timeout=60000)
public void testNoSubscribeRequest() {
sh.handleRequestAtOwner(PubSubRequest.newBuilder(pubSubRequestPrototype).clearSubscribeRequest().build(),
channel);
@@ -99,7 +99,7 @@ public class TestSubUnsubHandler extends
.getStatusCode());
}
- @Test
+ @Test(timeout=60000)
public void testSuccessCase() {
StubCallback<Void> callback = new StubCallback<Void>();
sm.acquiredTopic(topic, callback, null);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java Sat Dec 29 15:31:46 2012
@@ -109,7 +109,7 @@ public class TestHedwigRegion extends He
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testMultiRegionSubscribeAndConsume() throws Exception {
int batchSize = 10;
// Subscribe to topics for clients in all regions
@@ -152,7 +152,7 @@ public class TestHedwigRegion extends He
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testSubscribeAndConsumeWhenARegionDown() throws Exception {
int batchSize = 10;
@@ -217,7 +217,7 @@ public class TestHedwigRegion extends He
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testAttachExistingSubscriptionsWhenARegionDown() throws Exception {
int batchSize = 10;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestFactoryLayout.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestFactoryLayout.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestFactoryLayout.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestFactoryLayout.java Sat Dec 29 15:31:46 2012
@@ -36,7 +36,7 @@ import org.junit.Assert;
public class TestFactoryLayout extends ZooKeeperTestBase {
- @Test
+ @Test(timeout=60000)
public void testFactoryLayout() throws Exception {
ServerConfiguration conf = new ServerConfiguration();
conf.setMetadataManagerFactoryName(
@@ -66,7 +66,7 @@ public class TestFactoryLayout extends Z
layout.store(zk, conf);
}
- @Test
+ @Test(timeout=60000)
public void testCorruptedFactoryLayout() throws Exception {
ServerConfiguration conf = new ServerConfiguration();
StringBuilder msb = new StringBuilder();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManager.java Sat Dec 29 15:31:46 2012
@@ -47,7 +47,7 @@ public class TestMetadataManager extends
super(metadataManagerFactoryCls);
}
- @Test
+ @Test(timeout=60000)
public void testOwnerInfo() throws Exception {
TopicOwnershipManager toManager = metadataManagerFactory.newTopicOwnershipManager();
@@ -133,7 +133,7 @@ public class TestMetadataManager extends
toManager.close();
}
- @Test
+ @Test(timeout=60000)
public void testPersistenceInfo() throws Exception {
TopicPersistenceManager tpManager = metadataManagerFactory.newTopicPersistenceManager();
@@ -226,7 +226,7 @@ public class TestMetadataManager extends
tpManager.close();
}
- @Test
+ @Test(timeout=60000)
public void testSubscriptionData() throws Exception {
SubscriptionDataManager subManager = metadataManagerFactory.newSubscriptionDataManager();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManagerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManagerFactory.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManagerFactory.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManagerFactory.java Sat Dec 29 15:31:46 2012
@@ -115,7 +115,7 @@ public class TestMetadataManagerFactory
/**
* Test bad server configuration
*/
- @Test
+ @Test(timeout=60000)
public void testBadConf() throws Exception {
TestServerConfiguration conf = new TestServerConfiguration();
@@ -153,7 +153,7 @@ public class TestMetadataManagerFactory
/**
* Test bad zk configuration
*/
- @Test
+ @Test(timeout=60000)
public void testBadZkContents() throws Exception {
TestServerConfiguration conf = new TestServerConfiguration();
@@ -228,7 +228,7 @@ public class TestMetadataManagerFactory
}
// test concurrent
- @Test
+ @Test(timeout=60000)
public void testConcurrent1() throws Exception {
/// everyone creates the same
int numThreads = 50;
@@ -255,7 +255,7 @@ public class TestMetadataManagerFactory
Assert.assertTrue("Not all metadata manager factories created", success);
}
- @Test
+ @Test(timeout=60000)
public void testConcurrent2() throws Exception {
/// odd create different
int numThreadsEach = 25;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java Sat Dec 29 15:31:46 2012
@@ -49,7 +49,7 @@ import org.apache.hedwig.zookeeper.SafeA
public class TestPubSubServer extends PubSubServerStandAloneTestBase {
- @Test
+ @Test(timeout=60000)
public void testSecondServer() throws Exception {
PubSubServer server1 = new PubSubServer(new StandAloneServerConfiguration() {
@Override
@@ -122,7 +122,7 @@ public class TestPubSubServer extends Pu
}, null);
}
- @Test
+ @Test(timeout=60000)
public void testUncaughtExceptionInNettyThread() throws Exception {
SynchronousQueue<Throwable> queue = new SynchronousQueue<Throwable>();
@@ -152,7 +152,7 @@ public class TestPubSubServer extends Pu
server.shutdown();
}
- @Test
+ @Test(timeout=60000)
public void testUncaughtExceptionInZKThread() throws Exception {
SynchronousQueue<Throwable> queue = new SynchronousQueue<Throwable>();
@@ -204,7 +204,7 @@ public class TestPubSubServer extends Pu
server.shutdown();
}
- @Test
+ @Test(timeout=60000)
public void testInvalidServerConfiguration() throws Exception {
boolean success = false;
ServerConfiguration conf = new ServerConfiguration() {
@@ -232,7 +232,7 @@ public class TestPubSubServer extends Pu
assertTrue(success);
}
- @Test
+ @Test(timeout=60000)
public void testValidServerConfiguration() throws Exception {
boolean success = true;
ServerConfiguration conf = new ServerConfiguration() {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java Sat Dec 29 15:31:46 2012
@@ -29,7 +29,7 @@ public class TestServerStats {
* Tests that updatLatency should not fail with
* ArrayIndexOutOfBoundException when latency time coming as negative.
*/
- @Test
+ @Test(timeout=60000)
public void testUpdateLatencyShouldNotFailWithAIOBEWithNegativeLatency()
throws Exception {
OpStats opStat = new OpStats();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java Sat Dec 29 15:31:46 2012
@@ -128,7 +128,7 @@ public class BookKeeperTestBase extends
}
// Give junit a fake test so that its happy
- @Test
+ @Test(timeout=60000)
public void testNothing() throws Exception {
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/MessageBoundedPersistenceTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/MessageBoundedPersistenceTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/MessageBoundedPersistenceTest.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/MessageBoundedPersistenceTest.java Sat Dec 29 15:31:46 2012
@@ -132,7 +132,7 @@ public class MessageBoundedPersistenceTe
sub.closeSubscription(topic, subid);
}
- @Test
+ @Test(timeout=60000)
public void testBasicBounding() throws Exception {
Client client = new HedwigClient(new MessageBoundClientConfiguration(5));
Publisher pub = client.getPublisher();
@@ -148,7 +148,7 @@ public class MessageBoundedPersistenceTe
client.close();
}
- @Test
+ @Test(timeout=60000)
public void testMultipleSubscribers() throws Exception {
ByteString topic = ByteString.copyFromUtf8("multiSubTopic");
@@ -190,7 +190,7 @@ public class MessageBoundedPersistenceTe
client.close();
}
- @Test
+ @Test(timeout=60000)
public void testUpdateMessageBound() throws Exception {
ByteString topic = ByteString.copyFromUtf8("UpdateMessageBound");
@@ -229,7 +229,7 @@ public class MessageBoundedPersistenceTe
client.close();
}
- @Test
+ @Test(timeout=60000)
public void testLedgerGC() throws Exception {
Client client = new HedwigClient(new MessageBoundClientConfiguration());
Publisher pub = client.getPublisher();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManager.java Sat Dec 29 15:31:46 2012
@@ -367,12 +367,12 @@ public class TestBookKeeperPersistenceMa
return result;
}
- @Test
+ @Test(timeout=60000)
public void testScanMessagesOnClosedLedgerAfterDeleteLedger() throws Exception {
scanMessagesAfterDeleteLedgerTest(2);
}
- @Test
+ @Test(timeout=60000)
public void testScanMessagesOnUnclosedLedgerAfterDeleteLedger() throws Exception {
scanMessagesAfterDeleteLedgerTest(1);
}
@@ -408,7 +408,7 @@ public class TestBookKeeperPersistenceMa
assertTrue("Should succeed to scan messages after deleted consumed ledger.", b);
}
- @Test
+ @Test(timeout=60000)
public void testScanMessagesOnEmptyLedgerAfterDeleteLedger() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestScanMessagesOnEmptyLedgerAfterDeleteLedger");
@@ -446,12 +446,12 @@ public class TestBookKeeperPersistenceMa
assertTrue("Should succeed to scan messages after deleted consumed ledger.", b);
}
- @Test
+ @Test(timeout=60000)
public void testFailedToDeleteLedger1() throws Exception {
failedToDeleteLedgersTest(1);
}
- @Test
+ @Test(timeout=60000)
public void testFailedToDeleteLedger2() throws Exception {
// succeed to delete second ledger
failedToDeleteLedgersTest(2);
@@ -525,7 +525,7 @@ public class TestBookKeeperPersistenceMa
assertNull("Should not fail with exception.", failureException);
}
- @Test
+ @Test(timeout=60000)
public void testScanMessagesOnTwoLedgers() throws Exception {
stopCluster();
startCluster(readDelay);
@@ -558,7 +558,7 @@ public class TestBookKeeperPersistenceMa
}
}
- @Test
+ @Test(timeout=60000)
public void testInconsistentSubscriptionStateAndLedgerRanges1() throws Exception {
// See the comment of inconsistentSubscriptionStateAndLedgerRanges.
// For this case, Step (2) failed to update subscription state metadata,
@@ -567,7 +567,7 @@ public class TestBookKeeperPersistenceMa
inconsistentSubscriptionStateAndLedgerRanges(1);
}
- @Test
+ @Test(timeout=60000)
public void testInconsistentSubscriptionStateAndLedgerRanges2() throws Exception {
// See the comment of inconsistentSubscriptionStateAndLedgerRanges.
// For this case, step (2) failed to update subscription state metadata,
@@ -649,7 +649,7 @@ public class TestBookKeeperPersistenceMa
}
}
- @Test
+ @Test(timeout=60000)
// Add this test case for BOOKKEEPER-458
public void testReadWhenTopicChangeLedger() throws Exception {
final ByteString topic = ByteString.copyFromUtf8("testReadWhenTopicChangeLedger");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java Sat Dec 29 15:31:46 2012
@@ -84,7 +84,7 @@ public class TestBookkeeperPersistenceMa
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testEmptyDirtyLedger() throws Exception {
StubCallback<Void> stubCallback = new StubCallback<Void>();
@@ -99,7 +99,7 @@ public class TestBookkeeperPersistenceMa
assertEquals(0, bkpm.topicInfos.get(topic).ledgerRanges.size());
}
- @Test
+ @Test(timeout=60000)
public void testNonEmptyDirtyLedger() throws Exception {
Random r = new Random();
@@ -155,7 +155,7 @@ public class TestBookkeeperPersistenceMa
}
}
- @Test
+ @Test(timeout=60000)
public void testSyncChangeLedgers() throws Exception {
int NUM_MESSAGES_TO_TEST = 101;
int SIZE_OF_MESSAGES_TO_TEST = 100;
@@ -249,7 +249,7 @@ public class TestBookkeeperPersistenceMa
}
}
- @Test
+ @Test(timeout=60000)
public void testAsyncChangeLedgers() throws Exception {
int NUM_MESSAGES_TO_TEST = 101;
int SIZE_OF_MESSAGES_TO_TEST = 100;
@@ -330,7 +330,7 @@ public class TestBookkeeperPersistenceMa
}
}
- @Test
+ @Test(timeout=60000)
public void testChangeLedgerFailure() throws Exception {
int NUM_MESSAGES_TO_TEST = 101;
int SIZE_OF_MESSAGES_TO_TEST = 100;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java Sat Dec 29 15:31:46 2012
@@ -210,7 +210,7 @@ public class TestDeadlock extends Hedwig
return serverConf;
}
- @Test
+ @Test(timeout=60000)
public void testDeadlock() throws Exception {
int numMessages = 5;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java Sat Dec 29 15:31:46 2012
@@ -239,7 +239,7 @@ public abstract class TestPersistenceMan
return ByteString.copyFromUtf8("topic" + number);
}
- @Test
+ @Test(timeout=60000)
public void testPersistenceManager() throws Exception {
List<Thread> publisherThreads = new LinkedList<Thread>();
List<Thread> scannerThreads = new LinkedList<Thread>();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java Sat Dec 29 15:31:46 2012
@@ -97,7 +97,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testPersistMessage() throws Exception {
StubCallback<PubSubProtocol.MessageSeqId> callback = new StubCallback<PubSubProtocol.MessageSeqId>();
PersistRequest request = new PersistRequest(topic, messages.get(0), callback, null);
@@ -128,7 +128,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testScanSingleMessage() throws Exception {
StubScanCallback callback = new StubScanCallback();
ScanRequest request = new ScanRequest(topic, 1, callback, null);
@@ -147,7 +147,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testDeliveredUntil() throws Exception {
for (Message m : messages) {
persistMessage(m);
@@ -173,7 +173,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testDoReadAhead() {
StubScanCallback callback = new StubScanCallback();
ScanRequest request = new ScanRequest(topic, 1, callback, null);
@@ -191,7 +191,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testReadAheadSizeLimit() throws Exception {
for (Message m : messages) {
persistMessage(m);
@@ -207,7 +207,7 @@ public class TestReadAheadCacheWhiteBox
}
- @Test
+ @Test(timeout=60000)
public void testDoReadAheadStartingFrom() throws Exception {
persistMessage(messages.get(0));
int readAheadCount = 5;
@@ -235,7 +235,7 @@ public class TestReadAheadCacheWhiteBox
assertEquals(readAheadRequest.messageLimit, readAheadCount);
}
- @Test
+ @Test(timeout=60000)
public void testAddMessageToCache() {
CacheKey key = new CacheKey(topic, 1);
cacheBasedPersistenceManager.addMessageToCache(key, messages.get(0), MathUtils.now());
@@ -248,7 +248,7 @@ public class TestReadAheadCacheWhiteBox
assertTrue(cacheBasedPersistenceManager.timeIndexOfAddition.get(value.timeOfAddition).contains(key));
}
- @Test
+ @Test(timeout=60000)
public void testRemoveMessageFromCache() {
CacheKey key = new CacheKey(topic, 1);
cacheBasedPersistenceManager.addMessageToCache(key, messages.get(0), MathUtils.now());
@@ -258,7 +258,7 @@ public class TestReadAheadCacheWhiteBox
assertTrue(cacheBasedPersistenceManager.timeIndexOfAddition.isEmpty());
}
- @Test
+ @Test(timeout=60000)
public void testCollectOldCacheEntries() {
int i = 1;
for (Message m : messages) {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestMMSubscriptionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestMMSubscriptionManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestMMSubscriptionManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestMMSubscriptionManager.java Sat Dec 29 15:31:46 2012
@@ -101,7 +101,7 @@ public class TestMMSubscriptionManager e
}
- @Test
+ @Test(timeout=60000)
public void testBasics() throws Exception {
ByteString topic1 = ByteString.copyFromUtf8("topic1");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java Sat Dec 29 15:31:46 2012
@@ -153,7 +153,7 @@ public class TestUpdateSubscriptionState
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testConsumeWhenTopicRelease() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestConsumeWhenTopicRelease");
ByteString subId = ByteString.copyFromUtf8("mysub");
@@ -198,7 +198,7 @@ public class TestUpdateSubscriptionState
assertTrue(ocm.isInOrder());
}
- @Test
+ @Test(timeout=60000)
public void testConsumeWhenHubShutdown() throws Exception {
ByteString topic = ByteString.copyFromUtf8("TestConsumeWhenHubShutdown");
ByteString subId = ByteString.copyFromUtf8("mysub");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java Sat Dec 29 15:31:46 2012
@@ -100,7 +100,7 @@ public class TestConcurrentTopicAcquisit
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testTopicAcquistion() throws Exception {
logger.info("Start concurrent topic acquistion test.");
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubInfo.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubInfo.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubInfo.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubInfo.java Sat Dec 29 15:31:46 2012
@@ -25,7 +25,7 @@ import org.junit.Assert;
public class TestHubInfo {
- @Test
+ @Test(timeout=60000)
public void testParseHubInfo() throws Exception {
HedwigSocketAddress addr = new HedwigSocketAddress("localhost", 9086, 9087);
HubInfo hubInfo1 = new HubInfo(addr, 9999);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubLoad.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubLoad.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubLoad.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubLoad.java Sat Dec 29 15:31:46 2012
@@ -23,7 +23,7 @@ import org.junit.Assert;
public class TestHubLoad {
- @Test
+ @Test(timeout=60000)
public void testParseHubLoad() throws Exception {
HubLoad hubLoad1 = new HubLoad(9999);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestMMTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestMMTopicManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestMMTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestMMTopicManager.java Sat Dec 29 15:31:46 2012
@@ -115,7 +115,7 @@ public class TestMMTopicManager extends
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testGetOwnerSingle() throws Exception {
tm.getOwner(topic, false, addrCbq, null);
Assert.assertEquals(me, check(addrCbq.take()));
@@ -145,7 +145,7 @@ public class TestMMTopicManager extends
}
}
- @Test
+ @Test(timeout=60000)
public void testGetOwnerMulti() throws Exception {
ServerConfiguration conf1 = new CustomServerConfiguration(conf.getServerPort() + 1),
conf2 = new CustomServerConfiguration(conf.getServerPort() + 2);
@@ -179,7 +179,7 @@ public class TestMMTopicManager extends
tm2.stop();
}
- @Test
+ @Test(timeout=60000)
public void testLoadBalancing() throws Exception {
tm.getOwner(topic, false, addrCbq, null);
@@ -232,7 +232,7 @@ public class TestMMTopicManager extends
}
}
- @Test
+ @Test(timeout=60000)
public void testOwnershipChange() throws Exception {
SynchronousQueue<Pair<ByteString, Boolean>> bsQueue = new SynchronousQueue<Pair<ByteString, Boolean>>();
@@ -296,7 +296,7 @@ public class TestMMTopicManager extends
Assert.assertEquals(null, hubInfo);
}
- @Test
+ @Test(timeout=60000)
public void testZKClientDisconnected() throws Exception {
// First assert ownership of the topic
tm.getOwner(topic, true, addrCbq, null);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java Sat Dec 29 15:31:46 2012
@@ -105,7 +105,7 @@ public class TestZkTopicManager extends
super.tearDown();
}
- @Test
+ @Test(timeout=60000)
public void testGetOwnerSingle() throws Exception {
tm.getOwner(topic, false, addrCbq, null);
Assert.assertEquals(me, check(addrCbq.take()));
@@ -135,7 +135,7 @@ public class TestZkTopicManager extends
}
}
- @Test
+ @Test(timeout=60000)
public void testGetOwnerMulti() throws Exception {
ServerConfiguration cfg1 = new CustomServerConfiguration(cfg.getServerPort() + 1), cfg2 = new CustomServerConfiguration(
cfg.getServerPort() + 2);
@@ -186,7 +186,7 @@ public class TestZkTopicManager extends
tm2.stop();
}
- @Test
+ @Test(timeout=60000)
public void testLoadBalancing() throws Exception {
tm.getOwner(topic, false, addrCbq, null);
@@ -239,7 +239,7 @@ public class TestZkTopicManager extends
}
}
- @Test
+ @Test(timeout=60000)
public void testOwnershipChange() throws Exception {
SynchronousQueue<Pair<ByteString, Boolean>> bsQueue = new SynchronousQueue<Pair<ByteString, Boolean>>();
@@ -304,7 +304,7 @@ public class TestZkTopicManager extends
}
}
- @Test
+ @Test(timeout=60000)
public void testZKClientDisconnected() throws Exception {
// First assert ownership of the topic
tm.getOwner(topic, true, addrCbq, null);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/TestZkUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/TestZkUtils.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/TestZkUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/TestZkUtils.java Sat Dec 29 15:31:46 2012
@@ -26,7 +26,7 @@ import org.junit.Test;
public class TestZkUtils extends ZooKeeperTestBase {
- @Test
+ @Test(timeout=60000)
public void testCreateFullPathOptimistic() throws Exception {
testPath("/a/b/c", CreateMode.EPHEMERAL);