You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/05/11 21:55:54 UTC
incubator-omid git commit: Add missing timeouts to tests
Repository: incubator-omid
Updated Branches:
refs/heads/master 2dc484e4b -> c521bf32c
Add missing timeouts to tests
Change-Id: I5e293570ade75e5b9faa28e9f16fb405c480e557
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/c521bf32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/c521bf32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/c521bf32
Branch: refs/heads/master
Commit: c521bf32c872b7e723919933aca53fc7d7a1b904
Parents: 2dc484e
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Wed May 11 14:54:28 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Wed May 11 14:54:28 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/omid/YAMLUtilsTest.java | 6 ++--
.../apache/omid/transaction/TestAutoFlush.java | 2 +-
.../TestBaillisAnomaliesWithTXs.java | 14 +++++-----
.../apache/omid/transaction/TestCellUtils.java | 29 ++++++++++----------
.../omid/transaction/TestColumnIterator.java | 2 +-
.../apache/omid/transaction/TestDeletion.java | 10 +++----
.../TestHBaseOmidClientConfiguration.java | 4 +--
.../apache/omid/transaction/TestReadPath.java | 4 +--
.../omid/transaction/TestShadowCells.java | 2 +-
.../transaction/TestSingleColumnFamily.java | 2 +-
.../transaction/TestTransactionCleanup.java | 2 +-
.../transaction/TestTransactionConflict.java | 10 +++----
.../apache/omid/transaction/TestUpdateScan.java | 26 +++++++-----------
.../hbase/TestHBaseCommitTableKey.java | 4 +--
.../apache/omid/transaction/TestCompaction.java | 16 +++++------
.../omid/transaction/TestCompactorScanner.java | 2 +-
.../apache/statemachine/TestStateMachine.java | 2 +-
.../storage/TestHBaseTimestampStorage.java | 2 +-
.../storage/TestZKTimestampStorage.java | 17 ++++++------
.../omid/tso/client/TestMockTSOClient.java | 4 +--
.../tso/client/TestOmidClientConfiguration.java | 2 +-
.../apache/omid/tso/TSOServerConfigTest.java | 2 +-
.../org/apache/omid/tso/TestLeaseManager.java | 2 +-
.../java/org/apache/omid/tso/TestLongCache.java | 4 +--
.../java/org/apache/omid/tso/TestPanicker.java | 6 ++--
.../omid/tso/TestPersistenceProcessor.java | 14 ++++------
.../apache/omid/tso/TestTSOStateManager.java | 4 +--
...stTSOClientRequestAndResponseBehaviours.java | 8 ++----
.../client/TestTSOClientResponseHandling.java | 6 ++--
29 files changed, 98 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/common/src/test/java/org/apache/omid/YAMLUtilsTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/omid/YAMLUtilsTest.java b/common/src/test/java/org/apache/omid/YAMLUtilsTest.java
index fa6d2fe..7305406 100644
--- a/common/src/test/java/org/apache/omid/YAMLUtilsTest.java
+++ b/common/src/test/java/org/apache/omid/YAMLUtilsTest.java
@@ -17,17 +17,15 @@
*/
package org.apache.omid;
-
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
public class YAMLUtilsTest {
- @Test
+ @Test(timeOut = 10_000)
public void testLoadDefaultSettings_setToBean() throws Exception {
Map map = new HashMap();
new YAMLUtils().loadSettings("test.yml", "default-test.yml", map);
@@ -37,7 +35,7 @@ public class YAMLUtilsTest {
Assert.assertEquals(map.get("prop3"), 3);
}
- @Test
+ @Test(timeOut = 10_000)
public void testLoadDefaultSettings_setToBean2() throws Exception {
Map map = new HashMap();
new YAMLUtils().loadSettings("test.yml", map);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestAutoFlush.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestAutoFlush.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestAutoFlush.java
index dca346b..305e80a 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestAutoFlush.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestAutoFlush.java
@@ -29,7 +29,7 @@ import static org.testng.Assert.assertEquals;
@Test(groups = "sharedHBase")
public class TestAutoFlush extends OmidTestBase {
- @Test
+ @Test(timeOut = 10_000)
public void testReadWithSeveralUncommitted(ITestContext context) throws Exception {
byte[] family = Bytes.toBytes(TEST_FAMILY);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.java
index 5bfc8d5..cd6216c 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestBaillisAnomaliesWithTXs.java
@@ -76,7 +76,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
private byte[] dataValue3 = Bytes.toBytes(30);
- @Test
+ @Test(timeOut = 10_000)
public void testSIPreventsPredicateManyPrecedersForReadPredicates(ITestContext context) throws Exception {
// TX History for PMP for Read Predicate:
// begin; set transaction isolation level repeatable read; -- T1
@@ -117,7 +117,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
tm.commit(tx1);
}
- @Test
+ @Test(timeOut = 10_000)
public void testSIPreventsPredicateManyPrecedersForWritePredicates(ITestContext context) throws Exception {
// TX History for PMP for Write Predicate:
// begin; set transaction isolation level repeatable read; -- T1
@@ -184,7 +184,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void testSIPreventsLostUpdates(ITestContext context) throws Exception {
// TX History for P4:
// begin; set transaction isolation level repeatable read; -- T1
@@ -258,7 +258,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void testSIPreventsReadSkew(ITestContext context) throws Exception {
// TX History for G-single:
// begin; set transaction isolation level repeatable read; -- T1
@@ -359,7 +359,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void testSIPreventsReadSkewUsingWritePredicate(ITestContext context) throws Exception {
// TX History for G-single:
// begin; set transaction isolation level repeatable read; -- T1
@@ -421,7 +421,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
}
// this test shows that Omid does not provide serilizable level of isolation other wise last commit would have failed
- @Test
+ @Test(timeOut = 10_000)
public void testSIDoesNotPreventWriteSkew(ITestContext context) throws Exception {
// TX History for G2-item:
// begin; set transaction isolation level repeatable read; -- T1
@@ -508,7 +508,7 @@ public class TestBaillisAnomaliesWithTXs extends OmidTestBase {
}
// this test shows that Omid does not provide serilizable level of isolation other wise last commit would have failed
- @Test
+ @Test(timeOut = 10_000)
public void testSIDoesNotPreventAntiDependencyCycles(ITestContext context) throws Exception {
// TX History for G2:
// begin; set transaction isolation level repeatable read; -- T1
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
index 351b57c..2fdd6a9 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
@@ -52,7 +52,7 @@ public class TestCellUtils {
};
}
- @Test(dataProvider = "shadow-cell-suffixes")
+ @Test(dataProvider = "shadow-cell-suffixes", timeOut = 10_000)
public void testShadowCellQualifiers(byte[] shadowCellSuffixToTest) throws IOException {
final byte[] validShadowCellQualifier =
@@ -62,9 +62,8 @@ public class TestCellUtils {
final byte[] doubleEndedValidShadowCellQualifier =
com.google.common.primitives.Bytes.concat(validShadowCellQualifier, shadowCellSuffixToTest);
final byte[] interleavedValidShadowCellQualifier =
- com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
- com.google.common.primitives.Bytes
- .concat(validShadowCellQualifier, validShadowCellQualifier));
+ com.google.common.primitives.Bytes.concat(validShadowCellQualifier, com.google.common.primitives.Bytes
+ .concat(validShadowCellQualifier, validShadowCellQualifier));
final byte[] value = Bytes.toBytes("test-value");
// Test the qualifier passed is a shadow cell
@@ -96,7 +95,7 @@ public class TestCellUtils {
}
- @Test
+ @Test(timeOut = 10_000)
public void testCorrectMapingOfCellsToShadowCells() throws IOException {
// Create the required data
final byte[] validShadowCellQualifier =
@@ -169,27 +168,27 @@ public class TestCellUtils {
}
- @Test
+ @Test(timeOut = 10_000)
public void testShadowCellSuffixConcatenationToQualifier() {
Cell cell = new KeyValue(row, family, qualifier, 1, Bytes.toBytes("value"));
byte[] suffixedQualifier = CellUtils.addShadowCellSuffix(cell.getQualifierArray(),
- cell.getQualifierOffset(),
- cell.getQualifierLength());
+ cell.getQualifierOffset(),
+ cell.getQualifierLength());
byte[] expectedQualifier = com.google.common.primitives.Bytes.concat(qualifier, SHADOW_CELL_SUFFIX);
assertEquals(suffixedQualifier, expectedQualifier);
}
- @Test(dataProvider = "shadow-cell-suffixes")
+ @Test(dataProvider = "shadow-cell-suffixes", timeOut = 10_000)
public void testShadowCellSuffixRemovalFromQualifier(byte[] shadowCellSuffixToTest) throws IOException {
// Test removal from a correclty suffixed qualifier
byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
Cell cell = new KeyValue(row, family, suffixedQualifier, 1, Bytes.toBytes("value"));
byte[] resultedQualifier = CellUtils.removeShadowCellSuffix(cell.getQualifierArray(),
- cell.getQualifierOffset(),
- cell.getQualifierLength());
+ cell.getQualifierOffset(),
+ cell.getQualifierLength());
byte[] expectedQualifier = qualifier;
assertEquals(resultedQualifier, expectedQualifier);
@@ -198,22 +197,22 @@ public class TestCellUtils {
Cell badCell = new KeyValue(row, family, badlySuffixedQualifier, 1, Bytes.toBytes("value"));
try {
CellUtils.removeShadowCellSuffix(badCell.getQualifierArray(),
- badCell.getQualifierOffset(),
- badCell.getQualifierLength());
+ badCell.getQualifierOffset(),
+ badCell.getQualifierLength());
fail();
} catch (IllegalArgumentException e) {
// Expected
}
}
- @Test
+ @Test(timeOut = 10_000)
public void testMatchingQualifiers() {
Cell cell = new KeyValue(row, family, qualifier, 1, Bytes.toBytes("value"));
assertTrue(CellUtils.matchingQualifier(cell, qualifier, 0, qualifier.length));
assertFalse(CellUtils.matchingQualifier(cell, otherQualifier, 0, otherQualifier.length));
}
- @Test(dataProvider = "shadow-cell-suffixes")
+ @Test(dataProvider = "shadow-cell-suffixes", timeOut = 10_000)
public void testQualifierLengthFromShadowCellQualifier(byte[] shadowCellSuffixToTest) {
// Test suffixed qualifier
byte[] suffixedQualifier = com.google.common.primitives.Bytes.concat(qualifier, shadowCellSuffixToTest);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestColumnIterator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestColumnIterator.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestColumnIterator.java
index f4df0b2..2eacd22 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestColumnIterator.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestColumnIterator.java
@@ -57,7 +57,7 @@ public class TestColumnIterator {
)
);
- @Test
+ @Test(timeOut = 10_000)
public void testGroupingCellsByColumnFilteringShadowCells() {
ImmutableList<Collection<Cell>> groupedColumnsWithoutShadowCells =
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestDeletion.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestDeletion.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestDeletion.java
index 6b7eaa5..b258830 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestDeletion.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestDeletion.java
@@ -61,7 +61,7 @@ public class TestDeletion extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void runTestDeleteFamily(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
@@ -98,7 +98,7 @@ public class TestDeletion extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void runTestDeleteColumn(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
@@ -139,7 +139,7 @@ public class TestDeletion extends OmidTestBase {
/**
* This test is very similar to #runTestDeleteColumn() but exercises Delete#deleteColumns()
*/
- @Test
+ @Test(timeOut = 10_000)
public void runTestDeleteColumns(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
@@ -178,7 +178,7 @@ public class TestDeletion extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void runTestDeleteRow(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable tt = new TTable(hbaseConf, TEST_TABLE);
@@ -213,7 +213,7 @@ public class TestDeletion extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void testDeletionOfNonExistingColumnFamilyDoesNotWriteToHBase(ITestContext context) throws Exception {
// --------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.java
index 90dd383..5eefeec 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseOmidClientConfiguration.java
@@ -22,7 +22,7 @@ import org.testng.annotations.Test;
public class TestHBaseOmidClientConfiguration {
- @Test
+ @Test(timeOut = 10_000)
public void testYamlReading() {
HBaseOmidClientConfiguration configuration = new HBaseOmidClientConfiguration();
Assert.assertNotNull(configuration.getCommitTableName());
@@ -31,7 +31,7 @@ public class TestHBaseOmidClientConfiguration {
Assert.assertNotNull(configuration.getOmidClientConfiguration());
}
- @Test
+ @Test(timeOut = 10_000)
public void testYamlReadingFromFile() {
HBaseOmidClientConfiguration configuration = new HBaseOmidClientConfiguration("/test-hbase-omid-client-config.yml");
Assert.assertNotNull(configuration.getCommitTableName());
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestReadPath.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestReadPath.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestReadPath.java
index 2c48860..08a2e1b 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestReadPath.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestReadPath.java
@@ -43,7 +43,7 @@ public class TestReadPath extends OmidTestBase {
final byte[] data = Bytes.toBytes("data");
private final byte[] uncommitted = Bytes.toBytes("uncommitted");
- @Test
+ @Test(timeOut = 10_000)
public void testReadInterleaved(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable table = new TTable(hbaseConf, TEST_TABLE);
@@ -62,7 +62,7 @@ public class TestReadPath extends OmidTestBase {
assertFalse(result.containsColumn(family, col), "Should be unable to read column");
}
- @Test
+ @Test(timeOut = 10_000)
public void testReadWithSeveralUncommitted(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable table = new TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
index af5656c..75e64fd 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
@@ -398,7 +398,7 @@ public class TestShadowCells extends OmidTestBase {
/**
* Test that the new client can read shadow cells written by the old client.
*/
- @Test
+ @Test(timeOut = 60_000)
public void testGetOldShadowCells(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestSingleColumnFamily.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestSingleColumnFamily.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestSingleColumnFamily.java
index 87ed23c..5d141fd 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestSingleColumnFamily.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestSingleColumnFamily.java
@@ -34,7 +34,7 @@ public class TestSingleColumnFamily extends OmidTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TestSingleColumnFamily.class);
- @Test
+ @Test(timeOut = 10_000)
public void testSingleColumnFamily(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable table1 = new TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
index c3f85f2..543e0c2 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
@@ -56,7 +56,7 @@ public class TestTransactionCleanup extends OmidTestBase {
// lacks some assertions and includes some magic numbers, so we should
// try to review and improve the tests in these two classes in a further
// commit.
- @Test
+ @Test(timeOut = 10_000)
public void testTransactionIsCleanedUpAfterBeingAborted(ITestContext context) throws Exception {
final int ROWS_MODIFIED = 1;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionConflict.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionConflict.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionConflict.java
index a776a71..78cdd26 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionConflict.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionConflict.java
@@ -42,7 +42,7 @@ public class TestTransactionConflict extends OmidTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TestTransactionConflict.class);
- @Test
+ @Test(timeOut = 10_000)
public void runTestWriteWriteConflict(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable tt = new TTable(hbaseConf, TEST_TABLE);
@@ -76,7 +76,7 @@ public class TestTransactionConflict extends OmidTestBase {
}
}
- @Test
+ @Test(timeOut = 10_000)
public void runTestMultiTableConflict(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable tt = new TTable(hbaseConf, TEST_TABLE);
@@ -147,7 +147,7 @@ public class TestTransactionConflict extends OmidTestBase {
assertEquals(count, 1, "Should have cell");
}
- @Test
+ @Test(timeOut = 10_000)
public void runTestCleanupAfterConflict(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable tt = new TTable(hbaseConf, TEST_TABLE);
@@ -203,7 +203,7 @@ public class TestTransactionConflict extends OmidTestBase {
"Unexpected value for read: " + Bytes.toString(r.getValue(fam, col)));
}
- @Test
+ @Test(timeOut = 10_000)
public void testCleanupWithDeleteRow(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
@@ -274,7 +274,7 @@ public class TestTransactionConflict extends OmidTestBase {
}
- @Test
+ @Test(timeOut = 10_000)
public void testMultipleCellChangesOnSameRow(ITestContext context) throws Exception {
TransactionManager tm = newTransactionManager(context);
TTable tt = new TTable(hbaseConf, TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-client/src/test/java/org/apache/omid/transaction/TestUpdateScan.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestUpdateScan.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestUpdateScan.java
index 16cbea4..0f92d54 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestUpdateScan.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestUpdateScan.java
@@ -44,7 +44,7 @@ public class TestUpdateScan extends OmidTestBase {
private static final String TEST_COL = "value";
private static final String TEST_COL_2 = "col_2";
- @Test
+ @Test(timeOut = 10_000)
public void testGet(ITestContext context) throws Exception {
try {
TransactionManager tm = newTransactionManager(context);
@@ -64,8 +64,7 @@ public class TestUpdateScan extends OmidTestBase {
Get g = new Get(startKey);
Result r = table.get(t, g);
if (!r.isEmpty()) {
- int tmp = Bytes.toInt(r.getValue(Bytes.toBytes(TEST_FAMILY),
- Bytes.toBytes(TEST_COL)));
+ int tmp = Bytes.toInt(r.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
LOG.info("Result:" + tmp);
assertTrue(tmp == startKeyValue, "Bad value, should be " + startKeyValue + " but is " + tmp);
} else {
@@ -79,8 +78,7 @@ public class TestUpdateScan extends OmidTestBase {
boolean startInclusive = true;
if (!startInclusive) {
FilterList filters = new FilterList(FilterList.Operator.MUST_PASS_ALL);
- filters.addFilter(new RowFilter(CompareFilter.CompareOp.GREATER,
- new BinaryPrefixComparator(startKey)));
+ filters.addFilter(new RowFilter(CompareFilter.CompareOp.GREATER, new BinaryPrefixComparator(startKey)));
filters.addFilter(new WhileMatchFilter(toFilter));
s.setFilter(filters);
} else {
@@ -91,8 +89,7 @@ public class TestUpdateScan extends OmidTestBase {
Result rr;
int count = 0;
while ((rr = res.next()) != null) {
- int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
- Bytes.toBytes(TEST_COL)));
+ int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
LOG.info("Result: " + iTmp);
count++;
}
@@ -105,7 +102,7 @@ public class TestUpdateScan extends OmidTestBase {
}
}
- @Test
+ @Test(timeOut = 10_000)
public void testScan(ITestContext context) throws Exception {
try (TTable table = new TTable(hbaseConf, TEST_TABLE)) {
@@ -129,8 +126,7 @@ public class TestUpdateScan extends OmidTestBase {
Result rr;
int count = 0;
while ((rr = res.next()) != null) {
- int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
- Bytes.toBytes(TEST_COL)));
+ int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
LOG.info("Result: " + iTmp);
count++;
}
@@ -143,8 +139,7 @@ public class TestUpdateScan extends OmidTestBase {
res = table.getScanner(t, s);
count = 0;
while ((rr = res.next()) != null) {
- int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
- Bytes.toBytes(TEST_COL)));
+ int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
LOG.info("Result: " + iTmp);
count++;
}
@@ -155,8 +150,7 @@ public class TestUpdateScan extends OmidTestBase {
}
-
- @Test
+ @Test(timeOut = 10_000)
public void testScanUncommitted(ITestContext context) throws Exception {
try {
TransactionManager tm = newTransactionManager(context);
@@ -197,8 +191,7 @@ public class TestUpdateScan extends OmidTestBase {
int count = 0;
while ((rr = res.next()) != null) {
- int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY),
- Bytes.toBytes(TEST_COL)));
+ int iTmp = Bytes.toInt(rr.getValue(Bytes.toBytes(TEST_FAMILY), Bytes.toBytes(TEST_COL)));
LOG.info("Result: " + iTmp);
count++;
}
@@ -211,4 +204,5 @@ public class TestUpdateScan extends OmidTestBase {
LOG.error("Exception in test", e);
}
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-common/src/test/java/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.java b/hbase-common/src/test/java/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.java
index 29f97b4..c72182d 100644
--- a/hbase-common/src/test/java/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.java
+++ b/hbase-common/src/test/java/org/apache/omid/committable/hbase/TestHBaseCommitTableKey.java
@@ -30,7 +30,7 @@ import static org.testng.Assert.assertEquals;
public class TestHBaseCommitTableKey {
- @Test
+ @Test(timeOut = 10_000)
public void testEncodeDecode() throws Exception {
testKeyGen(new BucketKeyGenerator());
testKeyGen(new BadRandomKeyGenerator());
@@ -38,7 +38,7 @@ public class TestHBaseCommitTableKey {
testKeyGen(new SeqKeyGenerator());
}
- @Test(enabled = false)
+ @Test(enabled = false, timeOut = 10_000)
private void testKeyGen(KeyGenerator keyGen) throws IOException {
assertEquals(keyGen.keyToStartTimestamp(keyGen.startTimestampToKey(0)), 0, "Should match");
assertEquals(keyGen.keyToStartTimestamp(keyGen.startTimestampToKey(1)), 1, "Should match");
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
index f7e791c..5dff36e 100644
--- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
+++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
@@ -205,7 +205,7 @@ public class TestCompaction {
.build();
}
- @Test
+ @Test(timeOut = 60_000)
public void testStandardTXsWithShadowCellsAndWithSTBelowAndAboveLWMArePresevedAfterCompaction() throws Throwable {
String TEST_TABLE = "testStandardTXsWithShadowCellsAndWithSTBelowAndAboveLWMArePresevedAfterCompaction";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -251,7 +251,7 @@ public class TestCompaction {
assertEquals(rowCount(TEST_TABLE, fam), ROWS_TO_ADD, "Rows in table after compacting should be " + ROWS_TO_ADD);
}
- @Test
+ @Test(timeOut = 60_000)
public void testTXWithoutShadowCellsAndWithSTBelowLWMGetsShadowCellHealedAfterCompaction() throws Exception {
String TEST_TABLE = "testTXWithoutShadowCellsAndWithSTBelowLWMGetsShadowCellHealedAfterCompaction";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -310,7 +310,7 @@ public class TestCompaction {
"Shadow cell should not be there");
}
- @Test
+ @Test(timeOut = 60_000)
public void testNeverendingTXsWithSTBelowAndAboveLWMAreDiscardedAndPreservedRespectivelyAfterCompaction()
throws Throwable {
String
@@ -386,7 +386,7 @@ public class TestCompaction {
}
- @Test
+ @Test(timeOut = 60_000)
public void testRowsUnalteredWhenCommitTableCannotBeReached() throws Throwable {
String TEST_TABLE = "testRowsUnalteredWhenCommitTableCannotBeReached";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -439,7 +439,7 @@ public class TestCompaction {
"Shadow cell should not be there");
}
- @Test
+ @Test(timeOut = 60_000)
public void testOriginalTableParametersAreAvoidedAlsoWhenCompacting() throws Throwable {
String TEST_TABLE = "testOriginalTableParametersAreAvoidedAlsoWhenCompacting";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -498,7 +498,7 @@ public class TestCompaction {
TimeUnit.SECONDS.sleep(2);
}
- @Test
+ @Test(timeOut = 60_000)
public void testOldCellsAreDiscardedAfterCompaction() throws Exception {
String TEST_TABLE = "testOldCellsAreDiscardedAfterCompaction";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -604,7 +604,7 @@ public class TestCompaction {
/**
* Tests a case where a temporary failure to flush causes the compactor to crash
*/
- @Test
+ @Test(timeOut = 60_000)
public void testDuplicateDeletes() throws Throwable {
String TEST_TABLE = "testDuplicateDeletes";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
@@ -711,7 +711,7 @@ public class TestCompaction {
"Cell should not be be there");
}
- @Test(timeOut = 60000)
+ @Test(timeOut = 60_000)
public void testNonOmidCFIsUntouched() throws Throwable {
String TEST_TABLE = "testNonOmidCFIsUntouched";
createTableIfNotExists(TEST_TABLE, Bytes.toBytes(TEST_FAMILY));
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java
index c2aca8a..8a217b3 100644
--- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java
+++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java
@@ -55,7 +55,7 @@ public class TestCompactorScanner {
};
}
- @Test(dataProvider = "cell-retain-options")
+ @Test(dataProvider = "cell-retain-options", timeOut = 60_000)
public void testShouldRetainNonTransactionallyDeletedCellMethod(int optionIdx, boolean retainOption)
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/statemachine/src/test/java/org/apache/statemachine/TestStateMachine.java
----------------------------------------------------------------------
diff --git a/statemachine/src/test/java/org/apache/statemachine/TestStateMachine.java b/statemachine/src/test/java/org/apache/statemachine/TestStateMachine.java
index 71517dd..155fe37 100644
--- a/statemachine/src/test/java/org/apache/statemachine/TestStateMachine.java
+++ b/statemachine/src/test/java/org/apache/statemachine/TestStateMachine.java
@@ -86,7 +86,7 @@ public class TestStateMachine {
}
}
- @Test(timeOut = 60000)
+ @Test(timeOut = 60_000)
public void testOrdering() throws Throwable {
Fsm fsm = new FsmImpl(Executors.newSingleThreadScheduledExecutor());
fsm.setInitState(new DeferringState(fsm));
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.java
----------------------------------------------------------------------
diff --git a/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.java b/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.java
index a69dfe9..b6ad054 100644
--- a/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.java
+++ b/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestHBaseTimestampStorage.java
@@ -104,7 +104,7 @@ public class TestHBaseTimestampStorage {
}
}
- @Test
+ @Test(timeOut = 10_000)
public void testHBaseTimestampStorage() throws Exception {
final long INITIAL_TS_VALUE = 0;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestZKTimestampStorage.java
----------------------------------------------------------------------
diff --git a/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestZKTimestampStorage.java b/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestZKTimestampStorage.java
index e163b1e..bf741e5 100644
--- a/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestZKTimestampStorage.java
+++ b/timestamp-storage/src/test/java/org/apache/omid/timestamp/storage/TestZKTimestampStorage.java
@@ -89,11 +89,11 @@ public class TestZKTimestampStorage {
LOG.info("Creating Internal Zookeeper Client connected to {}", ZK_CLUSTER);
storageInternalZKClient = Mockito.spy(CuratorFrameworkFactory.builder()
- .namespace("omid")
- .connectString(ZK_CLUSTER)
- .retryPolicy(retryPolicy)
- .connectionTimeoutMs(10) // Low timeout for tests
- .build());
+ .namespace("omid")
+ .connectString(ZK_CLUSTER)
+ .retryPolicy(retryPolicy)
+ .connectionTimeoutMs(10) // Low timeout for tests
+ .build());
storageInternalZKClient.start();
storageInternalZKClient.blockUntilConnected();
@@ -117,7 +117,7 @@ public class TestZKTimestampStorage {
}
- @Test
+ @Test(timeOut = 10_000)
public void testBasicFunctionality() throws Exception {
// Check ZNode for timestamp exists (storage instantiation should create it)
@@ -187,7 +187,7 @@ public class TestZKTimestampStorage {
assertEquals(zNodeStats.getVersion(), ITERATION_COUNT);
}
- @Test
+ @Test(timeOut = 10_000)
public void testZkClientWhenZKIsDownAndRestarts() throws Exception {
// Iterate updating the timestamp and check the final value
@@ -217,7 +217,7 @@ public class TestZKTimestampStorage {
}
- @Test
+ @Test(timeOut = 10_000)
public void testZkClientLosingSession() throws Exception {
// Cut the session in the server through the client
@@ -238,4 +238,5 @@ public class TestZKTimestampStorage {
assertEquals(storage.getMaxTimestamp(), 1_000_000 * ITERATION_COUNT);
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/transaction-client/src/test/java/org/apache/omid/tso/client/TestMockTSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/test/java/org/apache/omid/tso/client/TestMockTSOClient.java b/transaction-client/src/test/java/org/apache/omid/tso/client/TestMockTSOClient.java
index 1ad54e3..054eb65 100644
--- a/transaction-client/src/test/java/org/apache/omid/tso/client/TestMockTSOClient.java
+++ b/transaction-client/src/test/java/org/apache/omid/tso/client/TestMockTSOClient.java
@@ -34,7 +34,7 @@ public class TestMockTSOClient {
final static public CellId c1 = new DummyCellIdImpl(0xdeadbeefL);
final static public CellId c2 = new DummyCellIdImpl(-0xfeedcafeL);
- @Test(timeOut = 10000)
+ @Test(timeOut = 10_000)
public void testConflicts() throws Exception {
CommitTable commitTable = new InMemoryCommitTable();
TSOProtocol client = new MockTSOClient(commitTable.getWriter());
@@ -52,7 +52,7 @@ public class TestMockTSOClient {
}
}
- @Test(timeOut = 10000)
+ @Test(timeOut = 10_000)
public void testWatermarkUpdate() throws Exception {
CommitTable commitTable = new InMemoryCommitTable();
TSOProtocol client = new MockTSOClient(commitTable.getWriter());
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/transaction-client/src/test/java/org/apache/omid/tso/client/TestOmidClientConfiguration.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/test/java/org/apache/omid/tso/client/TestOmidClientConfiguration.java b/transaction-client/src/test/java/org/apache/omid/tso/client/TestOmidClientConfiguration.java
index 1ce44a2..c8ac7a6 100644
--- a/transaction-client/src/test/java/org/apache/omid/tso/client/TestOmidClientConfiguration.java
+++ b/transaction-client/src/test/java/org/apache/omid/tso/client/TestOmidClientConfiguration.java
@@ -22,7 +22,7 @@ import org.testng.annotations.Test;
public class TestOmidClientConfiguration {
- @Test
+ @Test(timeOut = 10_000)
public void testYamlReading() {
OmidClientConfiguration configuration = new OmidClientConfiguration();
Assert.assertNotNull(configuration.getConnectionString());
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TSOServerConfigTest.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TSOServerConfigTest.java b/tso-server/src/test/java/org/apache/omid/tso/TSOServerConfigTest.java
index a3a2da1..0b1fe00 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TSOServerConfigTest.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TSOServerConfigTest.java
@@ -21,7 +21,7 @@ import org.testng.annotations.Test;
public class TSOServerConfigTest {
- @Test
+ @Test(timeOut = 10_000)
public void testParsesOK() throws Exception {
new TSOServerConfig("test-omid.yml");
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
index 32a060c..1fc93a3 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
@@ -126,7 +126,7 @@ public class TestLeaseManager {
}
- @Test(timeOut = 60000)
+ @Test(timeOut = 60_000)
public void testLeaseHolderDoesNotChangeWhenPausedForALongTimeAndTheresNoOtherInstance() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test1_tsolease";
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TestLongCache.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestLongCache.java b/tso-server/src/test/java/org/apache/omid/tso/TestLongCache.java
index 0c0d02a..9551834 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestLongCache.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestLongCache.java
@@ -36,7 +36,7 @@ public class TestLongCache {
private Random random = new Random(System.currentTimeMillis());
- @Test
+ @Test(timeOut = 10_000)
public void testAddAndGetElems() {
// Cache configuration
@@ -65,7 +65,7 @@ public class TestLongCache {
}
- @Test(timeOut = 10000)
+ @Test(timeOut = 10_000)
public void testEntriesAge() {
final int entries = 1000;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
index a5f4eed..2964388 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
@@ -64,7 +64,7 @@ public class TestPanicker {
// Note this test has been moved and refactored to TestTimestampOracle because
// it tests the behaviour of the TimestampOracle.
// Please, remove me in a future commit
- @Test
+ @Test(timeOut = 10_000)
public void testTimestampOraclePanic() throws Exception {
TimestampStorage storage = spy(new TimestampOracleImpl.InMemoryTimestampStorage());
@@ -95,7 +95,7 @@ public class TestPanicker {
// Note this test has been moved and refactored to TestPersistenceProcessor because
// it tests the behaviour of the PersistenceProcessor.
// Please, remove me in a future commit
- @Test
+ @Test(timeOut = 10_000)
public void testCommitTablePanic() throws Exception {
Panicker panicker = spy(new MockPanicker());
@@ -149,7 +149,7 @@ public class TestPanicker {
// Note this test has been moved and refactored to TestPersistenceProcessor because
// it tests the behaviour of the PersistenceProcessor.
// Please, remove me in a future commit
- @Test
+ @Test(timeOut = 10_000)
public void testRuntimeExceptionTakesDownDaemon() throws Exception {
Panicker panicker = spy(new MockPanicker());
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
index 6e5c040..2bf7cf6 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
@@ -172,7 +172,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testCommitPersistenceWithMultipleCommitTableWriters() throws Exception {
final int NUM_CT_WRITERS = 2;
@@ -242,7 +242,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testCommitPersistenceWithNonHALeaseManager() throws Exception {
final int NUM_CT_WRITERS = 1;
@@ -285,7 +285,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testCommitPersistenceWithHALeaseManagerAndMinimumCommitTableWriters() throws Exception {
final int NUM_PERSIST_HANDLERS = 2; // Minimum commit table writers is 2
@@ -300,7 +300,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testCommitPersistenceWithHALeaseManagerAndMultipleCommitTableWriters() throws Exception {
final int NUM_CT_WRITERS = 4;
@@ -375,7 +375,6 @@ public class TestPersistenceProcessor {
// Test: Configure the lease manager to return false for stillInLeasePeriod
doReturn(false).when(simulatedHALeaseManager).stillInLeasePeriod();
- //batchPool.notifyEmptyBatch(0); // Unlock this thread to check the panicker
proc.addCommitToBatch(ANY_ST, ANY_CT, mock(Channel.class), mock(MonitoringContext.class));
proc.triggerCurrentBatchFlush();
verify(simulatedHALeaseManager, timeout(1000).times(1)).stillInLeasePeriod();
@@ -400,7 +399,6 @@ public class TestPersistenceProcessor {
// Configure mock writer to flush unsuccessfully
doThrow(new IOException("Unable to write")).when(mockWriter).flush();
doReturn(true).doReturn(false).when(simulatedHALeaseManager).stillInLeasePeriod();
-// batchPool.notifyEmptyBatch(0); // Unlock this thread to check the panicker
proc.addCommitToBatch(ANY_ST, ANY_CT, mock(Channel.class), mock(MonitoringContext.class));
proc.triggerCurrentBatchFlush();
verify(simulatedHALeaseManager, timeout(1000).times(1)).stillInLeasePeriod();
@@ -425,7 +423,7 @@ public class TestPersistenceProcessor {
return handlers;
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testCommitTableExceptionOnCommitPersistenceTakesDownDaemon() throws Exception {
// Init lease management (doesn't matter if HA or not)
@@ -466,7 +464,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut=10_000)
+ @Test(timeOut = 10_000)
public void testRuntimeExceptionOnCommitPersistenceTakesDownDaemon() throws Exception {
TSOServerConfig config = new TSOServerConfig();
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
index b472d7f..9d87e79 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
@@ -50,7 +50,7 @@ public class TestTSOStateManager {
when(timestampOracle.getLast()).thenReturn(INITIAL_STATE_VALUE);
}
- @Test
+ @Test(timeOut = 10_000)
public void testTSOServerStateInitialization() throws Exception {
// Reset the state and check we get the initial state values
@@ -71,7 +71,7 @@ public class TestTSOStateManager {
}
- @Test
+ @Test(timeOut = 10_000)
public void testObserverRegistrationAndDeregistrationForStateChanges() throws Exception {
// Register observer 1 for receiving state changes
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientRequestAndResponseBehaviours.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientRequestAndResponseBehaviours.java b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientRequestAndResponseBehaviours.java
index e41e656..7317847 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientRequestAndResponseBehaviours.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientRequestAndResponseBehaviours.java
@@ -32,9 +32,7 @@ import org.apache.omid.tso.TimestampOracle;
import org.apache.omid.tso.util.DummyCellIdImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -339,7 +337,7 @@ public class TestTSOClientRequestAndResponseBehaviours {
// The next 3 tests are similar to the ones in TestRetryProcessor but checking the result on the TSOClient side
// (They exercise the communication protocol) TODO Remove???
// ----------------------------------------------------------------------------------------------------------------
- @Test
+ @Test(timeOut = 30_000)
public void testCommitTimestampPresentInCommitTableReturnsCommit() throws Exception {
TSOClient client = TSOClient.newInstance(tsoClientConf);
@@ -353,7 +351,7 @@ public class TestTSOClientRequestAndResponseBehaviours {
assertEquals(response.getCommitResponse().getCommitTimestamp(), tx1ST + 1);
}
- @Test
+ @Test(timeOut = 30_000)
public void testInvalidCommitTimestampPresentInCommitTableReturnsAbort() throws Exception {
TSOClient client = TSOClient.newInstance(tsoClientConf);
@@ -369,7 +367,7 @@ public class TestTSOClientRequestAndResponseBehaviours {
assertEquals(response.getCommitResponse().getCommitTimestamp(), 0);
}
- @Test
+ @Test(timeOut = 30_000)
public void testCommitTimestampNotPresentInCommitTableReturnsAnAbort() throws Exception {
TSOClient client = TSOClient.newInstance(tsoClientConf);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c521bf32/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientResponseHandling.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientResponseHandling.java b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientResponseHandling.java
index 2f6463d..3478050 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientResponseHandling.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/client/TestTSOClientResponseHandling.java
@@ -54,7 +54,7 @@ public class TestTSOClientResponseHandling {
tsoServer.cleanResponses();
}
- @Test
+ @Test(timeOut = 10_000)
public void testTimestampRequestReceivingASuccessfulResponse() throws Exception {
// test request timestamp response returns a timestamp
@@ -65,7 +65,7 @@ public class TestTSOClientResponseHandling {
assertEquals(startTS, START_TS);
}
- @Test
+ @Test(timeOut = 10_000)
public void testCommitRequestReceivingAnAbortResponse() throws Exception {
// test commit request which is aborted on the server side
// (e.g. due to conflicts with other transaction) throws an
@@ -81,7 +81,7 @@ public class TestTSOClientResponseHandling {
}
}
- @Test
+ @Test(timeOut = 10_000)
public void testCommitRequestReceivingASuccessfulResponse() throws Exception {
// test commit request which is successfully committed on the server
// side returns a commit timestamp