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 A02AC200C8E for ; Thu, 8 Jun 2017 18:46:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9EBCE160BE5; Thu, 8 Jun 2017 16:46:22 +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 E4A1D160BC3 for ; Thu, 8 Jun 2017 18:46:21 +0200 (CEST) Received: (qmail 95166 invoked by uid 500); 8 Jun 2017 16:46:19 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 95157 invoked by uid 99); 8 Jun 2017 16:46:19 -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, 08 Jun 2017 16:46:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A57DDFB01; Thu, 8 Jun 2017 16:46:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jstewart@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: GEODE-3032: Fix CI failure of CommandOverHttpDUnitTest Date: Thu, 8 Jun 2017 16:46:19 +0000 (UTC) archived-at: Thu, 08 Jun 2017 16:46:22 -0000 Repository: geode Updated Branches: refs/heads/develop b0718f5da -> 3ae060266 GEODE-3032: Fix CI failure of CommandOverHttpDUnitTest Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/3ae06026 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/3ae06026 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/3ae06026 Branch: refs/heads/develop Commit: 3ae06026634d76faaed6d5f25b00b1ae64c901a4 Parents: b0718f5 Author: Jared Stewart Authored: Thu Jun 8 09:45:10 2017 -0700 Committer: Jared Stewart Committed: Thu Jun 8 09:45:10 2017 -0700 ---------------------------------------------------------------------- .../internal/cli/commands/MemberCommandsDUnitTest.java | 7 ++++++- .../internal/cli/commands/CommandOverHttpDUnitTest.java | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/3ae06026/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java index 5bbfc5b..30ece5a 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MemberCommandsDUnitTest.java @@ -25,6 +25,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAM import static org.apache.geode.test.dunit.Assert.assertEquals; import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; import static org.apache.geode.test.dunit.NetworkUtils.getServerHostName; +import static org.junit.Assert.assertTrue; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; @@ -222,8 +223,12 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase { CommandProcessor commandProcessor = new CommandProcessor(); Result result = commandProcessor.createCommandStatement(CliStrings.LIST_MEMBER, EMPTY_ENV).process(); - getLogWriter().info("#SB" + getResultAsString(result)); + String resultOutput = getResultAsString(result); + getLogWriter().info(resultOutput); assertEquals(true, result.getStatus().equals(Status.OK)); + assertTrue(resultOutput.contains("me:")); + assertTrue(resultOutput.contains("Server1:")); + assertTrue(resultOutput.contains("Server2:")); } /** http://git-wip-us.apache.org/repos/asf/geode/blob/3ae06026/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java index 2a6a03b..2fe9407 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/cli/commands/CommandOverHttpDUnitTest.java @@ -31,9 +31,9 @@ import org.apache.geode.test.junit.runner.SuiteRunner; GemfireDataCommandsDUnitTest.class, GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.class, IndexCommandsDUnitTest.class, ListAndDescribeDiskStoreCommandsDUnitTest.class, ListIndexCommandDUnitTest.class, - MemberCommandsDUnitTest.class, MiscellaneousCommandsDUnitTest.class, - QueueCommandsDUnitTest.class, ShellCommandsDUnitTest.class, ShowDeadlockDUnitTest.class, - ShowMetricsDUnitTest.class, ShowStackTraceDUnitTest.class}) + MiscellaneousCommandsDUnitTest.class, QueueCommandsDUnitTest.class, + ShellCommandsDUnitTest.class, ShowDeadlockDUnitTest.class, ShowMetricsDUnitTest.class, + ShowStackTraceDUnitTest.class}) public class CommandOverHttpDUnitTest { @ClassRule public static ProvideSystemProperty provideSystemProperty =