Add a timeout to one the graph shard tests so it can't run forever in the event that it is failing.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/11d8a0ed Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/11d8a0ed Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/11d8a0ed Branch: refs/heads/release-2.1.1 Commit: 11d8a0edebd63b05314c711b457cc03e4a477599 Parents: bd77672 Author: Michael Russo <[email protected]> Authored: Sun Mar 20 19:18:44 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Sun Mar 20 19:18:44 2016 -0700 ---------------------------------------------------------------------- .../persistence/graph/GraphManagerShardConsistencyIT.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/11d8a0ed/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java index e7027f4..1ce23b9 100644 --- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java +++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java @@ -171,7 +171,7 @@ public class GraphManagerShardConsistencyIT { deleteExecutor = MoreExecutors.listeningDecorator( Executors.newFixedThreadPool( size ) ); } - @Test + @Test(timeout=300000) // set a timeout so this doesn't run forever in the event that it is failing public void writeThousandsSingleSource() throws InterruptedException, ExecutionException, MigrationException, UnsupportedEncodingException { @@ -279,7 +279,7 @@ public class GraphManagerShardConsistencyIT { final List<Throwable> failures = new ArrayList<>(); Thread.sleep(3000); // let's make sure everything is written - for(int i = 0; i < 1; i ++) { + for(int i = 0; i < 2; i ++) { /** @@ -642,8 +642,6 @@ public class GraphManagerShardConsistencyIT { Thread.sleep( 2000 ); } - future.cancel(true); // stop the read future - //now that we have finished deleting and shards are removed, shutdown deleteExecutor.shutdownNow();
