github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] API integration test make docker server waitForLogline timeout configurable (#140128)

Browse source
This commit is contained in:
Nicolas Chaulet 2022-09-07 12:26:10 -04:00 • committed by GitHub
parent f7d1d6769d
commit feeee2a5fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
View file

@ -71,6 +71,7 @@ const dockerServerSchema = () =>
port: requiredWhenEnabled(Joi.number()), port: requiredWhenEnabled(Joi.number()),
portInContainer: requiredWhenEnabled(Joi.number()), portInContainer: requiredWhenEnabled(Joi.number()),
waitForLogLine: Joi.alternatives(Joi.object().instance(RegExp), Joi.string()).optional(), waitForLogLine: Joi.alternatives(Joi.object().instance(RegExp), Joi.string()).optional(),
waitForLogLineTimeoutMs: Joi.number().integer().optional(),
waitFor: Joi.func().optional(), waitFor: Joi.func().optional(),
args: Joi.array().items(Joi.string()).optional(), args: Joi.array().items(Joi.string()).optional(),
}) })

1
packages/kbn-test/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts
View file

@ -14,6 +14,7 @@ export interface DockerServerSpec {
port: number; port: number;
image: string; image: string;
waitForLogLine?: RegExp | string; waitForLogLine?: RegExp | string;
waitForLogLineTimeoutMs?: number;
/** a function that should return an observable that will allow the tests to execute as soon as it emits anything */ /** a function that should return an observable that will allow the tests to execute as soon as it emits anything */
waitFor?: (server: DockerServer, logLine$: Rx.Observable<string>) => Rx.Observable<unknown>; waitFor?: (server: DockerServer, logLine$: Rx.Observable<string>) => Rx.Observable<unknown>;
/* additional command line arguments passed to docker run */ /* additional command line arguments passed to docker run */

5
packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
View file

@ -101,7 +101,7 @@ export class DockerServersService {
private async startServer(server: DockerServer) { private async startServer(server: DockerServer) {
const { log, lifecycle } = this; const { log, lifecycle } = this;
const { image, name, waitFor, waitForLogLine } = server; const { image, name, waitFor, waitForLogLine, waitForLogLineTimeoutMs } = server;
// pull image from registry // pull image from registry
log.info(`[docker:${name}] pulling docker image "${image}"`); log.info(`[docker:${name}] pulling docker image "${image}"`);
@ -200,7 +200,8 @@ export class DockerServersService {
: line.includes(waitForLogLine) : line.includes(waitForLogLine)
) )
), ),
`waitForLogLine didn't emit anything` `waitForLogLine didn't emit anything`,
waitForLogLineTimeoutMs
) )
).toPromise(); ).toPromise();
} }

1
x-pack/test/fleet_api_integration/config.ts
View file

@ -52,6 +52,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
port: registryPort, port: registryPort,
args: dockerArgs, args: dockerArgs,
waitForLogLine: 'package manifests loaded', waitForLogLine: 'package manifests loaded',
waitForLogLineTimeoutMs: 60 * 2 * 10000, // 2 minutes
}, },
}), }),
services: xPackAPITestsConfig.get('services'), services: xPackAPITestsConfig.get('services'),