Skip to content

Disable test53JavaHomeWithSpecialCharacters #40799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Disable test53JavaHomeWithSpecialCharacters #40799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d81457
Disable test53JavaHomeWithSpecialCharacters
pgomulka Apr 3, 2019
d51fbff
unused imports
pgomulka Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 56 additions & 61 deletions qa/vagrant/src/main/java/org/elasticsearch/packaging/test/ArchiveTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
package org.elasticsearch.packaging.test;

import com.carrotsearch.randomizedtesting.annotations.TestCaseOrdering;
import com.carrotsearch.randomizedtesting.generators.RandomStrings;
import org.apache.http.client.fluent.Request;
import org.elasticsearch.packaging.util.Archives;
import org.elasticsearch.packaging.util.Distribution;
import org.elasticsearch.packaging.util.FileUtils;
import org.elasticsearch.packaging.util.Installation;
import org.elasticsearch.packaging.util.Platforms;
import org.elasticsearch.packaging.util.ServerUtils;
Expand All @@ -34,10 +32,8 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.stream.Stream;

import static com.carrotsearch.randomizedtesting.RandomizedTest.getRandom;
import static org.elasticsearch.packaging.util.Archives.ARCHIVE_OWNER;
import static org.elasticsearch.packaging.util.Archives.installArchive;
import static org.elasticsearch.packaging.util.Archives.verifyArchiveInstallation;
Expand All @@ -52,7 +48,6 @@
import static org.elasticsearch.packaging.util.FileUtils.rm;
import static org.elasticsearch.packaging.util.ServerUtils.makeRequest;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
Expand Down Expand Up @@ -195,62 +190,62 @@ public void test52BundledJdkRemoved() throws Exception {
mv(relocatedJdk, installation.bundledJdk);
}
}

public void test53JavaHomeWithSpecialCharacters() throws Exception {
assumeThat(installation, is(notNullValue()));

Platforms.onWindows(() -> {
final Shell sh = new Shell();
try {
// once windows 2012 is no longer supported and powershell 5.0 is always available we can change this command
sh.run("cmd /c mklink /D 'C:\\Program Files (x86)\\java' $Env:JAVA_HOME");

sh.getEnv().put("JAVA_HOME", "C:\\Program Files (x86)\\java");

//verify ES can start, stop and run plugin list
Archives.runElasticsearch(installation, sh);

Archives.stopElasticsearch(installation);

String pluginListCommand = installation.bin + "/elasticsearch-plugin list";
Result result = sh.run(pluginListCommand);
assertThat(result.exitCode, equalTo(0));

} finally {
//clean up sym link
sh.run("cmd /c del /F /Q 'C:\\Program Files (x86)\\java' ");
}
});

Platforms.onLinux(() -> {
final Shell sh = new Shell();
// Create temporary directory with a space and link to java binary.
// Use it as java_home
String nameWithSpace = RandomStrings.randomAsciiAlphanumOfLength(getRandom(), 10) + "java home";
String test_java_home = FileUtils.mkdir(Paths.get("/home",ARCHIVE_OWNER, nameWithSpace)).toAbsolutePath().toString();
try {
final String systemJavaHome = sh.run("echo $SYSTEM_JAVA_HOME").stdout.trim();
final String java = systemJavaHome + "/bin/java";

sh.run("mkdir -p \"" + test_java_home + "/bin\"");
sh.run("ln -s \"" + java + "\" \"" + test_java_home + "/bin/java\"");
sh.run("chown -R " + ARCHIVE_OWNER + ":" + ARCHIVE_OWNER + " \"" + test_java_home + "\"");

sh.getEnv().put("JAVA_HOME", test_java_home);

//verify ES can start, stop and run plugin list
Archives.runElasticsearch(installation, sh);

Archives.stopElasticsearch(installation);

String pluginListCommand = installation.bin + "/elasticsearch-plugin list";
Result result = sh.run(pluginListCommand);
assertThat(result.exitCode, equalTo(0));
} finally {
FileUtils.rm(Paths.get("\"" + test_java_home + "\""));
}
});
}
//@AwaitsFix(bugurl="https://github.com/elastic/elasticsearch/issues/40797")
// public void test53JavaHomeWithSpecialCharacters() throws Exception {
// assumeThat(installation, is(notNullValue()));
//
// Platforms.onWindows(() -> {
// final Shell sh = new Shell();
// try {
// // once windows 2012 is no longer supported and powershell 5.0 is always available we can change this command
// sh.run("cmd /c mklink /D 'C:\\Program Files (x86)\\java' $Env:JAVA_HOME");
//
// sh.getEnv().put("JAVA_HOME", "C:\\Program Files (x86)\\java");
//
// //verify ES can start, stop and run plugin list
// Archives.runElasticsearch(installation, sh);
//
// Archives.stopElasticsearch(installation);
//
// String pluginListCommand = installation.bin + "/elasticsearch-plugin list";
// Result result = sh.run(pluginListCommand);
// assertThat(result.exitCode, equalTo(0));
//
// } finally {
// //clean up sym link
// sh.run("cmd /c del /F /Q 'C:\\Program Files (x86)\\java' ");
// }
// });
//
// Platforms.onLinux(() -> {
// final Shell sh = new Shell();
// // Create temporary directory with a space and link to java binary.
// // Use it as java_home
// String nameWithSpace = RandomStrings.randomAsciiAlphanumOfLength(getRandom(), 10) + "java home";
// String test_java_home = FileUtils.mkdir(Paths.get("/home",ARCHIVE_OWNER, nameWithSpace)).toAbsolutePath().toString();
// try {
// final String systemJavaHome = sh.run("echo $SYSTEM_JAVA_HOME").stdout.trim();
// final String java = systemJavaHome + "/bin/java";
//
// sh.run("mkdir -p \"" + test_java_home + "/bin\"");
// sh.run("ln -s \"" + java + "\" \"" + test_java_home + "/bin/java\"");
// sh.run("chown -R " + ARCHIVE_OWNER + ":" + ARCHIVE_OWNER + " \"" + test_java_home + "\"");
//
// sh.getEnv().put("JAVA_HOME", test_java_home);
//
// //verify ES can start, stop and run plugin list
// Archives.runElasticsearch(installation, sh);
//
// Archives.stopElasticsearch(installation);
//
// String pluginListCommand = installation.bin + "/elasticsearch-plugin list";
// Result result = sh.run(pluginListCommand);
// assertThat(result.exitCode, equalTo(0));
// } finally {
// FileUtils.rm(Paths.get("\"" + test_java_home + "\""));
// }
// });
// }

public void test60AutoCreateKeystore() throws Exception {
assumeThat(installation, is(notNullValue()));
Expand Down