Stabilize x-pack-ciGroup6

test/common/services/retry/retry.js

@@ -25,6 +25,10 @@ export function RetryProvider({ getService }) {
   const log = getService('log');
 
   return new class Retry {
+    async forSuccess(options) {
+      return await retryForSuccess(log, options);
+    }
+
     async tryForTime(timeout, block) {
       return await retryForSuccess(log, {
         timeout,

test/common/services/retry/retry_for_success.js

@@ -25,7 +25,7 @@ const delay = ms => new Promise(resolve => (
 
 const returnTrue = () => true;
 
-const defaultOnFailure = (methodName) => (lastError) => {
+const defaultOnTimeout = (methodName) => (lastError) => {
   throw new Error(`${methodName} timeout: ${lastError.stack || lastError.message}`);
 };
 
@@ -51,7 +51,7 @@ export async function retryForSuccess(log, {
   timeout,
   methodName,
   block,
-  onFailure = defaultOnFailure(methodName),
+  onTimeout = defaultOnTimeout(methodName),
   accept = returnTrue
 }) {
   const start = Date.now();
@@ -60,8 +60,7 @@ export async function retryForSuccess(log, {
 
   while (true) {
     if (Date.now() - start > timeout) {
-      await onFailure(lastError);
-      throw new Error('expected onFailure() option to throw an error');
+      return await onTimeout(lastError);
     }
 
     const { result, error } = await runAttempt(block);

test/common/services/retry/retry_for_truthy.js

@@ -29,7 +29,7 @@ export async function retryForTruthy(log, {
 
   const accept = result => Boolean(result);
 
-  const onFailure = lastError => {
+  const onTimeout = lastError => {
     let msg = `timed out waiting for ${description}`;
 
     if (lastError) {
@@ -43,7 +43,7 @@ export async function retryForTruthy(log, {
     timeout,
     methodName,
     block,
-    onFailure,
+    onTimeout,
     accept
   });
 }

test/functional/services/find.js

@@ -206,10 +206,19 @@ export async function FindProvider({ getService }) {
 
     async existsByDisplayedByCssSelector(selector, timeout = WAIT_FOR_EXISTS_TIME) {
       log.debug(`Find.existsByDisplayedByCssSelector('${selector}') with timeout=${timeout}`);
-      return await this.exists(async (driver) => {
-        const elements = wrapAll(await driver.findElements(By.css(selector)));
-        return await this.filterElementIsDisplayed(elements);
-      }, timeout);
+      return await retry.forSuccess({
+        timeout,
+        methodName: `Find.existsByDisplayedByCssSelector('${selector}')`,
+        accept: result => !!result,
+        onTimeout: () => false,
+        block: async () => {
+          const elements = await this.filterElementIsDisplayed(
+            wrapAll(await driver.findElements(By.css(selector)))
+          );
+
+          return elements.length > 0;
+        },
+      });
     }
 
     async existsByCssSelector(selector, timeout = WAIT_FOR_EXISTS_TIME) {

x-pack/test/api_integration/apis/uptime/graphql/index.js

@@ -8,7 +8,8 @@ export default function ({ getService, loadTestFile }) {
   const esArchiver = getService('esArchiver');
   const archive = 'uptime/full_heartbeat';
 
-  describe('graphql', () => {
+  // FLAKY: https://github.com/elastic/kibana/pull/31368
+  describe.skip('graphql', () => {
     before('load heartbeat data', () => esArchiver.load(archive));
     after('unload heartbeat index', () => esArchiver.unload(archive));
     // each of these test files imports a GQL query from