From 0e6db78d947ba8c49c9ad932969c7fd05e1338ad Mon Sep 17 00:00:00 2001
From: Dan Hermann <danhermann@users.noreply.github.com>
Date: Fri, 19 Feb 2021 09:21:48 -0600
Subject: [PATCH] Unmute more memory-related tests after the fix in #68542
 (#69273)

---
 .../apis/get-ml-info.asciidoc                 |  1 -
 .../test/cluster.stats/10_basic.yml           | 10 ++------
 .../monitor/os/OsProbeTests.java              | 23 +++++++++----------
 3 files changed, 13 insertions(+), 21 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 838923c5407b3..eac0a3c83d64e 100644
--- a/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc
+++ b/docs/reference/ml/anomaly-detection/apis/get-ml-info.asciidoc
@@ -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"]
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 a40f4803ab0b8..f97eef77b4e9d 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,9 +1,5 @@
 ---
 "cluster stats test":
-  - skip:
-      version: "all"
-      reason: "https://github.com/elastic/elasticsearch/issues/66629"
-
   - do:
       cluster.stats: {}
 
@@ -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: {}
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 c5b43ec240e48..9843a39b2dd16 100644
--- a/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
+++ b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
@@ -8,15 +8,8 @@
 
 package org.elasticsearch.monitor.os;
 
-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;
+import org.apache.lucene.util.Constants;
+import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -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 {
 
@@ -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();