You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/15 05:07:59 UTC
[30/32] incubator-geode git commit: GEODE-1231: remove
test013StartServerWithSpring
GEODE-1231: remove test013StartServerWithSpring
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f702bcfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f702bcfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f702bcfe
Branch: refs/heads/feature/GEODE-17-2
Commit: f702bcfe5d8d7546c32ac76bd86591bba708cc63
Parents: 70c03a7
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Apr 14 16:13:58 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Apr 14 16:27:45 2016 -0700
----------------------------------------------------------------------
.../LauncherLifecycleCommandsDUnitTest.java | 62 --------------------
1 file changed, 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f702bcfe/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 4553140..b394063 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -813,68 +813,6 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertEquals(Status.NOT_RESPONDING, locatorState.getStatus());
}
- @Ignore("Disabled until GEODE-1025, SGF-476 are resolved")
- @Test
- public void test013StartServerWithSpring() {
- String pathname = (getClass().getSimpleName() + "_" + getTestMethodName());
- File workingDirectory = new File(pathname);
-
- assertTrue(workingDirectory.isDirectory() || workingDirectory.mkdir());
-
- CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
-
- command.addOption(CliStrings.START_SERVER__NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
- command.addOption(CliStrings.START_SERVER__USE_CLUSTER_CONFIGURATION, Boolean.FALSE.toString());
- command.addOption(CliStrings.START_SERVER__LOG_LEVEL, "config");
- command.addOption(CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH);
- command.addOption(CliStrings.START_SERVER__DISABLE_DEFAULT_SERVER);
- command.addOption(CliStrings.START_SERVER__DIR, pathname);
- command.addOption(CliStrings.START_SERVER__SPRING_XML_LOCATION, "spring/spring-gemfire-context.xml");
-
- CommandResult result = executeCommand(command.toString());
-
- assertNotNull(result);
- assertEquals(Result.Status.OK, result.getStatus());
-
- final ServerLauncher springGemFireServer = new ServerLauncher.Builder().setCommand(
- ServerLauncher.Command.STATUS).setWorkingDirectory(
- IOUtils.tryGetCanonicalPathElseGetAbsolutePath(workingDirectory)).build();
-
- assertNotNull(springGemFireServer);
-
- ServerState serverState = springGemFireServer.status();
-
- assertNotNull(serverState);
- assertEquals(Status.ONLINE, serverState.getStatus());
-
- //Ensure the member name is what is set through spring
- String logFile = serverState.getLogFile();
- assertTrue("Log file name was not configured from spring context: " + logFile, logFile.contains("spring_server.log"));
-
- // Now that the GemFire Server bootstrapped with Spring started up OK, stop it!
- stopServer(springGemFireServer.getWorkingDirectory());
-
- WaitCriterion waitCriteria = new WaitCriterion() {
- @Override
- public boolean done() {
- ServerState serverState = springGemFireServer.status();
- return (serverState != null && Status.NOT_RESPONDING.equals(serverState.getStatus()));
- }
-
- @Override
- public String description() {
- return "wait for the Locator to stop; the Locator will no longer respond after it stops";
- }
- };
-
- waitForCriterion(waitCriteria, TimeUnit.SECONDS.toMillis(15), TimeUnit.SECONDS.toMillis(5), true);
-
- serverState = springGemFireServer.status();
-
- assertNotNull(serverState);
- assertEquals(Status.NOT_RESPONDING, serverState.getStatus());
- }
-
@Test
public void test014GemFireServerJvmProcessTerminatesOnOutOfMemoryError() throws Exception {
int ports[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);