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 [1/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...
Author: fpj
Date: Sat Dec 29 15:31:46 2012
New Revision: 1426772
URL: http://svn.apache.org/viewvc?rev=1426772&view=rev
Log:
BOOKKEEPER-523: Every test should have a timeout (ivank, sijie via fpj)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestZkVersion.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestProtoVersions.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConfigurationTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/IndexCorruptionTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestDiskChecker.java
zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestFileUtils.java
zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestHedwigSocketAddress.java
zookeeper/bookkeeper/trunk/hedwig-client/src/test/java/org/apache/hedwig/util/TestPathUtils.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestBackwardCompat.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/filter/TestMessageFilter.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestBaseHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/handlers/TestSubUnsubHandler.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestFactoryLayout.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/meta/TestMetadataManagerFactory.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestPubSubServer.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/netty/TestServerStats.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/MessageBoundedPersistenceTest.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookKeeperPersistenceManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestBookkeeperPersistenceManagerWhiteBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestDeadlock.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestReadAheadCacheWhiteBox.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestMMSubscriptionManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/subscriptions/TestUpdateSubscriptionState.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestConcurrentTopicAcquisition.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubInfo.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestHubLoad.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestMMTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/zookeeper/TestZkUtils.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Dec 29 15:31:46 2012
@@ -219,6 +219,8 @@ Trunk (unreleased changes)
BOOKKEEPER-495: Revise BK config doc (fpj, ivank via fpj)
+ BOOKKEEPER-523: Every test should have a timeout (ivank, sijie via fpj)
+
bookkeeper-server:
BOOKKEEPER-328: Bookie DeathWatcher is missing thread name (Rakesh via sijie)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java Sat Dec 29 15:31:46 2012
@@ -53,7 +53,7 @@ public class TestBenchmark extends BookK
super(5);
}
- @Test
+ @Test(timeout=60000)
public void testThroughputLatency() throws Exception {
String latencyFile = System.getProperty("test.latency.file", "latencyDump.dat");
BenchThroughputLatency.main(new String[] {
@@ -66,7 +66,7 @@ public class TestBenchmark extends BookK
});
}
- @Test
+ @Test(timeout=60000)
public void testBookie() throws Exception {
InetSocketAddress bookie = getBookie(0);
BenchBookie.main(new String[] {
@@ -76,7 +76,7 @@ public class TestBenchmark extends BookK
});
}
- @Test
+ @Test(timeout=60000)
public void testReadThroughputLatency() throws Exception {
final AtomicBoolean threwException = new AtomicBoolean(false);
Thread t = new Thread() {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieJournalTest.java Sat Dec 29 15:31:46 2012
@@ -200,7 +200,7 @@ public class BookieJournalTest {
* word at the start. This is for versions of bookkeeper before
* the magic word was introduced
*/
- @Test
+ @Test(timeout=60000)
public void testPreV2Journal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -239,7 +239,7 @@ public class BookieJournalTest {
* start the bookie. An admin should look to see what has
* happened in this case
*/
- @Test
+ @Test(timeout=60000)
public void testAllJunkJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -277,7 +277,7 @@ public class BookieJournalTest {
* the magic word existed, if the bookie started but nothing was
* ever written.
*/
- @Test
+ @Test(timeout=60000)
public void testEmptyJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -303,7 +303,7 @@ public class BookieJournalTest {
* Test that a journal can load if only the magic word and
* version are there.
*/
- @Test
+ @Test(timeout=60000)
public void testHeaderOnlyJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -329,7 +329,7 @@ public class BookieJournalTest {
* Test that if a journal has junk at the end, it does not load.
* If the journal is corrupt like this, admin intervention is needed
*/
- @Test
+ @Test(timeout=60000)
public void testJunkEndedJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -368,7 +368,7 @@ public class BookieJournalTest {
* should be fine here. The bookie has crashed while writing
* but so the client has not be notified of success.
*/
- @Test
+ @Test(timeout=60000)
public void testTruncatedInLenJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -416,7 +416,7 @@ public class BookieJournalTest {
* This is ok, as the client will disregard the entry after looking
* at its checksum.
*/
- @Test
+ @Test(timeout=60000)
public void testTruncatedInEntryJournal() throws Exception {
File journalDir = File.createTempFile("bookie", "journal");
journalDir.delete();
@@ -473,7 +473,7 @@ public class BookieJournalTest {
/**
* Test partial index (truncate master key) with pre-v3 journals
*/
- @Test
+ @Test(timeout=60000)
public void testPartialFileInfoPreV3Journal1() throws Exception {
testPartialFileInfoPreV3Journal(true);
}
@@ -481,7 +481,7 @@ public class BookieJournalTest {
/**
* Test partial index with pre-v3 journals
*/
- @Test
+ @Test(timeout=60000)
public void testPartialFileInfoPreV3Journal2() throws Exception {
testPartialFileInfoPreV3Journal(false);
}
@@ -533,7 +533,7 @@ public class BookieJournalTest {
/**
* Test partial index (truncate master key) with post-v3 journals
*/
- @Test
+ @Test(timeout=60000)
public void testPartialFileInfoPostV3Journal1() throws Exception {
testPartialFileInfoPostV3Journal(true);
}
@@ -541,7 +541,7 @@ public class BookieJournalTest {
/**
* Test partial index with post-v3 journals
*/
- @Test
+ @Test(timeout=60000)
public void testPartialFileInfoPostV3Journal2() throws Exception {
testPartialFileInfoPostV3Journal(false);
}
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java Sat Dec 29 15:31:46 2012
@@ -133,7 +133,7 @@ public class CompactionTest extends Book
}
}
- @Test
+ @Test(timeout=60000)
public void testDisableCompaction() throws Exception {
// prepare data
LedgerHandle[] lhs = prepareData(3, false);
@@ -160,7 +160,7 @@ public class CompactionTest extends Book
}
}
- @Test
+ @Test(timeout=60000)
public void testMinorCompaction() throws Exception {
// prepare data
LedgerHandle[] lhs = prepareData(3, false);
@@ -194,7 +194,7 @@ public class CompactionTest extends Book
verifyLedger(lhs[0].getId(), 0, lhs[0].getLastAddConfirmed());
}
- @Test
+ @Test(timeout=60000)
public void testMajorCompaction() throws Exception {
// prepare data
@@ -229,7 +229,7 @@ public class CompactionTest extends Book
verifyLedger(lhs[1].getId(), 0, lhs[1].getLastAddConfirmed());
}
- @Test
+ @Test(timeout=60000)
public void testMajorCompactionAboveThreshold() throws Exception {
// prepare data
LedgerHandle[] lhs = prepareData(3, false);
@@ -252,7 +252,7 @@ public class CompactionTest extends Book
}
}
- @Test
+ @Test(timeout=60000)
public void testCompactionSmallEntryLogs() throws Exception {
// create a ledger to write a few entries
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java Sat Dec 29 15:31:46 2012
@@ -73,7 +73,7 @@ public class CookieTest {
/**
* Test starting bookie with clean state.
*/
- @Test
+ @Test(timeout=60000)
public void testCleanStart() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
@@ -92,7 +92,7 @@ public class CookieTest {
* is different to a local cookie, the bookie
* will fail to start
*/
- @Test
+ @Test(timeout=60000)
public void testBadJournalCookie() throws Exception {
ServerConfiguration conf1 = new ServerConfiguration()
.setJournalDirName(newDirectory())
@@ -125,7 +125,7 @@ public class CookieTest {
* the configuration, the bookie will fail to
* start
*/
- @Test
+ @Test(timeout=60000)
public void testDirectoryMissing() throws Exception {
String[] ledgerDirs = new String[] {
newDirectory(), newDirectory(), newDirectory() };
@@ -167,7 +167,7 @@ public class CookieTest {
* preexisting bookie, the bookie will fail
* to start
*/
- @Test
+ @Test(timeout=60000)
public void testDirectoryAdded() throws Exception {
String ledgerDir0 = newDirectory();
String journalDir = newDirectory();
@@ -199,7 +199,7 @@ public class CookieTest {
* Test that if a directory's contents
* are emptied, the bookie will fail to start
*/
- @Test
+ @Test(timeout=60000)
public void testDirectoryCleared() throws Exception {
String ledgerDir0 = newDirectory();
String journalDir = newDirectory();
@@ -226,7 +226,7 @@ public class CookieTest {
* Test that if a bookie's port is changed
* the bookie will fail to start
*/
- @Test
+ @Test(timeout=60000)
public void testBookiePortChanged() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
@@ -252,7 +252,7 @@ public class CookieTest {
* existed in the system, then the bookie will fail
* to start
*/
- @Test
+ @Test(timeout=60000)
public void testNewBookieStartingWithAnotherBookiesPort() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
@@ -279,7 +279,7 @@ public class CookieTest {
/*
* Test Cookie verification with format.
*/
- @Test
+ @Test(timeout=60000)
public void testVerifyCookieWithFormat() throws Exception {
ClientConfiguration adminConf = new ClientConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString());
@@ -317,7 +317,7 @@ public class CookieTest {
* Test that if a bookie is started with directories with
* version 2 data, that it will fail to start (it needs upgrade)
*/
- @Test
+ @Test(timeout=60000)
public void testV2data() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
@@ -337,7 +337,7 @@ public class CookieTest {
* Test that if a bookie is started with directories with
* version 1 data, that it will fail to start (it needs upgrade)
*/
- @Test
+ @Test(timeout=60000)
public void testV1data() throws Exception {
ServerConfiguration conf = new ServerConfiguration()
.setZkServers(zkutil.getZooKeeperConnectString())
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java Sat Dec 29 15:31:46 2012
@@ -75,7 +75,7 @@ public class CreateNewLogTest {
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testCreateNewLog() throws Exception {
ServerConfiguration conf = new ServerConfiguration();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java Sat Dec 29 15:31:46 2012
@@ -46,7 +46,7 @@ public class EntryLogTest extends TestCa
public void setUp() throws Exception {
}
- @Test
+ @Test(timeout=60000)
public void testCorruptEntryLog() throws Exception {
File tmpDir = File.createTempFile("bkTest", ".dir");
tmpDir.delete();
@@ -98,7 +98,7 @@ public class EntryLogTest extends TestCa
return bb;
}
- @Test
+ @Test(timeout=60000)
public void testMissingLogId() throws Exception {
File tmpDir = File.createTempFile("entryLogTest", ".dir");
tmpDir.delete();
@@ -161,7 +161,7 @@ public class EntryLogTest extends TestCa
}
}
- @Test
+ @Test(timeout=60000)
/** Test that EntryLogger Should fail with FNFE, if entry logger directories does not exist*/
public void testEntryLoggerShouldThrowFNFEIfDirectoriesDoesNotExist()
throws Exception {
@@ -186,7 +186,7 @@ public class EntryLogTest extends TestCa
/**
* Test to verify the DiskFull during addEntry
*/
- @Test
+ @Test(timeout=60000)
public void testAddEntryFailureOnDiskFull() throws Exception {
File ledgerDir1 = File.createTempFile("bkTest", ".dir");
ledgerDir1.delete();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/TestLedgerDirsManager.java Sat Dec 29 15:31:46 2012
@@ -53,7 +53,7 @@ public class TestLedgerDirsManager exten
dirsManager = new LedgerDirsManager(conf);
}
- @Test
+ @Test(timeout=60000)
public void testPickWritableDirExclusive() throws Exception {
try {
dirsManager.pickRandomWritableDir(curDir);
@@ -64,7 +64,7 @@ public class TestLedgerDirsManager exten
}
}
- @Test
+ @Test(timeout=60000)
public void testNoWritableDir() throws Exception {
try {
dirsManager.addToFilledDirs(curDir);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpgradeTest.java Sat Dec 29 15:31:46 2012
@@ -201,21 +201,21 @@ public class UpgradeTest {
b = null;
}
- @Test
+ @Test(timeout=60000)
public void testUpgradeV1toCurrent() throws Exception {
String journalDir = newV1JournalDirectory();
String ledgerDir = newV1LedgerDirectory();
testUpgradeProceedure(zkutil.getZooKeeperConnectString(), journalDir, ledgerDir);
}
- @Test
+ @Test(timeout=60000)
public void testUpgradeV2toCurrent() throws Exception {
String journalDir = newV2JournalDirectory();
String ledgerDir = newV2LedgerDirectory();
testUpgradeProceedure(zkutil.getZooKeeperConnectString(), journalDir, ledgerDir);
}
- @Test
+ @Test(timeout=60000)
public void testUpgradeCurrent() throws Exception {
String journalDir = newV2JournalDirectory();
String ledgerDir = newV2LedgerDirectory();
@@ -232,7 +232,7 @@ public class UpgradeTest {
b.shutdown();
}
- @Test
+ @Test(timeout=60000)
public void testCommandLine() throws Exception {
PrintStream origerr = System.err;
PrintStream origout = System.out;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java Sat Dec 29 15:31:46 2012
@@ -52,7 +52,7 @@ public class BookKeeperTest extends Base
this.digestType = digestType;
}
- @Test
+ @Test(timeout=60000)
public void testConstructionZkDelay() throws Exception {
ClientConfiguration conf = new ClientConfiguration()
.setZkServers(zkUtil.getZooKeeperConnectString())
@@ -67,7 +67,7 @@ public class BookKeeperTest extends Base
bkc.close();
}
- @Test
+ @Test(timeout=60000)
public void testConstructionNotConnectedExplicitZk() throws Exception {
ClientConfiguration conf = new ClientConfiguration()
.setZkServers(zkUtil.getZooKeeperConnectString())
@@ -96,7 +96,7 @@ public class BookKeeperTest extends Base
* Test that bookkeeper is not able to open ledgers if
* it provides the wrong password or wrong digest
*/
- @Test
+ @Test(timeout=60000)
public void testBookkeeperPassword() throws Exception {
ClientConfiguration conf = new ClientConfiguration()
.setZkServers(zkUtil.getZooKeeperConnectString());
@@ -156,7 +156,7 @@ public class BookKeeperTest extends Base
* a callback error and not an InterruptedException.
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testAsyncReadWithError() throws Exception {
LedgerHandle lh = bkc.createLedger(3, 3, DigestType.CRC32, "testPasswd".getBytes());
bkc.close();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieRecoveryTest.java Sat Dec 29 15:31:46 2012
@@ -236,7 +236,7 @@ public class BookieRecoveryTest extends
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testAsyncBookieRecoveryToSpecificBookie() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -290,7 +290,7 @@ public class BookieRecoveryTest extends
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testAsyncBookieRecoveryToRandomBookies() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -345,7 +345,7 @@ public class BookieRecoveryTest extends
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testSyncBookieRecoveryToSpecificBookie() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -389,7 +389,7 @@ public class BookieRecoveryTest extends
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testSyncBookieRecoveryToRandomBookies() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -558,7 +558,7 @@ public class BookieRecoveryTest extends
/**
* Test recoverying the closed ledgers when the failed bookie server is in the last ensemble
*/
- @Test
+ @Test(timeout=60000)
public void testBookieRecoveryOnClosedLedgers() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -590,7 +590,7 @@ public class BookieRecoveryTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testBookieRecoveryOnOpenedLedgers() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -627,7 +627,7 @@ public class BookieRecoveryTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testBookieRecoveryOnInRecoveryLedger() throws Exception {
int numMsgs = 10;
// Create the ledgers
@@ -689,7 +689,7 @@ public class BookieRecoveryTest extends
}
- @Test
+ @Test(timeout=60000)
public void testAsyncBookieRecoveryToRandomBookiesNotEnoughBookies() throws Exception {
// Create the ledgers
int numLedgers = 3;
@@ -720,7 +720,7 @@ public class BookieRecoveryTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testSyncBookieRecoveryToRandomBookiesCheckForDupes() throws Exception {
Random r = new Random();
@@ -764,7 +764,7 @@ public class BookieRecoveryTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void recoverWithoutPasswordInConf() throws Exception {
byte[] passwdCorrect = "AAAAAA".getBytes();
byte[] passwdBad = "BBBBBB".getBytes();
@@ -833,7 +833,7 @@ public class BookieRecoveryTest extends
* Test that when we try to recover a ledger which doesn't have
* the password stored in the configuration, we don't succeed
*/
- @Test
+ @Test(timeout=60000)
public void ensurePasswordUsedForOldLedgers() throws Exception {
// This test bases on creating old ledgers in version 4.1.0, which only
// supports ZooKeeper based flat and hierarchical LedgerManagerFactory.
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookieWriteLedgerTest.java Sat Dec 29 15:31:46 2012
@@ -87,7 +87,7 @@ public class BookieWriteLedgerTest exten
* Verify write when few bookie failures in last ensemble and forcing
* ensemble reformation
*/
- @Test
+ @Test(timeout=60000)
public void testWithMultipleBookieFailuresInLastEnsemble() throws Exception {
// Create a ledger
lh = bkc.createLedger(5, 4, digestType, ledgerPassword);
@@ -130,7 +130,7 @@ public class BookieWriteLedgerTest exten
/**
* Verify asynchronous writing when few bookie failures in last ensemble.
*/
- @Test
+ @Test(timeout=60000)
public void testAsyncWritesWithMultipleFailuresInLastEnsemble()
throws Exception {
// Create ledgers
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/LedgerRecoveryTest.java Sat Dec 29 15:31:46 2012
@@ -82,23 +82,23 @@ public class LedgerRecoveryTest extends
afterlh.getLength() == length);
}
- @Test
+ @Test(timeout=60000)
public void testLedgerRecovery() throws Exception {
testInternal(100);
}
- @Test
+ @Test(timeout=60000)
public void testEmptyLedgerRecoveryOne() throws Exception {
testInternal(1);
}
- @Test
+ @Test(timeout=60000)
public void testEmptyLedgerRecovery() throws Exception {
testInternal(0);
}
- @Test
+ @Test(timeout=60000)
public void testLedgerRecoveryWithWrongPassword() throws Exception {
// Create a ledger
byte[] ledgerPassword = "aaaa".getBytes();
@@ -122,7 +122,7 @@ public class LedgerRecoveryTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testLedgerRecoveryWithNotEnoughBookies() throws Exception {
int numEntries = 3;
@@ -160,7 +160,7 @@ public class LedgerRecoveryTest extends
assertEquals(numEntries - 1, afterlh.getLastAddConfirmed());
}
- @Test
+ @Test(timeout=60000)
public void testLedgerRecoveryWithSlowBookie() throws Exception {
for (int i = 0; i < 3; i++) {
LOG.info("TestLedgerRecoveryWithAckQuorum @ slow bookie {}", i);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/RoundRobinDistributionScheduleTest.java Sat Dec 29 15:31:46 2012
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
public class RoundRobinDistributionScheduleTest {
static Logger LOG = LoggerFactory.getLogger(RoundRobinDistributionScheduleTest.class);
- @Test
+ @Test(timeout=60000)
public void testDistributionSchedule() throws Exception {
RoundRobinDistributionSchedule schedule = new RoundRobinDistributionSchedule(3, 2, 5);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/SlowBookieTest.java Sat Dec 29 15:31:46 2012
@@ -46,7 +46,7 @@ public class SlowBookieTest extends Book
super(4);
}
- @Test
+ @Test(timeout=60000)
public void testSlowBookie() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
conf.setZkServers(zkUtil.getZooKeeperConnectString()).setReadTimeout(360);
@@ -89,7 +89,7 @@ public class SlowBookieTest extends Book
}
}
- @Test
+ @Test(timeout=60000)
public void testBookieFailureWithSlowBookie() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
conf.setZkServers(zkUtil.getZooKeeperConnectString()).setReadTimeout(5);
@@ -144,7 +144,7 @@ public class SlowBookieTest extends Book
assertEquals("There should be no missing fragments", 0, numFragments.get());
}
- @Test
+ @Test(timeout=60000)
public void testManyBookieFailureWithSlowBookies() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
conf.setZkServers(zkUtil.getZooKeeperConnectString()).setReadTimeout(5);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java Sat Dec 29 15:31:46 2012
@@ -56,7 +56,7 @@ public class TestFencing extends BaseTes
* Basic fencing test. Create ledger, write to it,
* open ledger, write again (should fail).
*/
- @Test
+ @Test(timeout=60000)
public void testBasicFencing() throws Exception {
/*
* Create ledger.
@@ -155,7 +155,7 @@ public class TestFencing extends BaseTes
* All opens should result in a ledger with an equals number of
* entries.
*/
- @Test
+ @Test(timeout=60000)
public void testManyOpenParallel() throws Exception {
/*
* Create ledger.
@@ -204,7 +204,7 @@ public class TestFencing extends BaseTes
* Test that opening a ledger in norecovery mode
* doesn't fence off a ledger
*/
- @Test
+ @Test(timeout=60000)
public void testNoRecoveryOpen() throws Exception {
/*
* Create ledger.
@@ -250,7 +250,7 @@ public class TestFencing extends BaseTes
* kill a bookie in the ensemble. Recover.
* Fence the ledger. Kill another bookie. Recover.
*/
- @Test
+ @Test(timeout=60000)
public void testFencingInteractionWithBookieRecovery() throws Exception {
System.setProperty("digestType", digestType.toString());
System.setProperty("passwd", "testPasswd");
@@ -305,7 +305,7 @@ public class TestFencing extends BaseTes
* Fence the ledger. Kill a bookie. Recover.
* Ensure that recover doesn't reallow adding
*/
- @Test
+ @Test(timeout=60000)
public void testFencingInteractionWithBookieRecovery2() throws Exception {
System.setProperty("digestType", digestType.toString());
System.setProperty("passwd", "testPasswd");
@@ -350,7 +350,7 @@ public class TestFencing extends BaseTes
/**
* Test that fencing doesn't work with a bad password
*/
- @Test
+ @Test(timeout=60000)
public void testFencingBadPassword() throws Exception {
/*
* Create ledger.
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerChecker.java Sat Dec 29 15:31:46 2012
@@ -64,7 +64,7 @@ public class TestLedgerChecker extends B
* Tests that the LedgerChecker should detect the underReplicated fragments
* on multiple Bookie crashes
*/
- @Test
+ @Test(timeout=60000)
public void testChecker() throws Exception {
LedgerHandle lh = bkc.createLedger(BookKeeper.DigestType.CRC32,
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestLedgerFragmentReplication.java Sat Dec 29 15:31:46 2012
@@ -71,7 +71,7 @@ public class TestLedgerFragmentReplicati
* Tests that replicate method should replicate the failed bookie fragments
* to target bookie passed.
*/
- @Test
+ @Test(timeout=60000)
public void testReplicateLFShouldCopyFailedBookieFragmentsToTargetBookie()
throws Exception {
byte[] data = "TestLedgerFragmentReplication".getBytes();
@@ -128,7 +128,7 @@ public class TestLedgerFragmentReplicati
* Tests that fragment re-replication fails on last unclosed ledger
* fragments.
*/
- @Test
+ @Test(timeout=60000)
public void testReplicateLFFailsOnlyOnLastUnClosedFragments()
throws Exception {
byte[] data = "TestLedgerFragmentReplication".getBytes();
@@ -186,7 +186,7 @@ public class TestLedgerFragmentReplicati
* Tests that ReplicateLedgerFragment should return false if replication
* fails
*/
- @Test
+ @Test(timeout=60000)
public void testReplicateLFShouldReturnFalseIfTheReplicationFails()
throws Exception {
byte[] data = "TestLedgerFragmentReplication".getBytes();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestReadTimeout.java Sat Dec 29 15:31:46 2012
@@ -57,7 +57,7 @@ public class TestReadTimeout extends Boo
this.digestType = DigestType.CRC32;
}
- @Test
+ @Test(timeout=60000)
public void testReadTimeout() throws Exception {
final AtomicBoolean completed = new AtomicBoolean(false);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestSpeculativeRead.java Sat Dec 29 15:31:46 2012
@@ -120,7 +120,7 @@ public class TestSpeculativeRead extends
* - read second bookie, spec client should find on bookie three,
* non spec client should hang.
*/
- @Test
+ @Test(timeout=60000)
public void testSpeculativeRead() throws Exception {
long id = getLedgerToRead(3,2);
BookKeeper bknospec = createClient(0); // disabled
@@ -164,7 +164,7 @@ public class TestSpeculativeRead extends
* Test that if more than one replica is down, we can still read, as long as the quorum
* size is larger than the number of down replicas.
*/
- @Test
+ @Test(timeout=60000)
public void testSpeculativeReadMultipleReplicasDown() throws Exception {
long id = getLedgerToRead(5,5);
int timeout = 5000;
@@ -235,7 +235,7 @@ public class TestSpeculativeRead extends
* Test that if after a speculative read is kicked off, the original read completes
* nothing bad happens.
*/
- @Test
+ @Test(timeout=60000)
public void testSpeculativeReadFirstReadCompleteIsOk() throws Exception {
long id = getLedgerToRead(2,2);
int timeout = 1000;
@@ -278,7 +278,7 @@ public class TestSpeculativeRead extends
/**
* Unit test for the speculative read scheduling method
*/
- @Test
+ @Test(timeout=60000)
public void testSpeculativeReadScheduling() throws Exception {
long id = getLedgerToRead(3,2);
int timeout = 1000;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java Sat Dec 29 15:31:46 2012
@@ -85,7 +85,7 @@ public class GcLedgersTest extends Ledge
}
}
- @Test
+ @Test(timeout=60000)
public void testGarbageCollectLedgers() throws Exception {
int numLedgers = 100;
int numRemovedLedgers = 10;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerLayoutTest.java Sat Dec 29 15:31:46 2012
@@ -37,7 +37,7 @@ public class LedgerLayoutTest extends Bo
super(0);
}
- @Test
+ @Test(timeout=60000)
public void testLedgerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
conf.setLedgerManagerFactoryClass(HierarchicalLedgerManagerFactory.class);
@@ -74,7 +74,7 @@ public class LedgerLayoutTest extends Bo
layout.store(zkc, ledgersRootPath);
}
- @Test
+ @Test(timeout=60000)
public void testBadVersionLedgerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
// write bad version ledger layout
@@ -91,7 +91,7 @@ public class LedgerLayoutTest extends Bo
}
}
- @Test
+ @Test(timeout=60000)
public void testAbsentLedgerManagerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
String ledgersLayout = conf.getZkLedgersRootPath() + "/"
@@ -110,7 +110,7 @@ public class LedgerLayoutTest extends Bo
}
}
- @Test
+ @Test(timeout=60000)
public void testBaseLedgerManagerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
String rootPath = conf.getZkLedgersRootPath();
@@ -131,7 +131,7 @@ public class LedgerLayoutTest extends Bo
}
}
- @Test
+ @Test(timeout=60000)
public void testReadV1LedgerManagerLayout() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
// write v1 ledger layout
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestLedgerManager.java Sat Dec 29 15:31:46 2012
@@ -65,7 +65,7 @@ public class TestLedgerManager extends B
/**
* Test bad client configuration
*/
- @Test
+ @Test(timeout=60000)
public void testBadConf() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
@@ -111,7 +111,7 @@ public class TestLedgerManager extends B
/**
* Test bad client configuration
*/
- @Test
+ @Test(timeout=60000)
public void testBadConfV1() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
@@ -152,7 +152,7 @@ public class TestLedgerManager extends B
/**
* Test bad zk configuration
*/
- @Test
+ @Test(timeout=60000)
public void testBadZkContents() throws Exception {
ClientConfiguration conf = new ClientConfiguration();
@@ -240,7 +240,7 @@ public class TestLedgerManager extends B
}
// test concurrent
- @Test
+ @Test(timeout=60000)
public void testConcurrent1() throws Exception {
/// everyone creates the same
int numThreads = 50;
@@ -270,7 +270,7 @@ public class TestLedgerManager extends B
assertTrue("Not all ledger managers created", success);
}
- @Test
+ @Test(timeout=60000)
public void testConcurrent2() throws Exception {
/// odd create different
int numThreadsEach = 25;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestZkVersion.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestZkVersion.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestZkVersion.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/TestZkVersion.java Sat Dec 29 15:31:46 2012
@@ -28,7 +28,7 @@ import org.apache.bookkeeper.versioning.
public class TestZkVersion {
- @Test
+ @Test(timeout=60000)
public void testNullZkVersion() {
ZkVersion zkVersion = new ZkVersion(99);
try {
@@ -38,7 +38,7 @@ public class TestZkVersion {
}
}
- @Test
+ @Test(timeout=60000)
public void testInvalidVersion() {
ZkVersion zkVersion = new ZkVersion(99);
try {
@@ -53,7 +53,7 @@ public class TestZkVersion {
}
}
- @Test
+ @Test(timeout=60000)
public void testCompare() {
ZkVersion zv = new ZkVersion(99);
Assert.assertEquals(Occurred.AFTER, zv.compare(new ZkVersion(98)));
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/metastore/TestMetaStore.java Sat Dec 29 15:31:46 2012
@@ -295,7 +295,7 @@ public class TestMetaStore extends TestC
/**
* Test (get, get partial field, remove) on non-existent element.
*/
- @Test
+ @Test(timeout=60000)
public void testNonExistent() throws Exception {
// get
try {
@@ -324,7 +324,7 @@ public class TestMetaStore extends TestC
/**
* Test usage of get operation on (full and partial) fields.
*/
- @Test
+ @Test(timeout=60000)
public void testGet() throws Exception {
Versioned<Value> vv;
@@ -371,7 +371,7 @@ public class TestMetaStore extends TestC
/**
* Test usage of put operation with (full and partial) fields.
*/
- @Test
+ @Test(timeout=60000)
public void testPut() throws Exception {
final Integer counter = getRandom();
final String name = "put";
@@ -462,7 +462,7 @@ public class TestMetaStore extends TestC
* Test usage of (unconditional remove, BadVersion remove, CorrectVersion
* remove) operation.
*/
- @Test
+ @Test(timeout=60000)
public void testRemove() throws Exception {
final Integer counter = getRandom();
final String name = "remove";
@@ -541,7 +541,7 @@ public class TestMetaStore extends TestC
/**
* Test usage of (scan) operation on (full and partial) fields.
*/
- @Test
+ @Test(timeout=60000)
public void testOpenCursor() throws Exception {
TreeMap<String, Value> allValues = Maps.newTreeMap();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestBKStats.java Sat Dec 29 15:31:46 2012
@@ -32,7 +32,7 @@ public class TestBKStats {
* 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/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestProtoVersions.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestProtoVersions.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestProtoVersions.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/TestProtoVersions.java Sat Dec 29 15:31:46 2012
@@ -103,7 +103,7 @@ public class TestProtoVersions {
bc.close();
}
- @Test
+ @Test(timeout=60000)
public void testVersions() throws Exception {
testVersion(BookieProtocol.LOWEST_COMPAT_PROTOCOL_VERSION-1, BKException.Code.ProtocolVersionException);
testVersion(BookieProtocol.LOWEST_COMPAT_PROTOCOL_VERSION, BKException.Code.NoSuchEntryException);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java Sat Dec 29 15:31:46 2012
@@ -80,7 +80,7 @@ public class AuditorBookieTest extends B
* other than auditor bookie shouldn't initiate re-election and multiple
* auditors.
*/
- @Test
+ @Test(timeout=60000)
public void testEnsureOnlySingleAuditor() throws Exception {
BookieServer auditor = verifyAuditor();
@@ -107,7 +107,7 @@ public class AuditorBookieTest extends B
* Test Auditor crashes should trigger re-election and another bookie should
* take over the auditor ship
*/
- @Test
+ @Test(timeout=60000)
public void testSuccessiveAuditorCrashes() throws Exception {
BookieServer auditor = verifyAuditor();
shutdownBookie(auditor);
@@ -127,7 +127,7 @@ public class AuditorBookieTest extends B
* Test restarting the entire bookie cluster. It shouldn't create multiple
* bookie auditors
*/
- @Test
+ @Test(timeout=60000)
public void testBookieClusterRestart() throws Exception {
BookieServer auditor = verifyAuditor();
for (AuditorElector auditorElector : auditorElectors.values()) {
@@ -148,7 +148,7 @@ public class AuditorBookieTest extends B
/**
* Test the vote is deleting from the ZooKeeper during shutdown.
*/
- @Test
+ @Test(timeout=60000)
public void testShutdown() throws Exception {
BookieServer auditor = verifyAuditor();
shutdownBookie(auditor);
@@ -176,7 +176,7 @@ public class AuditorBookieTest extends B
* Test restart of the previous Auditor bookie shouldn't initiate
* re-election and should create new vote after restarting.
*/
- @Test
+ @Test(timeout=60000)
public void testRestartAuditorBookieAfterCrashing() throws Exception {
BookieServer auditor = verifyAuditor();
@@ -211,7 +211,7 @@ public class AuditorBookieTest extends B
* Test that, if an auditor looses its ZK connection/session
* it will shutdown.
*/
- @Test
+ @Test(timeout=60000)
public void testAuditorZKSessionLoss() throws Exception {
stopZKCluster();
for (AuditorElector e : auditorElectors.values()) {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java Sat Dec 29 15:31:46 2012
@@ -128,7 +128,7 @@ public class AuditorLedgerCheckerTest ex
/**
* Test publishing of under replicated ledgers by the auditor bookie
*/
- @Test
+ @Test(timeout=60000)
public void testSimpleLedger() throws Exception {
LedgerHandle lh1 = createAndAddEntriesToLedger();
Long ledgerId = lh1.getId();
@@ -166,7 +166,7 @@ public class AuditorLedgerCheckerTest ex
* Test once published under replicated ledger should exists even after
* restarting respective bookie
*/
- @Test
+ @Test(timeout=60000)
public void testRestartBookie() throws Exception {
LedgerHandle lh1 = createAndAddEntriesToLedger();
ledgerList.add(lh1.getId());
@@ -215,7 +215,7 @@ public class AuditorLedgerCheckerTest ex
* Test publishing of under replicated ledgers when multiple bookie failures
* one after another.
*/
- @Test
+ @Test(timeout=60000)
public void testMultipleBookieFailures() throws Exception {
LedgerHandle lh1 = createAndAddEntriesToLedger();
ledgerList.add(lh1.getId());
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/BookieLedgerIndexTest.java Sat Dec 29 15:31:46 2012
@@ -102,7 +102,7 @@ public class BookieLedgerIndexTest exten
* Verify the bookie-ledger mapping with minimum number of bookies and few
* ledgers
*/
- @Test
+ @Test(timeout=60000)
public void testSimpleBookieLedgerMapping() throws Exception {
for (int i = 0; i < numberOfLedgers; i++) {
@@ -131,7 +131,7 @@ public class BookieLedgerIndexTest exten
/**
* Verify ledger index with failed bookies and throws exception
*/
- @Test
+ @Test(timeout=60000)
public void testWithoutZookeeper() throws Exception {
// This test case is for ledger metadata that stored in ZooKeeper. As
// far as MSLedgerManagerFactory, ledger metadata are stored in other
@@ -158,7 +158,7 @@ public class BookieLedgerIndexTest exten
/**
* Verify indexing with multiple ensemble reformation
*/
- @Test
+ @Test(timeout=60000)
public void testEnsembleReformation() throws Exception {
try {
LedgerHandle lh1 = createAndAddEntriesToLedger();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/TestLedgerUnderreplicationManager.java Sat Dec 29 15:31:46 2012
@@ -157,7 +157,7 @@ public class TestLedgerUnderreplicationM
* Ensure that getLedgerToReplicate will block until it a ledger
* becomes available.
*/
- @Test
+ @Test(timeout=60000)
public void testBasicInteraction() throws Exception {
Set<Long> ledgers = new HashSet<Long>();
ledgers.add(0xdeadbeefL);
@@ -203,7 +203,7 @@ public class TestLedgerUnderreplicationM
* client shouldn't be able to get it. If the first client dies
* however, the second client should be able to get it.
*/
- @Test
+ @Test(timeout=60000)
public void testLocking() throws Exception {
String missingReplica = "localhost:3181";
@@ -240,7 +240,7 @@ public class TestLedgerUnderreplicationM
* acquire a ledger, and that it's not the one that was previously
* marked as replicated.
*/
- @Test
+ @Test(timeout=60000)
public void testMarkingAsReplicated() throws Exception {
String missingReplica = "localhost:3181";
@@ -284,7 +284,7 @@ public class TestLedgerUnderreplicationM
* When a client releases a previously acquired ledger, another
* client should then be able to acquire it.
*/
- @Test
+ @Test(timeout=60000)
public void testRelease() throws Exception {
String missingReplica = "localhost:3181";
@@ -326,7 +326,7 @@ public class TestLedgerUnderreplicationM
* under replicated ledger list when first rereplicating client marks
* it as replicated.
*/
- @Test
+ @Test(timeout=60000)
public void testManyFailures() throws Exception {
String missingReplica1 = "localhost:3181";
String missingReplica2 = "localhost:3182";
@@ -356,7 +356,7 @@ public class TestLedgerUnderreplicationM
* the same missing replica twice, only marking as replicated
* will be enough to remove it from the list.
*/
- @Test
+ @Test(timeout=60000)
public void test2reportSame() throws Exception {
String missingReplica1 = "localhost:3181";
@@ -454,7 +454,7 @@ public class TestLedgerUnderreplicationM
* localhost:3181, localhost:318, localhost:31812
* *******************************************************************
*/
- @Test
+ @Test(timeout=60000)
public void testMarkSimilarMissingReplica() throws Exception {
List<String> missingReplica = new ArrayList<String>();
missingReplica.add("localhost:3181");
@@ -471,7 +471,7 @@ public class TestLedgerUnderreplicationM
* Test multiple bookie failures for a ledger and marked as underreplicated
* one after another.
*/
- @Test
+ @Test(timeout=60000)
public void testManyFailuresInAnEnsemble() throws Exception {
List<String> missingReplica = new ArrayList<String>();
missingReplica.add("localhost:3181");
@@ -596,7 +596,7 @@ public class TestLedgerUnderreplicationM
* Test that the hierarchy gets cleaned up as ledgers
* are marked as fully replicated
*/
- @Test
+ @Test(timeout=60000)
public void testHierarchyCleanup() throws Exception {
final LedgerUnderreplicationManager replicaMgr = lmf1
.newLedgerUnderreplicationManager();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/AsyncLedgerOpsTest.java Sat Dec 29 15:31:46 2012
@@ -101,7 +101,7 @@ public class AsyncLedgerOpsTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testAsyncCreateClose() throws IOException, BKException {
try {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieClientTest.java Sat Dec 29 15:31:46 2012
@@ -124,7 +124,7 @@ public class BookieClientTest extends Te
}
};
- @Test
+ @Test(timeout=60000)
public void testWriteGaps() throws Exception {
final Object notifyObject = new Object();
byte[] passwd = new byte[20];
@@ -229,7 +229,7 @@ public class BookieClientTest extends Te
return ChannelBuffers.wrappedBuffer(bb);
}
- @Test
+ @Test(timeout=60000)
public void testNoLedger() throws Exception {
ResultStruct arc = new ResultStruct();
InetSocketAddress addr = new InetSocketAddress("127.0.0.1", port);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java Sat Dec 29 15:31:46 2012
@@ -96,31 +96,31 @@ public class BookieFailureTest extends M
*
* @throws {@link IOException}
*/
- @Test
+ @Test(timeout=60000)
public void testAsyncBK1() throws IOException {
LOG.info("#### BK1 ####");
auxTestReadWriteAsyncSingleClient(bs.get(0));
}
- @Test
+ @Test(timeout=60000)
public void testAsyncBK2() throws IOException {
LOG.info("#### BK2 ####");
auxTestReadWriteAsyncSingleClient(bs.get(1));
}
- @Test
+ @Test(timeout=60000)
public void testAsyncBK3() throws IOException {
LOG.info("#### BK3 ####");
auxTestReadWriteAsyncSingleClient(bs.get(2));
}
- @Test
+ @Test(timeout=60000)
public void testAsyncBK4() throws IOException {
LOG.info("#### BK4 ####");
auxTestReadWriteAsyncSingleClient(bs.get(3));
}
- @Test
+ @Test(timeout=60000)
public void testBookieRecovery() throws Exception {
//Shutdown all but 1 bookie
bs.get(0).shutdown();
@@ -284,7 +284,7 @@ public class BookieFailureTest extends M
zkc.close();
}
- @Test
+ @Test(timeout=60000)
public void testLedgerNoRecoveryOpenAfterBKCrashed() throws Exception {
// Create a ledger
LedgerHandle beforelh = bkc.createLedger(numBookies, numBookies, digestType, "".getBytes());
@@ -322,7 +322,7 @@ public class BookieFailureTest extends M
}
}
- @Test
+ @Test(timeout=60000)
public void testLedgerOpenAfterBKCrashed() throws Exception {
// Create a ledger
LedgerHandle beforelh = bkc.createLedger(numBookies, numBookies, digestType, "".getBytes());
@@ -370,7 +370,7 @@ public class BookieFailureTest extends M
*
* BOOKKEEPER-326
*/
- @Test
+ @Test(timeout=60000)
public void testReadLastConfirmedOp() throws Exception {
startNewBookie();
startNewBookie();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java Sat Dec 29 15:31:46 2012
@@ -153,7 +153,7 @@ public class BookieJournalRollingTest ex
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testJournalRolling() throws Exception {
if (LOG.isDebugEnabled()) {
LOG.debug("Testing Journal Rolling");
@@ -193,7 +193,7 @@ public class BookieJournalRollingTest ex
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testJournalRollingWithoutSyncup() throws Exception {
if (LOG.isDebugEnabled()) {
LOG.debug("Testing Journal Rolling without sync up");
@@ -225,7 +225,7 @@ public class BookieJournalRollingTest ex
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testReplayDeletedLedgerJournalEntries() throws Exception {
if (LOG.isDebugEnabled()) {
LOG.debug("Testing replaying journal entries whose ledger has been removed.");
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieReadWriteTest.java Sat Dec 29 15:31:46 2012
@@ -120,7 +120,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testOpenException() throws IOException, InterruptedException {
try {
lh = bkc.openLedger(0, digestType, ledgerPassword);
@@ -135,7 +135,7 @@ public class BookieReadWriteTest extends
*
* @throws {@link IOException}
*/
- @Test
+ @Test(timeout=60000)
public void testStreamingClients() throws IOException, BKException, InterruptedException {
lh = bkc.createLedger(digestType, ledgerPassword);
// write a string so that we cna
@@ -183,7 +183,7 @@ public class BookieReadWriteTest extends
lh.close();
}
- @Test
+ @Test(timeout=60000)
public void testReadWriteAsyncSingleClient() throws IOException {
SyncObj sync = new SyncObj();
try {
@@ -269,7 +269,7 @@ public class BookieReadWriteTest extends
* First try varying the offset. Then the length with a fixed non-zero
* offset.
*/
- @Test
+ @Test(timeout=60000)
public void testReadWriteRangeAsyncSingleClient() throws IOException {
SyncObj sync = new SyncObj();
try {
@@ -415,7 +415,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testSyncReadAsyncWriteStringsSingleClient() throws IOException {
SyncObj sync = new SyncObj();
LOG.info("TEST READ WRITE STRINGS MIXED SINGLE CLIENT");
@@ -490,7 +490,7 @@ public class BookieReadWriteTest extends
}
- @Test
+ @Test(timeout=60000)
public void testReadWriteSyncSingleClient() throws IOException {
try {
// Create a ledger
@@ -533,7 +533,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testReadWriteZero() throws IOException {
try {
// Create a ledger
@@ -577,7 +577,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testMultiLedger() throws IOException {
try {
// Create a ledger
@@ -633,7 +633,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testReadWriteAsyncLength() throws IOException {
SyncObj sync = new SyncObj();
try {
@@ -684,7 +684,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testReadFromOpenLedger() throws IOException {
try {
// Create a ledger
@@ -775,7 +775,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testReadFromOpenLedgerOpenOnce() throws Exception {
try {
// Create a ledger
@@ -835,7 +835,7 @@ public class BookieReadWriteTest extends
}
}
- @Test
+ @Test(timeout=60000)
public void testReadFromOpenLedgerZeroAndOne() throws Exception {
try {
// Create a ledger
@@ -903,7 +903,7 @@ public class BookieReadWriteTest extends
}
- @Test
+ @Test(timeout=60000)
public void testLastConfirmedAdd() throws IOException {
try {
// Create a ledger
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java Sat Dec 29 15:31:46 2012
@@ -42,7 +42,7 @@ public class BookieZKExpireTest extends
baseClientConf.setZkTimeout(6000);
}
- @Test
+ @Test(timeout=60000)
public void testBookieServerZKExpireBehaviour() throws Exception {
BookieServer server = null;
try {
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/CloseTest.java Sat Dec 29 15:31:46 2012
@@ -42,7 +42,7 @@ public class CloseTest extends BaseTestC
this.digestType = digestType;
}
- @Test
+ @Test(timeout=60000)
public void testClose() throws Exception {
/*
@@ -73,7 +73,7 @@ public class CloseTest extends BaseTestC
}
}
- @Test
+ @Test(timeout=60000)
public void testCloseByOthers() throws Exception {
int numLedgers = 1;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java Sat Dec 29 15:31:46 2012
@@ -114,7 +114,7 @@ public class ConcurrentLedgerTest extend
iterationStep = Integer.parseInt(iterationsString);
}
}
- @Test
+ @Test(timeout=60000)
public void testConcurrentWrite() throws IOException, InterruptedException, BookieException {
int size = 1024;
int totalwrites = 128;
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConditionalSetTest.java Sat Dec 29 15:31:46 2012
@@ -82,7 +82,7 @@ public class ConditionalSetTest extends
* @throws KeeperException
*/
- @Test
+ @Test(timeout=60000)
public void testConditionalSet() throws IOException, InterruptedException,
BKException, KeeperException {
LedgerHandle lhWrite = bkc.createLedger(digestType, new byte[] { 'a',
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConfigurationTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConfigurationTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConfigurationTest.java Sat Dec 29 15:31:46 2012
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
import org.junit.Test;
public class ConfigurationTest extends TestCase {
- @Test
+ @Test(timeout=60000)
public void testConfigurationOverwrite() {
System.clearProperty("zkServers");
@@ -54,7 +54,7 @@ public class ConfigurationTest extends T
assertEquals("newserver", conf2.getZkServers());
}
- @Test
+ @Test(timeout=60000)
public void testGetZkServers() {
System.setProperty("zkServers", "server1:port1,server2:port2");
ServerConfiguration conf = new ServerConfiguration();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/IndexCorruptionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/IndexCorruptionTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/IndexCorruptionTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/IndexCorruptionTest.java Sat Dec 29 15:31:46 2012
@@ -63,7 +63,7 @@ public class IndexCorruptionTest extends
return null;
}
- @Test
+ @Test(timeout=60000)
public void testNoSuchLedger() throws Exception {
LOG.debug("Testing NoSuchLedger");
@@ -106,7 +106,7 @@ public class IndexCorruptionTest extends
assertEquals(entryId, numMsgs);
}
- @Test
+ @Test(timeout=60000)
public void testEmptyIndexPage() throws Exception {
LOG.debug("Testing EmptyIndexPage");
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCreateDeleteTest.java Sat Dec 29 15:31:46 2012
@@ -45,7 +45,7 @@ public class LedgerCreateDeleteTest exte
super.setUp();
}
- @Test
+ @Test(timeout=60000)
public void testCreateDeleteLedgers() throws Exception {
int numLedgers = 3;
ArrayList<Long> ledgers = new ArrayList<Long>();
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerDeleteTest.java Sat Dec 29 15:31:46 2012
@@ -92,7 +92,7 @@ public class LedgerDeleteTest extends Mu
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testLedgerDelete() throws Exception {
// Write enough ledger entries so that we roll over the initial entryLog (0.log)
LedgerHandle[] lhs = writeLedgerEntries(3, 1024, 1024);
@@ -119,7 +119,7 @@ public class LedgerDeleteTest extends Mu
*
* @throws Exception
*/
- @Test
+ @Test(timeout=60000)
public void testLedgerDeleteWithExistingEntryLogs() throws Exception {
// Write enough ledger entries so that we roll over the initial entryLog (0.log)
LedgerHandle[] lhs = writeLedgerEntries(3, 1024, 1024);
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java?rev=1426772&r1=1426771&r2=1426772&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/NIOServerFactoryTest.java Sat Dec 29 15:31:46 2012
@@ -44,7 +44,7 @@ public class NIOServerFactoryTest extend
};
- @Test
+ @Test(timeout=60000)
public void testProblemProcessor() throws Exception {
ServerConfiguration conf = new ServerConfiguration();
int port = PortManager.nextFreePort();