Skip to content

[7.x] Unmute more memory-related tests after the fix in #68542 #68741

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

Merged
merged 1 commit into from
Feb 19, 2021
Merged

[7.x] Unmute more memory-related tests after the fix in #68542 #68741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,3 @@ This is a possible response:
// TESTRESPONSE[s/"build_hash": "99a07c016d5a73"/"build_hash": "$body.native_code.build_hash"/]
// TESTRESPONSE[s/"effective_max_model_memory_limit": "28961mb"/"effective_max_model_memory_limit": "$body.limits.effective_max_model_memory_limit"/]
// TESTRESPONSE[s/"total_ml_memory": "86883mb"/"total_ml_memory": "$body.limits.total_ml_memory"/]
// TESTRESPONSE[skip:"AwaitsFix https://github.com/elastic/elasticsearch/issues/66629"]
10 changes: 2 additions & 8 deletions rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
"cluster stats test":
- skip:
version: "all"
reason: "https://github.com/elastic/elasticsearch/issues/66629"

- do:
cluster.stats: {}

Expand Down Expand Up @@ -37,10 +33,8 @@
---
"get cluster stats returns cluster_uuid at the top level":
- skip:
version: "all"
reason: "https://github.com/elastic/elasticsearch/issues/66629"
#version: " - 6.99.99"
#reason: "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher"
version: " - 6.99.99"
reason: "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher"

- do:
cluster.stats: {}
Expand Down
23 changes: 11 additions & 12 deletions server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,8 @@

package org.elasticsearch.monitor.os;

import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.anyOf;
Copy link
Contributor

@probakowski probakowski Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These import changes are not needed for this change, right?

Copy link
Contributor Author

@danhermann danhermann Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit that muted these tests (09f823b) moved the import statements out of the standard ordering that we use, so I just restored the original standard ordering as part of the un-mute.

import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.notNullValue;
import org.apache.lucene.util.Constants;
import org.elasticsearch.test.ESTestCase;

import java.io.IOException;
import java.math.BigInteger;
Expand All @@ -26,8 +19,15 @@
import java.util.Locale;
import java.util.stream.Collectors;

import org.apache.lucene.util.Constants;
import org.elasticsearch.test.ESTestCase;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.notNullValue;

public class OsProbeTests extends ESTestCase {

Expand Down Expand Up @@ -73,7 +73,6 @@ List<String> readOsRelease() throws IOException {
assertThat(info.getAvailableProcessors(), equalTo(Runtime.getRuntime().availableProcessors()));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66629")
public void testOsStats() {
final OsProbe osProbe = new OsProbe();
OsStats stats = osProbe.osStats();
Expand Down