keith-turner closed pull request #963: Fix for FLUO-793 Modify ITs to use
JUnits timeout rule
URL: https://github.com/apache/fluo/pull/963
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/ITBase.java
b/modules/integration/src/test/java/org/apache/fluo/integration/ITBase.java
index b16c790d..57299e9d 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/ITBase.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/ITBase.java
@@ -58,6 +58,19 @@
private static AtomicInteger tableCounter = new AtomicInteger(1);
protected static AtomicInteger testCounter = new AtomicInteger();
+ private final static long JUNIT_TIMEOUT_SECONDS = 120;
+
+ /**
+ * Gets the duration a test will run before timing out under the JUnit rule.
+ * This value is in seconds.
+ *
+ * @return long representation of the time in seconds
+ * @since 1.2.0
+ */
+ public static long getTestTimeout() {
+ return JUNIT_TIMEOUT_SECONDS;
+ }
+
@BeforeClass
public static void setUpAccumulo() throws Exception {
instanceName = System.getProperty(IT_INSTANCE_NAME_PROP,
"it-instance-default");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/accumulo/TimeskippingIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/accumulo/TimeskippingIT.java
index 68bb138f..eaecc293 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/accumulo/TimeskippingIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/accumulo/TimeskippingIT.java
@@ -24,11 +24,15 @@
import org.apache.accumulo.core.security.Authorizations;
import org.apache.fluo.integration.ITBase;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class TimeskippingIT extends ITBase {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Logger log =
LoggerFactory.getLogger(TimeskippingIT.class);
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoAdminImplIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoAdminImplIT.java
index b45a8b7c..667d1000 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoAdminImplIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoAdminImplIT.java
@@ -27,12 +27,16 @@
import org.apache.fluo.core.util.CuratorUtil;
import org.apache.fluo.integration.ITBaseImpl;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public class FluoAdminImplIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(60);
@Test
public void testInitializeTwiceFails() throws Exception {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoClientIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoClientIT.java
index 3dfd35f4..2ae0ae3f 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoClientIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/client/FluoClientIT.java
@@ -24,9 +24,13 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class FluoClientIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test
public void testBasic() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/client/LoaderExecutorIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/client/LoaderExecutorIT.java
index 6fdb5c1a..36bf0ab3 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/client/LoaderExecutorIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/client/LoaderExecutorIT.java
@@ -22,11 +22,15 @@
import org.apache.fluo.api.exceptions.AlreadySetException;
import org.apache.fluo.integration.ITBaseMini;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class LoaderExecutorIT extends ITBaseMini {
public static class BadLoader implements Loader {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Override
public void load(TransactionBase tx, Context context) throws Exception {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ApiBehaviorIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ApiBehaviorIT.java
index b343a5d4..b3c3bb6e 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ApiBehaviorIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ApiBehaviorIT.java
@@ -24,9 +24,14 @@
import org.apache.fluo.integration.ITBaseImpl;
import org.apache.fluo.integration.TestTransaction;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class ApiBehaviorIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
+
@Test
public void testGetNonexistant() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/AppConfigIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/AppConfigIT.java
index 809eba75..332a3da5 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/AppConfigIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/AppConfigIT.java
@@ -27,12 +27,15 @@
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.integration.ITBaseMini;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
public class AppConfigIT extends ITBaseMini {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
public static final Column DF_COL = new Column("data", "foo");
public static final Column DB_COL = new Column("data", "bar");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ClientExceptionIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ClientExceptionIT.java
index 98071010..ce5dbdc1 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ClientExceptionIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ClientExceptionIT.java
@@ -21,12 +21,16 @@
import org.apache.fluo.api.exceptions.AlreadySetException;
import org.apache.fluo.integration.ITBaseMini;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
/**
* Integration test to verify exceptions thrown by Fluo client
*/
public class ClientExceptionIT extends ITBaseMini {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test
public void testAlreadySetException() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/CollisionIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/CollisionIT.java
index 6e9abe44..4fcf98a3 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/CollisionIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/CollisionIT.java
@@ -62,7 +62,7 @@
private static final Column STAT_PROCESSED = new Column("stat", "processed");
@Rule
- public Timeout globalTimeout = Timeout.seconds(60);
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static class NumLoader implements Loader {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ColumnVisIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ColumnVisIT.java
index 2f94b26f..27ac954c 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ColumnVisIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ColumnVisIT.java
@@ -21,9 +21,13 @@
import org.apache.fluo.api.data.Column;
import org.apache.fluo.integration.ITBaseImpl;
import org.apache.fluo.integration.TestTransaction;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class ColumnVisIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test(expected = Exception.class)
public void testFailFastSet() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FailureIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FailureIT.java
index e18d72aa..519274d2 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FailureIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FailureIT.java
@@ -51,12 +51,14 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
import static org.apache.fluo.integration.BankUtil.BALANCE;
public class FailureIT extends ITBaseImpl {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Rule
public ExpectedException exception = ExpectedException.none();
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FluoIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FluoIT.java
index bd17025b..4299fabe 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/FluoIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/FluoIT.java
@@ -32,7 +32,6 @@
import org.apache.fluo.api.data.Bytes;
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.data.RowColumnValue;
-import org.apache.fluo.api.data.Span;
import org.apache.fluo.api.exceptions.CommitException;
import org.apache.fluo.api.observer.Observer.NotificationType;
import org.apache.fluo.api.observer.ObserverProvider;
@@ -44,11 +43,15 @@
import org.apache.fluo.integration.TestTransaction;
import org.apache.fluo.integration.TestUtil;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.integration.BankUtil.BALANCE;
public class FluoIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
public static class FluoITObserverProvider implements ObserverProvider {
@Override
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
index bf5d7460..bdb4b518 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/GarbageCollectionIteratorIT.java
@@ -38,12 +38,16 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
/**
* Tests GarbageCollectionIterator class
*/
public class GarbageCollectionIteratorIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private void waitForGcTime(long expectedTime) throws Exception {
env.getSharedResources().getTimestampTracker().updateZkNode();
@@ -54,7 +58,7 @@ private void waitForGcTime(long expectedTime) throws
Exception {
}
}
- @Test(timeout = 60000)
+
public void testVerifyAfterGC() throws Exception {
TestTransaction tx1 = new TestTransaction(env);
@@ -87,7 +91,7 @@ public void testVerifyAfterGC() throws Exception {
tx2.done();
}
- @Test(timeout = 60000)
+
public void testDeletedDataIsDropped() throws Exception {
final Column docUri = new Column("doc", "uri");
@@ -126,7 +130,7 @@ public void testDeletedDataIsDropped() throws Exception {
tx4.done();
}
- @Test(timeout = 60000)
+
public void testRolledBackDataIsDropped() throws Exception {
Column col1 = new Column("fam1", "q1");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/MiniIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/MiniIT.java
index 095e9394..1739e8ab 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/MiniIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/MiniIT.java
@@ -26,13 +26,18 @@
import org.apache.fluo.api.data.Bytes;
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.mini.MiniFluo;
+import org.apache.fluo.integration.ITBase;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
/**
* Tests MiniFluo
*/
public class MiniIT {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(ITBase.getTestTimeout());
@Test
public void testMini() throws Exception {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/NotificationGcIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/NotificationGcIT.java
index e0a08ac3..b308197e 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/NotificationGcIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/NotificationGcIT.java
@@ -31,12 +31,15 @@
import org.apache.fluo.integration.TestTransaction;
import
org.apache.fluo.integration.impl.WeakNotificationIT.WeakNotificationITObserverProvider;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NotificationGcIT extends ITBaseMini {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Logger log =
LoggerFactory.getLogger(NotificationGcIT.class);
private static void assertRawNotifications(int expected, Environment env)
throws Exception {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ObserverConfigIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ObserverConfigIT.java
index 0ab398ad..c29de584 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ObserverConfigIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ObserverConfigIT.java
@@ -34,12 +34,16 @@
import org.apache.fluo.api.observer.Observer.NotificationType;
import org.apache.fluo.integration.ITBaseMini;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
@Deprecated
public class ObserverConfigIT extends ITBaseMini {
public static class ConfigurableObserver extends AbstractObserver {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private ObservedColumn observedColumn;
private Bytes outputCQ;
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
index e543c3ce..9bcfb17c 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
@@ -47,7 +47,7 @@
public class OracleIT extends ITBaseImpl {
@Rule
- public Timeout globalTimeout = Timeout.seconds(60);
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test
public void testRestart() throws Exception {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
index 63e0807d..ae0ebd17 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ParallelScannerIT.java
@@ -29,9 +29,13 @@
import org.apache.fluo.integration.ITBaseImpl;
import org.apache.fluo.integration.TestTransaction;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class ParallelScannerIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test
public void testRowColumn() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ScannerIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ScannerIT.java
index f9cb31ed..e5a8d023 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ScannerIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ScannerIT.java
@@ -29,12 +29,15 @@
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.data.ColumnValue;
import org.apache.fluo.api.data.RowColumnValue;
-import org.apache.fluo.api.data.Span;
import org.apache.fluo.integration.ITBaseImpl;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
public class ScannerIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test
public void testFiltering() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/SelfNotificationIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/SelfNotificationIT.java
index 345bde2a..2e9eb42f 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/SelfNotificationIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/SelfNotificationIT.java
@@ -28,7 +28,9 @@
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.integration.ITBaseMini;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
@@ -36,6 +38,8 @@
* Test an observer notifying the column its observing. This is a useful
pattern for exporting data.
*/
public class SelfNotificationIT extends ITBaseMini {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Column STAT_COUNT_COL = new Column("stat", "count");
private static final Column EXPORT_CHECK_COL = new Column("export", "check");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/StochasticBankIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/StochasticBankIT.java
index 8afa3203..6c6e6de1 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/StochasticBankIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/StochasticBankIT.java
@@ -42,7 +42,9 @@
import org.apache.fluo.integration.TestTransaction;
import org.apache.hadoop.io.Text;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,6 +53,8 @@
* sum of all money in the bank should be the same, therefore the average
should not vary.
*/
public class StochasticBankIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout() * 2);
private static final Logger log =
LoggerFactory.getLogger(StochasticBankIT.class);
private static AtomicInteger txCount = new AtomicInteger();
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/StrongNotificationIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/StrongNotificationIT.java
index 018771f2..cabbaded 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/StrongNotificationIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/StrongNotificationIT.java
@@ -25,11 +25,15 @@
import org.apache.fluo.integration.ITBaseMini;
import org.apache.fluo.integration.TestTransaction;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
public class StrongNotificationIT extends ITBaseMini {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Column OC = new Column("f", "q");
private static final Column RC = new Column("f", "r");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/TimestampTrackerIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/TimestampTrackerIT.java
index 3712813b..349a5717 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/TimestampTrackerIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/TimestampTrackerIT.java
@@ -27,12 +27,16 @@
import org.apache.fluo.integration.ITBaseImpl;
import org.apache.zookeeper.KeeperException.NoNodeException;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
/**
* Tests TimestampTracker class
*/
public class TimestampTrackerIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Test(expected = NoSuchElementException.class)
public void testTsNoElement() {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/TransactorIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/TransactorIT.java
index 00e05a9c..c8102857 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/TransactorIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/TransactorIT.java
@@ -24,11 +24,14 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import org.junit.rules.Timeout;
/**
* Tests transactor classes
*/
public class TransactorIT extends ITBaseImpl {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
public static Long id1 = Long.valueOf(2);
public static Long id2 = Long.valueOf(3);
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationIT.java
index 3add9b56..bb39f906 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationIT.java
@@ -21,7 +21,6 @@
import org.apache.fluo.api.data.Bytes;
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.data.RowColumnValue;
-import org.apache.fluo.api.data.Span;
import org.apache.fluo.api.observer.Observer;
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.core.impl.Environment;
@@ -31,11 +30,15 @@
import org.apache.fluo.integration.TestTransaction;
import org.apache.fluo.integration.TestUtil;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.WEAK;
public class WeakNotificationIT extends ITBaseMini {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Column STAT_COUNT = new Column("stat", "count");
private static final Column STAT_CHECK = new Column("stat", "check");
@@ -125,7 +128,7 @@ public void testWeakNotification() throws Exception {
env.close();
}
- @Test(timeout = 30000)
+
public void testNOOP() throws Exception {
// if an observer makes not updates in a transaction, it should still
delete the weak
// notification
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationOverlapIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationOverlapIT.java
index 0711c72f..2efb087d 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationOverlapIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WeakNotificationOverlapIT.java
@@ -34,12 +34,15 @@
import org.apache.fluo.integration.TestTransaction;
import org.apache.fluo.integration.TestUtil;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.WEAK;
public class WeakNotificationOverlapIT extends ITBaseImpl {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Column STAT_TOTAL = new Column("stat", "total");
private static final Column STAT_PROCESSED = new Column("stat", "processed");
private static final Column STAT_CHANGED = new Column("stat", "changed");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WorkerIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WorkerIT.java
index 6347a243..bd6d5ccc 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/WorkerIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/WorkerIT.java
@@ -21,7 +21,6 @@
import org.apache.fluo.api.client.TransactionBase;
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.data.RowColumn;
-import org.apache.fluo.api.data.Span;
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.api.observer.StringObserver;
import org.apache.fluo.core.impl.Environment;
@@ -33,7 +32,9 @@
import org.apache.fluo.integration.TestTransaction;
import org.apache.fluo.mini.MiniFluoImpl;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
@@ -42,7 +43,9 @@
* index of node degree.
*/
public class WorkerIT extends ITBaseMini {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout() * 2);
+ // timeout needs to be > 60secs for testMultipleFinders()
private static final Column LAST_UPDATE = new Column("attr", "lastupdate");
private static final Column DEGREE = new Column("attr", "degree");
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ZKSecretIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ZKSecretIT.java
index 4350f4b1..1605d2b4 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/impl/ZKSecretIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/ZKSecretIT.java
@@ -27,20 +27,23 @@
import org.apache.fluo.api.client.Snapshot;
import org.apache.fluo.api.client.Transaction;
import org.apache.fluo.api.config.FluoConfiguration;
-import org.apache.fluo.api.config.SimpleConfiguration;
import org.apache.fluo.api.data.Column;
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.integration.ITBaseMini;
import org.apache.zookeeper.KeeperException.NoAuthException;
import org.apache.zookeeper.ZooKeeper;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.STRONG;
public class ZKSecretIT extends ITBaseMini {
public static class MyObserverProvider implements ObserverProvider {
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
@Override
public void provide(Registry or, Context ctx) {
diff --git
a/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
index cca2c214..17362480 100644
---
a/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
+++
b/modules/integration/src/test/java/org/apache/fluo/integration/log/LogIT.java
@@ -36,7 +36,6 @@
import org.apache.fluo.api.data.ColumnValue;
import org.apache.fluo.api.data.RowColumn;
import org.apache.fluo.api.data.RowColumnValue;
-import org.apache.fluo.api.data.Span;
import org.apache.fluo.api.observer.Observer;
import org.apache.fluo.api.observer.ObserverProvider;
import org.apache.fluo.api.observer.StringObserver;
@@ -48,12 +47,15 @@
import org.apache.log4j.PatternLayout;
import org.apache.log4j.WriterAppender;
import org.junit.Assert;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import static org.apache.fluo.api.observer.Observer.NotificationType.WEAK;
public class LogIT extends ITBaseMini {
-
+ @Rule
+ public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
private static final Column STAT_COUNT = new Column("stat", "count");
static class SimpleLoader implements Loader {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
