honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added @AwaitsFix for failing PluginManagerIT test after talking to spinscale

This commit is contained in:
Christoph Büscher 2015-08-10 11:21:04 +02:00
parent 4e936d1964
commit 32e98aa377
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java
View File

@ -105,7 +105,7 @@ public class PluginManagerIT extends ESIntegTestCase {
public void clearPathHome() { public void clearPathHome() {
System.clearProperty("es.default.path.home"); System.clearProperty("es.default.path.home");
} }
/** creates a plugin .zip and returns the url for testing */ /** creates a plugin .zip and returns the url for testing */
private String createPlugin(final Path structure, String... properties) throws IOException { private String createPlugin(final Path structure, String... properties) throws IOException {
writeProperties(structure, properties); writeProperties(structure, properties);
@ -144,7 +144,7 @@ public class PluginManagerIT extends ESIntegTestCase {
Files.createFile(pluginDir.resolve("bin").resolve("tool")); Files.createFile(pluginDir.resolve("bin").resolve("tool"));
Files.createDirectories(pluginDir.resolve("config")); Files.createDirectories(pluginDir.resolve("config"));
Files.createFile(pluginDir.resolve("config").resolve("file")); Files.createFile(pluginDir.resolve("config").resolve("file"));
String pluginUrl = createPlugin(pluginDir, String pluginUrl = createPlugin(pluginDir,
"description", "fake desc", "description", "fake desc",
"version", "1.0", "version", "1.0",
@ -152,7 +152,7 @@ public class PluginManagerIT extends ESIntegTestCase {
"java.version", System.getProperty("java.specification.version"), "java.version", System.getProperty("java.specification.version"),
"jvm", "true", "jvm", "true",
"classname", "FakePlugin"); "classname", "FakePlugin");
Environment env = initialSettings.v2(); Environment env = initialSettings.v2();
Path binDir = env.binFile(); Path binDir = env.binFile();
Path pluginBinDir = binDir.resolve(pluginName); Path pluginBinDir = binDir.resolve(pluginName);
@ -189,7 +189,7 @@ public class PluginManagerIT extends ESIntegTestCase {
// create config/test.txt with contents 'version1' // create config/test.txt with contents 'version1'
Files.createDirectories(pluginDir.resolve("config")); Files.createDirectories(pluginDir.resolve("config"));
Files.write(pluginDir.resolve("config").resolve("test.txt"), "version1".getBytes(StandardCharsets.UTF_8)); Files.write(pluginDir.resolve("config").resolve("test.txt"), "version1".getBytes(StandardCharsets.UTF_8));
String pluginUrl = createPlugin(pluginDir, String pluginUrl = createPlugin(pluginDir,
"description", "fake desc", "description", "fake desc",
"version", "1.0", "version", "1.0",
@ -197,7 +197,7 @@ public class PluginManagerIT extends ESIntegTestCase {
"java.version", System.getProperty("java.specification.version"), "java.version", System.getProperty("java.specification.version"),
"jvm", "true", "jvm", "true",
"classname", "FakePlugin"); "classname", "FakePlugin");
Environment env = initialSettings.v2(); Environment env = initialSettings.v2();
Path pluginConfigDir = env.configFile().resolve(pluginName); Path pluginConfigDir = env.configFile().resolve(pluginName);
@ -233,7 +233,7 @@ public class PluginManagerIT extends ESIntegTestCase {
"java.version", System.getProperty("java.specification.version"), "java.version", System.getProperty("java.specification.version"),
"jvm", "true", "jvm", "true",
"classname", "FakePlugin"); "classname", "FakePlugin");
assertStatusOk(String.format(Locale.ROOT, "install %s --url %s --verbose", pluginName, pluginUrl)); assertStatusOk(String.format(Locale.ROOT, "install %s --url %s --verbose", pluginName, pluginUrl));
assertFileContent(pluginConfigDir, "test.txt", "version1"); assertFileContent(pluginConfigDir, "test.txt", "version1");
@ -297,7 +297,7 @@ public class PluginManagerIT extends ESIntegTestCase {
"java.version", System.getProperty("java.specification.version"), "java.version", System.getProperty("java.specification.version"),
"jvm", "true", "jvm", "true",
"classname", "FakePlugin"); "classname", "FakePlugin");
Environment env = initialSettings.v2(); Environment env = initialSettings.v2();
Path binDir = env.binFile(); Path binDir = env.binFile();
Path pluginBinDir = binDir.resolve(pluginName); Path pluginBinDir = binDir.resolve(pluginName);
@ -431,7 +431,7 @@ public class PluginManagerIT extends ESIntegTestCase {
@Test @Test
public void testRemovePlugin() throws Exception { public void testRemovePlugin() throws Exception {
String pluginName = "plugintest"; String pluginName = "plugintest";
Path pluginDir = createTempDir().resolve(pluginName); Path pluginDir = createTempDir().resolve(pluginName);
String pluginUrl = createPlugin(pluginDir, String pluginUrl = createPlugin(pluginDir,
"description", "fake desc", "description", "fake desc",
"version", "1.0.0", "version", "1.0.0",
@ -439,7 +439,7 @@ public class PluginManagerIT extends ESIntegTestCase {
"java.version", System.getProperty("java.specification.version"), "java.version", System.getProperty("java.specification.version"),
"jvm", "true", "jvm", "true",
"classname", "FakePlugin"); "classname", "FakePlugin");
// We want to remove plugin with plugin short name // We want to remove plugin with plugin short name
singlePluginInstallAndRemove("plugintest", "plugintest", pluginUrl); singlePluginInstallAndRemove("plugintest", "plugintest", pluginUrl);
@ -502,6 +502,7 @@ public class PluginManagerIT extends ESIntegTestCase {
} }
@Test @Test
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/12766")
public void testThatBasicAuthIsSupportedWithHttps() throws Exception { public void testThatBasicAuthIsSupportedWithHttps() throws Exception {
assumeTrue("test requires security manager to be disabled", System.getSecurityManager() == null); assumeTrue("test requires security manager to be disabled", System.getSecurityManager() == null);