Migrate setup passwords packaging test from bats#49337
Merged
rjernst merged 17 commits intoelastic:masterfrom Nov 28, 2019
Merged
Migrate setup passwords packaging test from bats#49337rjernst merged 17 commits intoelastic:masterfrom
rjernst merged 17 commits intoelastic:masterfrom
Conversation
This commit moves the packaging tests for elasticsearch-setup-passwords to java from bats. The change also enables future tests to enable security in Elasticsearch and automatically have waitForElasticsearch work correctly, at least to the same extent it worked in bats, by waiting on the ES port instead of health check. relates elastic#46005
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Packaging) |
jaymode
approved these changes
Nov 20, 2019
Comment on lines
+95
to
+105
| try (Socket s = new Socket(InetAddress.getLoopbackAddress(), 9200)) { | ||
| return; | ||
| } catch (IOException e) { | ||
| try { | ||
| // ignore, only want to establish a connection | ||
| Thread.sleep(1000); | ||
| } catch (InterruptedException interrupted) { | ||
| Thread.currentThread().interrupt(); | ||
| return; | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
this is just a preference, but I think it is easier to read like this:
try (Socket s = new Socket(InetAddress.getLoopbackAddress(), 9200)) {
return;
} catch (IOException e) {
// ignore, only want to establish a connection
}
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return;
}| return sh.run(path.toString() + " " + args); | ||
| } | ||
|
|
||
| protected void assertWhileRunning(Platforms.PlatformAction assertions) throws Exception { |
Member
There was a problem hiding this comment.
I think it would be helpful to have some javadocs on this method indicating the method runs elasticsearch, performs the assertions, and then stops elasticsearch
| // nothing, "installing" docker image is running it | ||
| } | ||
|
|
||
| } catch (Exception e ){ |
Member
There was a problem hiding this comment.
Suggested change
| } catch (Exception e ){ | |
| } catch (Exception e){ |
Member
Author
|
@jaymode I addressed your comments, and also migrated the bootstrap password tests as those were tightly couple with setup-passwords behavior. |
jaymode
approved these changes
Nov 21, 2019
| public void test30AddBootstrapPassword() throws Exception { | ||
| installation.executables().elasticsearchKeystore.run(sh, "add --stdin bootstrap.password", BOOTSTRAP_PASSWORD); | ||
|
|
||
| FileUtils.rm(installation.data); // wipe auto generated passwords from previous test |
Member
There was a problem hiding this comment.
minor nit, can this be the first line of the test?
Member
Author
|
@elasticmachine run elasticsearch-ci/bwc |
Member
Author
|
@elasticmachine run elasticsearch-ci/packaging-matrix |
jaymode
reviewed
Nov 27, 2019
| dataFiles.forEach(file -> { | ||
| if (distribution.platform != Distribution.Platform.WINDOWS) { | ||
| FileUtils.rm(file); | ||
| } |
Member
There was a problem hiding this comment.
should we have an else here or a return?
Member
Author
There was a problem hiding this comment.
oops, yes, i meant for a return.
Member
Author
|
@elasticmachine run elasticsearch-ci/packaging-matrix |
rjernst
added a commit
that referenced
this pull request
Nov 28, 2019
This commit moves the packaging tests for elasticsearch-setup-passwords to java from bats. The change also enables future tests to enable security in Elasticsearch and automatically have waitForElasticsearch work correctly, at least to the same extent it worked in bats, by waiting on the ES port instead of health check. relates #46005
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit moves the packaging tests for elasticsearch-setup-passwords
to java from bats. The change also enables future tests to enable
security in Elasticsearch and automatically have waitForElasticsearch
work correctly, at least to the same extent it worked in bats, by
waiting on the ES port instead of health check.
relates #46005