kirklund commented on a change in pull request #5196: URL: https://github.com/apache/geode/pull/5196#discussion_r436186564
########## File path: geode-assembly/src/acceptanceTest/java/org/apache/geode/launchers/LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest.java ########## @@ -0,0 +1,268 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.launchers; + +import static java.nio.file.Files.copy; +import static org.apache.geode.test.awaitility.GeodeAwaitility.await; +import static org.apache.geode.test.util.ResourceUtils.createFileFromResource; +import static org.apache.geode.test.util.ResourceUtils.getResource; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.File; +import java.nio.file.Path; +import java.util.concurrent.TimeUnit; + +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +import org.apache.geode.internal.AvailablePortHelper; +import org.apache.geode.test.assertj.LogFileAssert; +import org.apache.geode.test.junit.rules.RequiresGeodeHome; + +public class LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTest { + + private static final String CONFIG_WITH_GEODE_PLUGINS_FILE_NAME = + "LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTestWithGeodePlugins.xml"; + private static final String CONFIG_WITHOUT_GEODE_PLUGINS_FILE_NAME = + "LocatorLauncherWithPulseAndCustomLogConfigAcceptanceTestWithoutGeodePlugins.xml"; + private static final String LOCATOR_NAME = "the-locator"; + + private int locatorPort; + private int httpServicePort; + private Path configWithGeodePluginsFile; + private Path configWithoutGeodePluginsFile; + private Process locator; + private Path geodeDependencies; + private Path stdoutFile; + private Path locatorLogFile; + private Path pulseLogFile; + + @Rule + public RequiresGeodeHome requiresGeodeHome = new RequiresGeodeHome(); + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + @Before + public void setUpLogConfigFiles() { + configWithGeodePluginsFile = createFileFromResource( + getResource(CONFIG_WITH_GEODE_PLUGINS_FILE_NAME), temporaryFolder.getRoot(), + CONFIG_WITH_GEODE_PLUGINS_FILE_NAME) + .toPath(); + + configWithoutGeodePluginsFile = createFileFromResource( + getResource(CONFIG_WITHOUT_GEODE_PLUGINS_FILE_NAME), temporaryFolder.getRoot(), + CONFIG_WITHOUT_GEODE_PLUGINS_FILE_NAME) + .toPath(); + } + + @Before + public void setUpGeodeDependencies() { + Path geodeHome = requiresGeodeHome.getGeodeHome().toPath(); + geodeDependencies = geodeHome.resolve("lib/geode-dependencies.jar"); + + assertThat(geodeDependencies).exists(); + } + + @Before + public void setUpOutputFiles() { + stdoutFile = temporaryFolder.getRoot().toPath().resolve("stdout.txt"); + locatorLogFile = temporaryFolder.getRoot().toPath().resolve(LOCATOR_NAME + ".log"); + pulseLogFile = temporaryFolder.getRoot().toPath().resolve("pulse.log"); + } + + @Before + public void setUpRandomPorts() { + int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); + locatorPort = ports[0]; + httpServicePort = ports[1]; + } + + @After + public void stopLocator() throws Exception { + if (locator != null) { + locator.destroyForcibly().waitFor(4, TimeUnit.SECONDS); + } + } + + @Test + public void locatorLauncherUsesSpecifiedConfigFileWithoutGeodePlugins() throws Exception { + ProcessBuilder processBuilder = new ProcessBuilder() + .redirectErrorStream(true) + .redirectOutput(stdoutFile.toFile()) + .directory(temporaryFolder.getRoot()) + .command("java", + "-Dgemfire.http-service-port=" + httpServicePort, + "-Dgemfire.jmx-manager-start=true", + "-Djava.awt.headless=true", + "-Dlog4j.configurationFile=" + configWithoutGeodePluginsFile.toAbsolutePath(), + "-cp", geodeDependencies.toFile().getAbsolutePath(), + "org.apache.geode.distributed.LocatorLauncher", "start", LOCATOR_NAME, + "--port", String.valueOf(locatorPort)); + + System.out.println("Launching command: " + processBuilder.command()); + + locator = processBuilder + .start(); + + assertThat(locator.isAlive()).isTrue(); + + await().untilAsserted(() -> { + assertThat(locatorLogFile) + .doesNotExist(); + + assertThat(pulseLogFile) + .doesNotExist(); + + LogFileAssert.assertThat(stdoutFile.toFile()) + .exists() + .contains("Located war: geode-pulse") + .contains("Adding webapp /pulse") + .contains("Starting server location for Distribution Locator") + .doesNotContain("geode-pulse war file was not found") + .doesNotContain("java.lang.IllegalStateException: No factory method found for class"); + }); + } + + @Test + public void locatorLauncherUsesConfigFileInClasspathWithoutGeodePlugins() throws Exception { + copy(configWithoutGeodePluginsFile, temporaryFolder.getRoot().toPath().resolve("log4j2.xml")); + + String classpath = temporaryFolder.getRoot().getAbsolutePath() + File.pathSeparator + + geodeDependencies.toFile().getAbsolutePath(); + + ProcessBuilder processBuilder = new ProcessBuilder() + .redirectErrorStream(true) + .redirectOutput(stdoutFile.toFile()) + .directory(temporaryFolder.getRoot()) + .command("java", + "-Dgemfire.http-service-port=" + httpServicePort, + "-Dgemfire.jmx-manager-start=true", + "-Djava.awt.headless=true", + "-cp", classpath, + "org.apache.geode.distributed.LocatorLauncher", "start", LOCATOR_NAME, + "--port", String.valueOf(locatorPort)); + + System.out.println("Launching command: " + processBuilder.command()); + + locator = processBuilder + .start(); + + assertThat(locator.isAlive()).isTrue(); + + await().untilAsserted(() -> { + assertThat(locatorLogFile) + .doesNotExist(); + + assertThat(pulseLogFile) + .doesNotExist(); + + LogFileAssert.assertThat(stdoutFile.toFile()) + .exists() + .contains("Located war: geode-pulse") + .contains("Adding webapp /pulse") + .contains("Starting server location for Distribution Locator") + .doesNotContain("geode-pulse war file was not found") + .doesNotContain("java.lang.IllegalStateException: No factory method found for class"); + }); + } + + @Test + @Ignore("GEODE-8197") + public void locatorLauncherUsesSpecifiedConfigFileWithGeodePlugins() throws Exception { + ProcessBuilder processBuilder = new ProcessBuilder() + .redirectErrorStream(true) + .redirectOutput(stdoutFile.toFile()) + .directory(temporaryFolder.getRoot()) + .command("java", + "-Dgemfire.http-service-port=" + httpServicePort, + "-Dgemfire.jmx-manager-start=true", + "-Djava.awt.headless=true", + "-Dlog4j.configurationFile=" + configWithGeodePluginsFile.toAbsolutePath(), + "-cp", geodeDependencies.toFile().getAbsolutePath(), + "org.apache.geode.distributed.LocatorLauncher", "start", LOCATOR_NAME, + "--port", String.valueOf(locatorPort)); + + System.out.println("Launching command: " + processBuilder.command()); + + locator = processBuilder + .start(); + + assertThat(locator.isAlive()).isTrue(); + + await().untilAsserted(() -> { + assertThat(locatorLogFile) + .doesNotExist(); + + assertThat(pulseLogFile) + .doesNotExist(); + + LogFileAssert.assertThat(stdoutFile.toFile()) + .exists() + .contains("Located war: geode-pulse") + .contains("Adding webapp /pulse") + .contains("Starting server location for Distribution Locator") + .doesNotContain("geode-pulse war file was not found") + .doesNotContain("java.lang.IllegalStateException: No factory method found for class"); + }); + } + + @Test + @Ignore("GEODE-8197") Review comment: Yes. This PR is only creating new tests. I'll follow up in the future with a fix and reenable the two new tests that are currently disabled with "GEODE-8197". ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
