From 92051f708390cd63a1da5fe9cb8c773abb22c41a Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 21 Oct 2021 07:07:30 -0400
Subject: [PATCH] Fix nodedetail flaky test (#115612) (#115898)

* add test-subj to page loading component

* wait for page to load before navigating to node

* enable node_detail functional tests

* a different approach

* bump timeouts

* Revert "add test-subj to page loading component"

This reverts commit 1840cdf7b8a75e6c4d4e7c840a263c9e7b5e8fb4.

* remove unused method

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kevin Lacabane <kevin.lacabane@elastic.co>
---
 .../apps/monitoring/elasticsearch/node_detail.js           | 3 +--
 .../apps/monitoring/elasticsearch/node_detail_mb.js        | 3 +--
 .../functional/services/monitoring/elasticsearch_nodes.js  | 7 +++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
index 07fda7a143a99..6b1658dd9ed0e 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }) {
   const nodesList = getService('monitoringElasticsearchNodes');
   const nodeDetail = getService('monitoringElasticsearchNodeDetail');
 
-  // FLAKY https://github.com/elastic/kibana/issues/115130
-  describe.skip('Elasticsearch node detail', () => {
+  describe('Elasticsearch node detail', () => {
     describe('Active Nodes', () => {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
index 70c9b42b37f42..9130ce91e7b4d 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }) {
   const nodesList = getService('monitoringElasticsearchNodes');
   const nodeDetail = getService('monitoringElasticsearchNodeDetail');
 
-  // Failing: See https://github.com/elastic/kibana/issues/115255
-  describe.skip('Elasticsearch node detail mb', () => {
+  describe('Elasticsearch node detail mb', () => {
     describe('Active Nodes', () => {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
diff --git a/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js b/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js
index 25bfd82f01da7..e94e85fc96486 100644
--- a/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js
+++ b/x-pack/test/functional/services/monitoring/elasticsearch_nodes.js
@@ -51,8 +51,11 @@ export function MonitoringElasticsearchNodesProvider({ getService, getPageObject
       return pageId !== null;
     }
 
-    clickRowByResolver(nodeResolver) {
-      return testSubjects.click(SUBJ_NODE_LINK_PREFIX + nodeResolver);
+    async clickRowByResolver(nodeResolver) {
+      await retry.waitForWithTimeout('redirection to node detail', 30000, async () => {
+        await testSubjects.click(SUBJ_NODE_LINK_PREFIX + nodeResolver, 5000);
+        return testSubjects.exists('elasticsearchNodeDetailStatus', { timeout: 5000 });
+      });
     }
 
     async waitForTableToFinishLoading() {