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

test: use valid names to prevent false test failures 

In some cases, the random ascii value could match a forbidden name, which will cause this
test to fail as it expects valid names. This changes ensures the names are valid.

Original commit: elastic/x-pack-elasticsearch@c79f8fc4cc
This commit is contained in:
jaymode 2016-08-17 14:31:17 -04:00
parent de4851329d
commit 934b69b0c6
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elasticsearch/x-pack/security/src/test/java/org/elasticsearch/xpack/security/ssl/CertificateToolTests.java
View File

@ -94,11 +94,12 @@ public class CertificateToolTests extends ESTestCase {
final int numberOfInstances = scaledRandomIntBetween(1, 12);
Map<String, Map<String, String>> instanceInput = new HashMap<>(numberOfInstances);
for (int i = 0; i < numberOfInstances; i++) {
final String name = randomAsciiOfLengthBetween(1, 32);
final String name = getValidRandomInstanceName();
Map<String, String> instanceInfo = new HashMap<>();
instanceInput.put(name, instanceInfo);
instanceInfo.put("ip", randomFrom("127.0.0.1", "::1", "192.168.1.1,::1", ""));
instanceInfo.put("dns", randomFrom("localhost", "localhost.localdomain", "localhost,myhost", ""));
logger.info("instance [{}] name [{}] [{}]", i, name, instanceInfo);
}
int count = 0;
@ -117,6 +118,7 @@ public class CertificateToolTests extends ESTestCase {
Collection<CertificateInformation> certInfos = CertificateTool.getCertificateInformationList(terminal, null,
new Environment(Settings.builder().put("path.home", createTempDir()).build()));
logger.info("certificate tool output:\n{}", terminal.getOutput());
assertEquals(numberOfInstances, certInfos.size());
for (CertificateInformation certInfo : certInfos) {
String name = certInfo.name.originalName;
@ -387,4 +389,18 @@ public class CertificateToolTests extends ESTestCase {
}
}
}
/**
* Gets a random name that is valid for certificate generation. There are some cases where the random value could match one of the
* reserved names like ca, so this method allows us to avoid these issues.
*/
private String getValidRandomInstanceName() {
String name;
boolean valid;
do {
name = randomAsciiOfLengthBetween(1, 32);
valid = Name.fromUserProvidedName(name).error == null;
} while (valid == false);
return name;
}
}