Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C1CE200D3D for ; Mon, 13 Nov 2017 23:46:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1A9C9160BF3; Mon, 13 Nov 2017 22:46:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62F0E160BF0 for ; Mon, 13 Nov 2017 23:46:51 +0100 (CET) Received: (qmail 23457 invoked by uid 500); 13 Nov 2017 22:46:50 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 23448 invoked by uid 99); 13 Nov 2017 22:46: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; Mon, 13 Nov 2017 22:46:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70FC1DFD78; Mon, 13 Nov 2017 22:46:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.apache.org Message-Id: <58f36c1071934c4c98312d4b14c18983@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: aurora git commit: Make testTaskChangedWithOldStateError more robust Date: Mon, 13 Nov 2017 22:46:50 +0000 (UTC) archived-at: Mon, 13 Nov 2017 22:46:52 -0000 Repository: aurora Updated Branches: refs/heads/master bd1218867 -> fb64df240 Make testTaskChangedWithOldStateError more robust Reviewed at https://reviews.apache.org/r/63760/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/fb64df24 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/fb64df24 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/fb64df24 Branch: refs/heads/master Commit: fb64df2402327a487ab3ce14554e150c917bb6a5 Parents: bd12188 Author: Bill Farner Authored: Mon Nov 13 14:46:45 2017 -0800 Committer: Bill Farner Committed: Mon Nov 13 14:46:45 2017 -0800 ---------------------------------------------------------------------- .../aurora/scheduler/events/WebhookTest.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/fb64df24/src/test/java/org/apache/aurora/scheduler/events/WebhookTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/aurora/scheduler/events/WebhookTest.java b/src/test/java/org/apache/aurora/scheduler/events/WebhookTest.java index 2906b08..adeff89 100644 --- a/src/test/java/org/apache/aurora/scheduler/events/WebhookTest.java +++ b/src/test/java/org/apache/aurora/scheduler/events/WebhookTest.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -180,16 +181,20 @@ public class WebhookTest { @Test public void testTaskChangedWithOldStateError() throws Exception { - // We have a special handler here to cause a TimeoutException to trigger `onThrowable` + // We have a special handler here to trigger `onThrowable` on the client. jettyServer.setHandler(new AbstractHandler() { @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - try { - Thread.sleep(TIMEOUT + 100); - } catch (InterruptedException e) { - // Should never get here. - } + + Stream.of(jettyServer.getConnectors()) + .forEach(c -> { + try { + c.stop(); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); } }); jettyServer.start();