From 6ef2431d3f9e0c2be5f63c0b6e8259bebb86a6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Thu, 30 Apr 2020 23:29:40 +0200
Subject: [PATCH 1/2] [APM] Fix failing Indicies Settings test

---
 .../public/components/app/Settings/ApmIndices/index.test.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
index 272c4b3add41..32e11ea365ac 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
@@ -12,7 +12,7 @@ import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContex
 
 describe('ApmIndices', () => {
   it('should not get stuck in infinite loop', async () => {
-    spyOn(hooks, 'useFetcher').and.returnValue({
+    const spy = spyOn(hooks, 'useFetcher').and.returnValue({
       data: undefined,
       status: 'loading'
     });
@@ -30,6 +30,6 @@ describe('ApmIndices', () => {
       </h2>
     `);
 
-    await wait();
+    expect(spy).toHaveBeenCalledTimes(2);
   });
 });

From 949ba9b94421c490c2de48c041279d1cd0df4a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Thu, 30 Apr 2020 23:40:27 +0200
Subject: [PATCH 2/2] Cleanup

---
 .../public/components/app/Settings/ApmIndices/index.test.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
index 32e11ea365ac..b03960861e0a 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { render, wait } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import React from 'react';
 import { ApmIndices } from '.';
 import * as hooks from '../../../../hooks/useFetcher';
 import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 describe('ApmIndices', () => {
-  it('should not get stuck in infinite loop', async () => {
+  it('should not get stuck in infinite loop', () => {
     const spy = spyOn(hooks, 'useFetcher').and.returnValue({
       data: undefined,
       status: 'loading'