From f14f0bf6339598b318db990d03574bc0434a7a93 Mon Sep 17 00:00:00 2001 From: Gordon Brown Date: Fri, 18 Dec 2020 15:15:43 -0700 Subject: [PATCH] Mute tests failing on Debian 8 due to memory reporting (#66648) See https://github.com/elastic/elasticsearch/issues/66629 for details --- .../apis/get-ml-info.asciidoc | 2 ++ .../test/cluster.stats/10_basic.yml | 10 ++++++-- .../monitor/os/OsProbeTests.java | 23 ++++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc b/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc index b62701373c17..17250027828d 100644 --- a/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc +++ b/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc @@ -123,3 +123,5 @@ This is a possible response: // TESTRESPONSE[s/"version": "7.0.0",/"version": "$body.native_code.version",/] // 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"] diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml index f97eef77b4e9..a40f4803ab0b 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml @@ -1,5 +1,9 @@ --- "cluster stats test": + - skip: + version: "all" + reason: "https://github.com/elastic/elasticsearch/issues/66629" + - do: cluster.stats: {} @@ -33,8 +37,10 @@ --- "get cluster stats returns cluster_uuid at the top level": - skip: - version: " - 6.99.99" - reason: "cluster stats including cluster_uuid at the top level is new in v6.5.0 and higher" + 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" - do: cluster.stats: {} diff --git a/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java index c473e4155ae4..9408fa31d19f 100644 --- a/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java @@ -19,17 +19,6 @@ package org.elasticsearch.monitor.os; -import org.apache.lucene.util.Constants; -import org.elasticsearch.test.ESTestCase; - -import java.io.IOException; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; - import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.both; @@ -40,6 +29,17 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + +import org.apache.lucene.util.Constants; +import org.elasticsearch.test.ESTestCase; + public class OsProbeTests extends ESTestCase { public void testOsInfo() throws IOException { @@ -84,6 +84,7 @@ List 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();