Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-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 354661012E for ; Tue, 27 Jan 2015 17:45:35 +0000 (UTC) Received: (qmail 34052 invoked by uid 500); 27 Jan 2015 17:45:35 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 34025 invoked by uid 500); 27 Jan 2015 17:45:35 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 34004 invoked by uid 99); 27 Jan 2015 17:45:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2015 17:45:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 27 Jan 2015 17:45:33 +0000 Received: (qmail 32312 invoked by uid 99); 27 Jan 2015 17:45:13 -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, 27 Jan 2015 17:45:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 586F3E0EE9; Tue, 27 Jan 2015 17:45:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 27 Jan 2015 17:45:25 -0000 Message-Id: In-Reply-To: <3afa52c3ccac4f41a9143e0c41722928@git.apache.org> References: <3afa52c3ccac4f41a9143e0c41722928@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/21] incubator-brooklyn git commit: Don't read global properties for tests X-Virus-Checked: Checked by ClamAV on apache.org Don't read global properties for tests My custom config should't influence the tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e87c49c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e87c49c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e87c49c1 Branch: refs/heads/master Commit: e87c49c13eee82102854b6c4e7204f40371a6e0b Parents: 8793e9d Author: Svetoslav Neykov Authored: Tue Jan 27 18:15:04 2015 +0200 Committer: Svetoslav Neykov Committed: Tue Jan 27 18:29:16 2015 +0200 ---------------------------------------------------------------------- .../src/test/java/brooklyn/launcher/BrooklynWebServerTest.java | 2 +- .../launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e87c49c1/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java index b069676..d40d1a4 100644 --- a/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java +++ b/usage/launcher/src/test/java/brooklyn/launcher/BrooklynWebServerTest.java @@ -58,7 +58,7 @@ public class BrooklynWebServerTest { @BeforeMethod(alwaysRun=true) public void setUp(){ - brooklynProperties = BrooklynProperties.Factory.newDefault(); + brooklynProperties = BrooklynProperties.Factory.newEmpty(); } @AfterMethod(alwaysRun=true) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e87c49c1/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java b/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java index 23018c3..cc44db7 100644 --- a/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java +++ b/usage/launcher/src/test/java/brooklyn/launcher/WebAppRunnerTest.java @@ -145,6 +145,7 @@ public class WebAppRunnerTest { TestResourceUnavailableException.throwIfResourceUnavailable(getClass(), "/hello-world.war"); BrooklynLauncher launcher = BrooklynLauncher.newInstance() + .globalBrooklynPropertiesFile(null) .brooklynProperties("brooklyn.webconsole.security.provider","brooklyn.rest.security.provider.AnyoneSecurityProvider") .webapp("/hello", "hello-world.war") .start();