Return-Path: X-Original-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Delivered-To: apmail-tinkerpop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC00B18CF2 for ; Thu, 25 Feb 2016 14:01:46 +0000 (UTC) Received: (qmail 97125 invoked by uid 500); 25 Feb 2016 14:01:12 -0000 Delivered-To: apmail-tinkerpop-commits-archive@tinkerpop.apache.org Received: (qmail 96963 invoked by uid 500); 25 Feb 2016 14:01:12 -0000 Mailing-List: contact commits-help@tinkerpop.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.incubator.apache.org Delivered-To: mailing list commits@tinkerpop.incubator.apache.org Received: (qmail 96022 invoked by uid 99); 25 Feb 2016 14:01:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2016 14:01:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 585EFC0E9F for ; Thu, 25 Feb 2016 14:00:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id xpWB7eH7Vp2z for ; Thu, 25 Feb 2016 14:00:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 4A20760D3D for ; Thu, 25 Feb 2016 14:00:52 +0000 (UTC) Received: (qmail 95752 invoked by uid 99); 25 Feb 2016 14:00:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2016 14:00:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1721E8F12; Thu, 25 Feb 2016 14:00:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.incubator.apache.org Date: Thu, 25 Feb 2016 14:01:20 -0000 Message-Id: <2f2309903e4041da91f2fe25df11e1e6@git.apache.org> In-Reply-To: <0a1f09877cfd41cc868a917b368f1b94@git.apache.org> References: <0a1f09877cfd41cc868a917b368f1b94@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/43] incubator-tinkerpop git commit: Moved assertion and increased timeout for test. 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 Authored: Wed Feb 24 07:44:37 2016 -0500 Committer: Stephen Mallette 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 -> {