tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [32/43] incubator-tinkerpop git commit: Moved assertion and increased timeout for test.
Date Thu, 25 Feb 2016 14:01:20 GMT
Moved assertion and increased timeout for test.

Assertion needed to come after the executor was shutdown and the test seemingly needs more
time on appveryor. CTR


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c5447c29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c5447c29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c5447c29

Branch: refs/heads/TINKERPOP-1107
Commit: c5447c29cd6abceef4168ebd3ccc65d7ea8e27a2
Parents: 13f8005
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Feb 24 07:44:37 2016 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Feb 24 07:44:37 2016 -0500

----------------------------------------------------------------------
 .../gremlin/groovy/engine/GremlinExecutorTest.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c5447c29/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
index 251d8cf..aad1f77 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
@@ -631,11 +631,12 @@ public class GremlinExecutorTest {
             }
         });
 
+        service.shutdown();
+        assertThat(service.awaitTermination(60000, TimeUnit.MILLISECONDS), is(true));
+
         // likely a concurrency exception if it occurs - and if it does then we've messed
up because that's what this
         // test is partially designed to protected against.
         assertThat(failed.get(), is(false));
-        service.shutdown();
-        assertThat(service.awaitTermination(30000, TimeUnit.MILLISECONDS), is(true));
 
         assertEquals(max, futures.size());
         futures.forEach(t -> {
@@ -685,11 +686,12 @@ public class GremlinExecutorTest {
             }
         });
 
+        service.shutdown();
+        assertThat(service.awaitTermination(60000, TimeUnit.MILLISECONDS), is(true));
+
         // likely a concurrency exception if it occurs - and if it does then we've messed
up because that's what this
         // test is partially designed to protected against.
         assertThat(failed.get(), is(false));
-        service.shutdown();
-        assertThat(service.awaitTermination(30000, TimeUnit.MILLISECONDS), is(true));
 
         assertEquals(max, futures.size());
         futures.forEach(t -> {


Mime
View raw message