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 1767E200BBD for ; Tue, 8 Nov 2016 21:58:40 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 15F5A160AD0; Tue, 8 Nov 2016 20:58:40 +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 38FA3160B14 for ; Tue, 8 Nov 2016 21:58:39 +0100 (CET) Received: (qmail 50924 invoked by uid 500); 8 Nov 2016 20:58:38 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 50743 invoked by uid 99); 8 Nov 2016 20:58:38 -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; Tue, 08 Nov 2016 20:58:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 044D1E186F; Tue, 8 Nov 2016 20:58:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aledsage@apache.org To: commits@brooklyn.apache.org Date: Tue, 08 Nov 2016 20:58:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] brooklyn-server git commit: TestCaseYamlTest: increase assertion timeout archived-at: Tue, 08 Nov 2016 20:58:40 -0000 TestCaseYamlTest: increase assertion timeout Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bebd180b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bebd180b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bebd180b Branch: refs/heads/master Commit: bebd180be5be073cb1ba479e344c778c3706ec6d Parents: 5d21b7b Author: Aled Sage Authored: Tue Nov 8 18:08:32 2016 +0000 Committer: Aled Sage Committed: Tue Nov 8 18:09:22 2016 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bebd180b/test-framework/src/test/java/org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java ---------------------------------------------------------------------- diff --git a/test-framework/src/test/java/org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java b/test-framework/src/test/java/org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java index 53f6e87..d5a1929 100644 --- a/test-framework/src/test/java/org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java +++ b/test-framework/src/test/java/org/apache/brooklyn/test/framework/yaml/TestCaseYamlTest.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlRebindTest; import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.entity.machine.MachineEntity; import org.apache.brooklyn.entity.stock.BasicApplication; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.framework.TestCase; import org.apache.brooklyn.test.framework.TestEffector; import org.apache.brooklyn.test.framework.TestSensor; @@ -78,6 +79,7 @@ public class TestCaseYamlTest extends AbstractYamlRebindTest { "- type: " + TestCase.class.getName(), " brooklyn.config:", " targetId: target-app", + " timeout: " + Asserts.DEFAULT_LONG_TIMEOUT, " brooklyn.children:", " - type: " + TestSensor.class.getName(), " brooklyn.config:",