[8.10] Simplify test code, reenable skipped suite (elastic#163158) (e…

…lastic#165333) # Backport This will backport the following commits from `main` to `8.10`: - [Simplify test code, reenable skipped suite (elastic#163158)](elastic#163158)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Gerard Soldevila <[email protected]>
kibanamachine · Aug 31, 2023 · fe93fa7 · fe93fa7
1 parent 0323830
commit fe93fa7
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 126 deletions.
diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
@@ -92,7 +92,9 @@ export class TimePickerPageObject extends FtrService {
    * @param option 'Today' | 'This_week' | 'Last_15 minutes' | 'Last_24 hours' ...
    */
   async setCommonlyUsedTime(option: CommonlyUsed | string) {
+    await this.testSubjects.exists('superDatePickerToggleQuickMenuButton', { timeout: 5000 });
     await this.testSubjects.click('superDatePickerToggleQuickMenuButton');
+    await this.testSubjects.exists(`superDatePickerCommonlyUsed_${option}`, { timeout: 5000 });
     await this.testSubjects.click(`superDatePickerCommonlyUsed_${option}`);
   }
 

diff --git a/x-pack/test/functional_execution_context/test_utils.ts b/x-pack/test/functional_execution_context/test_utils.ts
@@ -4,18 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import Fs from 'fs/promises';
 import Path from 'path';
+import JSON5 from 'json5';
+import Fs from 'fs/promises';
 import { isEqualWith } from 'lodash';
 import type { Ecs, KibanaExecutionContext } from '@kbn/core/server';
-import type { RetryService } from '@kbn/ftr-common-functional-services';
-import { concatMap, defer, filter, firstValueFrom, ReplaySubject, scan, timeout } from 'rxjs';
 
 export const logFilePath = Path.resolve(__dirname, './kibana.log');
 export const ANY = Symbol('any');
 
-let logstream$: ReplaySubject<Ecs> | undefined;
-
 export function getExecutionContextFromLogRecord(record: Ecs | undefined): KibanaExecutionContext {
   if (record?.log?.logger !== 'execution_context' || !record?.message) {
     throw new Error(`The record is not an entry of execution context`);
@@ -37,95 +34,41 @@ export function isExecutionContextLog(
   }
 }
 
-// to avoid splitting log record containing \n symbol
-const endOfLine = /(?<=})\s*\n/;
-export async function assertLogContains({
-  description,
+/**
+ * Checks the provided log records against the provided predicate
+ */
+export function assertLogContains({
+  logs,
   predicate,
-  retry,
+  description,
 }: {
-  description: string;
+  logs: Ecs[];
   predicate: (record: Ecs) => boolean;
-  retry: RetryService;
-}): Promise<void> {
-  // logs are written to disk asynchronously. I sacrificed performance to reduce flakiness.
-  await retry.waitFor(description, async () => {
-    if (!logstream$) {
-      logstream$ = getLogstream$();
-    }
-    try {
-      await firstValueFrom(logstream$.pipe(filter(predicate), timeout(5_000)));
-      return true;
-    } catch (err) {
-      return false;
-    }
-  });
+  description: string;
+}) {
+  if (!logs.some(predicate)) {
+    throw new Error(`Unable to find log entries: ${description}`);
+  }
 }
 
 /**
- * Creates an observable that continuously tails the log file.
+ * Reads the log file and parses the JSON objects that it contains.
  */
-function getLogstream$(): ReplaySubject<Ecs> {
-  const stream$ = new ReplaySubject<Ecs>();
-
-  defer(async function* () {
-    const fd = await Fs.open(logFilePath, 'rs');
-    while (!stream$.isStopped) {
-      const { bytesRead, buffer } = await fd.read();
-      if (bytesRead) {
-        yield buffer.toString('utf8', 0, bytesRead);
-      }
-    }
-    await fd.close();
-  })
-    .pipe(
-      scan<string, { buffer: string; records: Ecs[] }>(
-        ({ buffer }, chunk) => {
-          const logString = buffer.concat(chunk);
-          const lines = logString.split(endOfLine);
-          const lastLine = lines.pop();
-          const records = lines.map((s) => JSON.parse(s));
-
-          let leftover = '';
-          if (lastLine) {
-            try {
-              const validRecord = JSON.parse(lastLine);
-              records.push(validRecord);
-            } catch (err) {
-              leftover = lastLine;
-            }
-          }
-
-          return { buffer: leftover, records };
-        },
-        {
-          records: [], // The ECS entries in the logs
-          buffer: '', // Accumulated leftovers from the previous operation
-        }
-      ),
-      concatMap(({ records }) => records)
-    )
-    .subscribe(stream$);
-
-  // let the content start flowing
-  stream$.subscribe();
-
-  return stream$;
-}
-
-export function closeLogstream() {
-  logstream$?.complete();
-  logstream$ = undefined;
+export async function readLogFile(): Promise<Ecs[]> {
+  await forceSyncLogFile();
+  const logFileContent = await Fs.readFile(logFilePath, 'utf-8');
+  return logFileContent
+    .split('\n')
+    .filter(Boolean)
+    .map<Ecs>((str) => JSON5.parse(str));
 }
 
 /**
  * Truncates the log file to avoid tests looking at the logs from previous executions.
  */
 export async function clearLogFile() {
-  closeLogstream();
   await Fs.writeFile(logFilePath, '', 'utf8');
   await forceSyncLogFile();
-  logstream$ = getLogstream$();
 }
 
 /**