You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/24 03:50:03 UTC

git commit: ACCUMULO-2935 Ensure test actually times out.

Repository: accumulo
Updated Branches:
  refs/heads/master f785903c5 -> 6927fb527


ACCUMULO-2935 Ensure test actually times out.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6927fb52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6927fb52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6927fb52

Branch: refs/heads/master
Commit: 6927fb527260359362af19c651a2f2ffd32b2d4e
Parents: f785903
Author: Josh Elser <el...@apache.org>
Authored: Mon Jun 23 11:21:44 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Jun 23 21:49:42 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/MonitorLoggingIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6927fb52/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
index 331a546..bfee213 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java
@@ -56,7 +56,7 @@ public class MonitorLoggingIT extends ConfigurableMacIT {
     return (NUM_LOCATION_PASSES + 2) * LOCATION_DELAY;
   }
 
-  @Test
+  @Test(timeout = (NUM_LOCATION_PASSES + 2) * LOCATION_DELAY)
   public void logToMonitor() throws Exception {
     // Start the monitor.
     log.debug("Starting Monitor");