Skip to content

Commit

Permalink
Disable Template Cleanup in MultiVersionRepositoryAccessIT
Browse files Browse the repository at this point in the history
Not the most elegant solution, but we do not clean up templates in
x-pack REST tests either it seems. I don't think it's worth it working
out all the details for pre-7.8 versions here when we can just turn
off the template cleanup and have tests working fine for older versions.

closes elastic#80088
  • Loading branch information
original-brownbear committed Nov 3, 2021
1 parent cb6347b commit c942fc4
Showing 1 changed file with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,13 @@ protected boolean preserveReposUponCompletion() {
return true;
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/80088")
@Override
protected boolean preserveTemplatesUponCompletion() {
// don't try to clean up templates, the timing of this won't always work as expected with older ES versions pre 7.8 and we get
// failures from dangling X-Pack templates
return true;
}

public void testCreateAndRestoreSnapshot() throws IOException {
final String repoName = getTestName();
try (RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(adminClient().getNodes().toArray(new Node[0])))) {
Expand Down Expand Up @@ -153,7 +159,6 @@ public void testCreateAndRestoreSnapshot() throws IOException {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/80088")
public void testReadOnlyRepo() throws IOException {
final String repoName = getTestName();
try (RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(adminClient().getNodes().toArray(new Node[0])))) {
Expand Down Expand Up @@ -200,7 +205,6 @@ public void testReadOnlyRepo() throws IOException {
ElasticsearchStatusException.class
);

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/80088")
public void testUpgradeMovesRepoToNewMetaVersion() throws IOException {
final String repoName = getTestName();
try (RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(adminClient().getNodes().toArray(new Node[0])))) {
Expand Down

0 comments on commit c942fc4

Please sign in to comment.