maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[ftr/config] prevent mochaOpts and timeouts conflict (#14060)

Browse source
This commit is contained in:
Spencer 2017-09-19 17:08:47 -07:00 committed by GitHub
parent 612385e927
commit 1f5835c351
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/functional_test_runner/lib/config/schema.js
View file

@ -7,7 +7,10 @@ import { ConsoleReporterProvider } from '../reporters';
// valid pattern for ID
// enforced camel-case identifiers for consistency
const ID_PATTERN = /^[a-zA-Z0-9_]+$/;
const INSPECTING = process.execArgv.includes('--inspect');
const INSPECTING = (
process.execArgv.includes('--inspect') ||
process.execArgv.includes('--inspect-brk')
);
const urlPartsSchema = () => Joi.object().keys({
protocol: Joi.string().valid('http', 'https').default('http'),
@ -48,7 +51,6 @@ export const schema = Joi.object().keys({
timeouts: Joi.object().keys({
find: Joi.number().default(10000),
try: Joi.number().default(40000),
test: Joi.number().default(INSPECTING ? Infinity : 120000),
esRequestTimeout: Joi.number().default(30000),
kibanaStabilize: Joi.number().default(15000),
navigateStatusPageCheck: Joi.number().default(250),
@ -58,7 +60,7 @@ export const schema = Joi.object().keys({
bail: Joi.boolean().default(false),
grep: Joi.string(),
slow: Joi.number().default(30000),
timeout: Joi.number().default(60000),
timeout: Joi.number().default(INSPECTING ? Infinity : 120000),
ui: Joi.string().default('bdd'),
reporterProvider: Joi.func().default(ConsoleReporterProvider),
}).default(),

1
src/functional_test_runner/lib/mocha/setup_mocha.js
View file

@ -14,7 +14,6 @@ import { loadTestFiles } from './load_test_files';
export async function setupMocha(lifecycle, log, config, providers) {
// configure mocha
const mocha = new Mocha({
timeout: config.get('timeouts.test'),
...config.get('mochaOpts'),
reporter: await providers.loadExternalService(
'configured mocha reporter',