Skip to content

Commit 0e6db78

Browse files
authored
Unmute more memory-related tests after the fix in #68542 (#69273)
1 parent ce9e2f9 commit 0e6db78

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,4 +126,3 @@ This is a possible response:
126126
// TESTRESPONSE[s/"build_hash": "99a07c016d5a73"/"build_hash": "$body.native_code.build_hash"/]
127127
// TESTRESPONSE[s/"effective_max_model_memory_limit": "28961mb"/"effective_max_model_memory_limit": "$body.limits.effective_max_model_memory_limit"/]
128128
// TESTRESPONSE[s/"total_ml_memory": "86883mb"/"total_ml_memory": "$body.limits.total_ml_memory"/]
129-
// TESTRESPONSE[skip:"AwaitsFix https://github.com/elastic/elasticsearch/issues/66629"]

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
22
"cluster stats test":
3-
- skip:
4-
version: "all"
5-
reason: "https://github.com/elastic/elasticsearch/issues/66629"
6-
73
- do:
84
cluster.stats: {}
95

@@ -37,10 +33,8 @@
3733
---
3834
"get cluster stats returns cluster_uuid at the top level":
3935
- skip:
40-
version: "all"
41-
reason: "https://github.com/elastic/elasticsearch/issues/66629"
42-
#version: " - 6.99.99"
43-
#reason: "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher"
36+
version: " - 6.99.99"
37+
reason: "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher"
4438

4539
- do:
4640
cluster.stats: {}

server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@
88

99
package org.elasticsearch.monitor.os;
1010

11-
import static org.hamcrest.Matchers.allOf;
12-
import static org.hamcrest.Matchers.anyOf;
13-
import static org.hamcrest.Matchers.both;
14-
import static org.hamcrest.Matchers.equalTo;
15-
import static org.hamcrest.Matchers.greaterThan;
16-
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
17-
import static org.hamcrest.Matchers.is;
18-
import static org.hamcrest.Matchers.lessThanOrEqualTo;
19-
import static org.hamcrest.Matchers.notNullValue;
11+
import org.apache.lucene.util.Constants;
12+
import org.elasticsearch.test.ESTestCase;
2013

2114
import java.io.IOException;
2215
import java.math.BigInteger;
@@ -26,8 +19,15 @@
2619
import java.util.Locale;
2720
import java.util.stream.Collectors;
2821

29-
import org.apache.lucene.util.Constants;
30-
import org.elasticsearch.test.ESTestCase;
22+
import static org.hamcrest.Matchers.allOf;
23+
import static org.hamcrest.Matchers.anyOf;
24+
import static org.hamcrest.Matchers.both;
25+
import static org.hamcrest.Matchers.equalTo;
26+
import static org.hamcrest.Matchers.greaterThan;
27+
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
28+
import static org.hamcrest.Matchers.is;
29+
import static org.hamcrest.Matchers.lessThanOrEqualTo;
30+
import static org.hamcrest.Matchers.notNullValue;
3131

3232
public class OsProbeTests extends ESTestCase {
3333

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

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

0 commit comments

Comments
 (0)