Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

server logs config paths to use for runner #52980

Merged
merged 7 commits into from
Oct 17, 2020
Merged

server logs config paths to use for runner #52980

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bbc83d7
server logs config paths to use for runner
mshustov Dec 13, 2019
ce32ffc
Merge branch 'master' into ftr-server-logs-config-path
kibanamachine Oct 15, 2020
556213e
Merge branch 'master' of github.com:elastic/kibana into pr/52980
spalger Oct 15, 2020
cc0112c
fix eslint issue
spalger Oct 15, 2020
aa7d097
do not log config path for default config
mshustov Oct 16, 2020
ded7c8d
update snapshots
mshustov Oct 16, 2020
f71e580
fix other tests
mshustov Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/kbn-test/src/functional_tests/cli/start_servers/args.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ export function displayHelp() {
export function processOptions(userOptions, defaultConfigPath) {
validateOptions(userOptions);

const config = userOptions.config || defaultConfigPath;
const useDefaultConfig = userOptions.config === undefined;
const config = useDefaultConfig ? defaultConfigPath : userOptions.config;

if (!config) {
throw new Error(`functional_tests_server: config is required`);
Expand All @@ -100,6 +101,7 @@ export function processOptions(userOptions, defaultConfigPath) {
return {
...userOptions,
config: resolve(config),
useDefaultConfig,
createLogger,
extraKbnOpts: userOptions._,
};
Expand Down
9 changes: 8 additions & 1 deletion packages/kbn-test/src/functional_tests/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ import { readConfigFile } from '../functional_test_runner/lib';

const makeSuccessMessage = (options) => {
const installDirFlag = options.installDir ? ` --kibana-install-dir=${options.installDir}` : '';
const configPaths = Array.isArray(options.config) ? options.config : [options.config];
const pathsMessage = options.useDefaultConfig
? ''
: configPaths
.map((path) => relative(process.cwd(), path))
.map((path) => ` --config ${path}`)
.join('');

return (
'\n\n' +
dedent`
Elasticsearch and Kibana are ready for functional testing. Start the functional tests
in another terminal session by running this command from this directory:

node ${relative(process.cwd(), KIBANA_FTR_SCRIPT)}${installDirFlag}
node ${relative(process.cwd(), KIBANA_FTR_SCRIPT)}${installDirFlag}${pathsMessage}
` +
'\n\n'
);
Expand Down