From 24fda7ed565652203eba3040c74b8b9be2171a8d Mon Sep 17 00:00:00 2001 From: Mihir Soni Date: Wed, 3 Mar 2021 22:15:41 +0000 Subject: [PATCH 1/2] [Rename] kbn-test in packages directory to osd-test/functional_test_runner Signed-off-by: Mihir Soni --- .../__tests__/fixtures/failure_hooks/config.js | 0 .../fixtures/failure_hooks/tests/after_hook.js | 0 .../fixtures/failure_hooks/tests/before_hook.js | 0 .../__tests__/fixtures/failure_hooks/tests/it.js | 0 .../__tests__/fixtures/simple_project/config.js | 0 .../__tests__/fixtures/simple_project/tests.js | 2 +- .../__tests__/integration/basic.js | 4 ++-- .../__tests__/integration/failure_hooks.js | 4 ++-- .../src/functional_test_runner/cli.ts | 12 ++++++------ .../functional_test_runner/fake_mocha_types.d.ts | 0 .../functional_test_runner.ts | 2 +- .../src/functional_test_runner/index.ts | 0 .../lib/config/__tests__/fixtures/config.1.js | 0 .../lib/config/__tests__/fixtures/config.2.js | 0 .../lib/config/__tests__/fixtures/config.3.js | 0 .../lib/config/__tests__/fixtures/config.4.js | 0 .../config/__tests__/fixtures/config.invalid.js | 0 .../lib/config/__tests__/read_config_file.js | 4 ++-- .../functional_test_runner/lib/config/config.ts | 0 .../functional_test_runner/lib/config/index.ts | 0 .../lib/config/read_config_file.ts | 2 +- .../functional_test_runner/lib/config/schema.ts | 16 ++++++++-------- .../lib/docker_servers/README.md | 2 +- .../lib/docker_servers/container_logs.ts | 2 +- .../lib/docker_servers/container_running.ts | 2 +- .../define_docker_servers_config.ts | 0 .../lib/docker_servers/docker_servers_service.ts | 2 +- .../lib/docker_servers/index.ts | 0 .../lib/failure_metadata.test.ts | 0 .../lib/failure_metadata.ts | 2 +- .../src/functional_test_runner/lib/index.ts | 0 .../src/functional_test_runner/lib/lifecycle.ts | 0 .../lib/lifecycle_event.ts | 0 .../lib/lifecycle_phase.test.ts | 0 .../lib/lifecycle_phase.ts | 0 .../functional_test_runner/lib/load_tracer.ts | 0 .../lib/mocha/assignment_proxy.js | 0 .../lib/mocha/decorate_mocha_ui.js | 2 +- .../lib/mocha/filter_suites_by_tags.js | 0 .../lib/mocha/filter_suites_by_tags.test.js | 0 .../functional_test_runner/lib/mocha/index.ts | 0 .../lib/mocha/load_test_files.js | 2 +- .../lib/mocha/reporter/colors.js | 0 .../lib/mocha/reporter/index.js | 0 .../lib/mocha/reporter/ms.js | 0 .../lib/mocha/reporter/reporter.js | 2 +- .../lib/mocha/reporter/symbols.js | 0 .../lib/mocha/reporter/write_epilogue.js | 0 .../lib/mocha/run_tests.ts | 0 .../lib/mocha/setup_mocha.js | 2 +- .../lib/mocha/wrap_function.js | 0 .../lib/mocha/wrap_runnable_args.js | 0 .../lib/providers/async_instance.ts | 0 .../lib/providers/index.ts | 0 .../lib/providers/provider_collection.ts | 2 +- .../lib/providers/read_provider_spec.ts | 0 .../lib/providers/verbose_instance.ts | 2 +- .../lib/suite_tracker.test.ts | 4 ++-- .../functional_test_runner/lib/suite_tracker.ts | 2 +- 59 files changed, 37 insertions(+), 37 deletions(-) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/failure_hooks/config.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/after_hook.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/before_hook.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/it.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/simple_project/config.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js (96%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/integration/basic.js (95%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/__tests__/integration/failure_hooks.js (97%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/cli.ts (91%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/fake_mocha_types.d.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/functional_test_runner.ts (99%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/fixtures/config.1.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/fixtures/config.2.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/fixtures/config.3.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/fixtures/config.4.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/fixtures/config.invalid.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/__tests__/read_config_file.js (96%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/config.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/read_config_file.ts (97%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/config/schema.ts (95%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/README.md (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/container_logs.ts (96%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/container_running.ts (97%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts (99%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/docker_servers/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/failure_metadata.test.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/failure_metadata.ts (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/lifecycle.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/lifecycle_event.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/lifecycle_phase.test.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/lifecycle_phase.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/load_tracer.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/assignment_proxy.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js (99%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/load_test_files.js (96%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/colors.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/index.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/ms.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/reporter.js (99%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/symbols.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/reporter/write_epilogue.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/run_tests.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/setup_mocha.js (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/wrap_function.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/mocha/wrap_runnable_args.js (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/providers/async_instance.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/providers/index.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/providers/provider_collection.ts (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/providers/read_provider_spec.ts (100%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/providers/verbose_instance.ts (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/suite_tracker.test.ts (98%) rename packages/{kbn-test => osd-test}/src/functional_test_runner/lib/suite_tracker.ts (99%) diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/config.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/config.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/config.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/config.js diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/after_hook.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/after_hook.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/after_hook.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/after_hook.js diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/before_hook.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/before_hook.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/before_hook.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/before_hook.js diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/it.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/it.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/it.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/failure_hooks/tests/it.js diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/simple_project/config.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/simple_project/config.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/simple_project/config.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/simple_project/config.js diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js similarity index 96% rename from packages/kbn-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js rename to packages/osd-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js index 02e49fefc587..471b1adec85b 100644 --- a/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js +++ b/packages/osd-test/src/functional_test_runner/__tests__/fixtures/simple_project/tests.js @@ -17,7 +17,7 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; export default () => { describe('app one', () => { diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/integration/basic.js b/packages/osd-test/src/functional_test_runner/__tests__/integration/basic.js similarity index 95% rename from packages/kbn-test/src/functional_test_runner/__tests__/integration/basic.js rename to packages/osd-test/src/functional_test_runner/__tests__/integration/basic.js index a010d9f0b038..c9c257bed85d 100644 --- a/packages/kbn-test/src/functional_test_runner/__tests__/integration/basic.js +++ b/packages/osd-test/src/functional_test_runner/__tests__/integration/basic.js @@ -20,8 +20,8 @@ import { spawnSync } from 'child_process'; import { resolve } from 'path'; -import expect from '@kbn/expect'; -import { REPO_ROOT } from '@kbn/utils'; +import expect from '@osd/expect'; +import { REPO_ROOT } from '@osd/utils'; const SCRIPT = resolve(REPO_ROOT, 'scripts/functional_test_runner.js'); const BASIC_CONFIG = require.resolve('../fixtures/simple_project/config.js'); diff --git a/packages/kbn-test/src/functional_test_runner/__tests__/integration/failure_hooks.js b/packages/osd-test/src/functional_test_runner/__tests__/integration/failure_hooks.js similarity index 97% rename from packages/kbn-test/src/functional_test_runner/__tests__/integration/failure_hooks.js rename to packages/osd-test/src/functional_test_runner/__tests__/integration/failure_hooks.js index fa4ef88fd3e7..ab82ff75c26f 100644 --- a/packages/kbn-test/src/functional_test_runner/__tests__/integration/failure_hooks.js +++ b/packages/osd-test/src/functional_test_runner/__tests__/integration/failure_hooks.js @@ -21,8 +21,8 @@ import { spawnSync } from 'child_process'; import { resolve } from 'path'; import stripAnsi from 'strip-ansi'; -import expect from '@kbn/expect'; -import { REPO_ROOT } from '@kbn/utils'; +import expect from '@osd/expect'; +import { REPO_ROOT } from '@osd/utils'; const SCRIPT = resolve(REPO_ROOT, 'scripts/functional_test_runner.js'); const FAILURE_HOOKS_CONFIG = require.resolve('../fixtures/failure_hooks/config.js'); diff --git a/packages/kbn-test/src/functional_test_runner/cli.ts b/packages/osd-test/src/functional_test_runner/cli.ts similarity index 91% rename from packages/kbn-test/src/functional_test_runner/cli.ts rename to packages/osd-test/src/functional_test_runner/cli.ts index 8a2075b2e7bd..5f17d8d8e497 100644 --- a/packages/kbn-test/src/functional_test_runner/cli.ts +++ b/packages/osd-test/src/functional_test_runner/cli.ts @@ -20,7 +20,7 @@ import { resolve } from 'path'; import { inspect } from 'util'; -import { run, createFlagError, Flags } from '@kbn/dev-utils'; +import { run, createFlagError, Flags } from '@osd/dev-utils'; import exitHook from 'exit-hook'; import { FunctionalTestRunner } from './functional_test_runner'; @@ -28,10 +28,10 @@ import { FunctionalTestRunner } from './functional_test_runner'; const makeAbsolutePath = (v: string) => resolve(process.cwd(), v); const toArray = (v: string | string[]) => ([] as string[]).concat(v || []); const parseInstallDir = (flags: Flags) => { - const flag = flags['kibana-install-dir']; + const flag = flags['opensearch-dashboards-install-dir']; if (typeof flag !== 'string' && flag !== undefined) { - throw createFlagError('--kibana-install-dir must be a string or not defined'); + throw createFlagError('--opensearch-dashboards-install-dir must be a string or not defined'); } return flag ? makeAbsolutePath(flag) : undefined; @@ -49,7 +49,7 @@ export function runFtrCli() { grep: flags.grep || undefined, invert: flags.invert, }, - kbnTestServer: { + osdTestServer: { installDir: parseInstallDir(flags), }, suiteFiles: { @@ -116,7 +116,7 @@ export function runFtrCli() { 'exclude', 'include-tag', 'exclude-tag', - 'kibana-install-dir', + 'opensearch-dashboards-install-dir', ], boolean: ['bail', 'invert', 'test-stats', 'updateBaselines'], default: { @@ -133,7 +133,7 @@ export function runFtrCli() { --exclude-tag=tag a tag to be excluded, pass multiple times for multiple tags --test-stats print the number of tests (included and excluded) to STDERR --updateBaselines replace baseline screenshots with whatever is generated from the test - --kibana-install-dir directory where the Kibana install being tested resides + --opensearch-dashboards-install-dir directory where the OpenSearch Dashbaords install being tested resides `, }, } diff --git a/packages/kbn-test/src/functional_test_runner/fake_mocha_types.d.ts b/packages/osd-test/src/functional_test_runner/fake_mocha_types.d.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/fake_mocha_types.d.ts rename to packages/osd-test/src/functional_test_runner/fake_mocha_types.d.ts diff --git a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts b/packages/osd-test/src/functional_test_runner/functional_test_runner.ts similarity index 99% rename from packages/kbn-test/src/functional_test_runner/functional_test_runner.ts rename to packages/osd-test/src/functional_test_runner/functional_test_runner.ts index 24f5cdceac95..92edaf02664f 100644 --- a/packages/kbn-test/src/functional_test_runner/functional_test_runner.ts +++ b/packages/osd-test/src/functional_test_runner/functional_test_runner.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { Suite, Test } from './fake_mocha_types'; import { diff --git a/packages/kbn-test/src/functional_test_runner/index.ts b/packages/osd-test/src/functional_test_runner/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/index.ts rename to packages/osd-test/src/functional_test_runner/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.1.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.1.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.1.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.1.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.2.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.2.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.2.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.2.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.3.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.3.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.3.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.3.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.4.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.4.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.4.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.4.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.invalid.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.invalid.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.invalid.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/fixtures/config.invalid.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js similarity index 96% rename from packages/kbn-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js rename to packages/osd-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js index 8d02e7262409..4f11b7a52e27 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js +++ b/packages/osd-test/src/functional_test_runner/lib/config/__tests__/read_config_file.js @@ -17,9 +17,9 @@ * under the License. */ -import expect from '@kbn/expect'; +import expect from '@osd/expect'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { readConfigFile } from '../read_config_file'; import { Config } from '../config'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/config.ts b/packages/osd-test/src/functional_test_runner/lib/config/config.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/config.ts rename to packages/osd-test/src/functional_test_runner/lib/config/config.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/index.ts b/packages/osd-test/src/functional_test_runner/lib/config/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/config/index.ts rename to packages/osd-test/src/functional_test_runner/lib/config/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts b/packages/osd-test/src/functional_test_runner/lib/config/read_config_file.ts similarity index 97% rename from packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts rename to packages/osd-test/src/functional_test_runner/lib/config/read_config_file.ts index 2e40aeec4f43..6388df13838b 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/config/read_config_file.ts +++ b/packages/osd-test/src/functional_test_runner/lib/config/read_config_file.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { defaultsDeep } from 'lodash'; import { Config } from './config'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts similarity index 95% rename from packages/kbn-test/src/functional_test_runner/lib/config/schema.ts rename to packages/osd-test/src/functional_test_runner/lib/config/schema.ts index 6ed114d62e24..9c093ef6b475 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts +++ b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts @@ -105,8 +105,8 @@ export const schema = Joi.object() find: Joi.number().default(10000), try: Joi.number().default(120000), waitFor: Joi.number().default(20000), - esRequestTimeout: Joi.number().default(30000), - kibanaStabilize: Joi.number().default(15000), + opensearchRequestTimeout: Joi.number().default(30000), + opensearchDashboardsStabilize: Joi.number().default(15000), navigateStatusPageCheck: Joi.number().default(250), // Many of our tests use the `exists` functions to determine where the user is. For @@ -173,8 +173,8 @@ export const schema = Joi.object() servers: Joi.object() .keys({ - kibana: urlPartsSchema(), - elasticsearch: urlPartsSchema(), + opensearchDashboards: urlPartsSchema(), + opensearch: urlPartsSchema(), }) .default(), @@ -189,7 +189,7 @@ export const schema = Joi.object() }) .default(), - kbnTestServer: Joi.object() + osdTestServer: Joi.object() .keys({ buildArgs: Joi.array(), sourceArgs: Joi.array(), @@ -217,14 +217,14 @@ export const schema = Joi.object() // definition of apps that work with `common.navigateToApp()` apps: Joi.object().pattern(ID_PATTERN, appUrlPartsSchema()).default(), - // settings for the esArchiver module - esArchiver: Joi.object() + // settings for the opensearchArchiver module + opensearchArchiver: Joi.object() .keys({ directory: Joi.string().default(defaultRelativeToConfigPath('fixtures/es_archiver')), }) .default(), - // settings for the kibanaServer.uiSettings module + // settings for the opensearchDashboardsServer.uiSettings module uiSettings: Joi.object() .keys({ defaults: Joi.object().unknown(true), diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md b/packages/osd-test/src/functional_test_runner/lib/docker_servers/README.md similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/README.md index d75faf4c854a..1b132b378a2a 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/README.md +++ b/packages/osd-test/src/functional_test_runner/lib/docker_servers/README.md @@ -6,7 +6,7 @@ To configure docker servers in your FTR config add the `dockerServers` key to yo ```ts // import this helper to get TypeScript support for this section of the config -import { defineDockerServersConfig } from '@kbn/test'; +import { defineDockerServersConfig } from '@osd/test'; export default function () { return { diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts b/packages/osd-test/src/functional_test_runner/lib/docker_servers/container_logs.ts similarity index 96% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/container_logs.ts index f8e8137ce40a..58fe6be8e5a4 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts +++ b/packages/osd-test/src/functional_test_runner/lib/docker_servers/container_logs.ts @@ -20,7 +20,7 @@ import execa from 'execa'; import * as Rx from 'rxjs'; import { tap } from 'rxjs/operators'; -import { ToolingLog, observeLines } from '@kbn/dev-utils'; +import { ToolingLog, observeLines } from '@osd/dev-utils'; /** * Observe the logs for a container, reflecting the log lines diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts b/packages/osd-test/src/functional_test_runner/lib/docker_servers/container_running.ts similarity index 97% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/container_running.ts index 3e3247a6ae3b..27169cf4cb2d 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_running.ts +++ b/packages/osd-test/src/functional_test_runner/lib/docker_servers/container_running.ts @@ -19,7 +19,7 @@ import execa from 'execa'; import * as Rx from 'rxjs'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; /** * Create an observable that errors if a docker diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts b/packages/osd-test/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/define_docker_servers_config.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts b/packages/osd-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts similarity index 99% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts index e5bad88e5e7b..fb6f5f4a68fd 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts +++ b/packages/osd-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts @@ -21,7 +21,7 @@ import Url from 'url'; import execa from 'execa'; import * as Rx from 'rxjs'; import { filter, take, map } from 'rxjs/operators'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { Lifecycle } from '../lifecycle'; import { observeContainerRunning } from './container_running'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/index.ts b/packages/osd-test/src/functional_test_runner/lib/docker_servers/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/docker_servers/index.ts rename to packages/osd-test/src/functional_test_runner/lib/docker_servers/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts b/packages/osd-test/src/functional_test_runner/lib/failure_metadata.test.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/failure_metadata.test.ts rename to packages/osd-test/src/functional_test_runner/lib/failure_metadata.test.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts b/packages/osd-test/src/functional_test_runner/lib/failure_metadata.ts similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts rename to packages/osd-test/src/functional_test_runner/lib/failure_metadata.ts index e5c60f1d208b..d2378d40e93d 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/failure_metadata.ts +++ b/packages/osd-test/src/functional_test_runner/lib/failure_metadata.ts @@ -19,7 +19,7 @@ import Path from 'path'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { Lifecycle } from './lifecycle'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/index.ts b/packages/osd-test/src/functional_test_runner/lib/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/index.ts rename to packages/osd-test/src/functional_test_runner/lib/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts b/packages/osd-test/src/functional_test_runner/lib/lifecycle.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/lifecycle.ts rename to packages/osd-test/src/functional_test_runner/lib/lifecycle.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle_event.ts b/packages/osd-test/src/functional_test_runner/lib/lifecycle_event.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/lifecycle_event.ts rename to packages/osd-test/src/functional_test_runner/lib/lifecycle_event.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts b/packages/osd-test/src/functional_test_runner/lib/lifecycle_phase.test.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts rename to packages/osd-test/src/functional_test_runner/lib/lifecycle_phase.test.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.ts b/packages/osd-test/src/functional_test_runner/lib/lifecycle_phase.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.ts rename to packages/osd-test/src/functional_test_runner/lib/lifecycle_phase.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/load_tracer.ts b/packages/osd-test/src/functional_test_runner/lib/load_tracer.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/load_tracer.ts rename to packages/osd-test/src/functional_test_runner/lib/load_tracer.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/assignment_proxy.js b/packages/osd-test/src/functional_test_runner/lib/mocha/assignment_proxy.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/assignment_proxy.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/assignment_proxy.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js b/packages/osd-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js similarity index 99% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js index 92137a8c4f84..ea7ade67369c 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js +++ b/packages/osd-test/src/functional_test_runner/lib/mocha/decorate_mocha_ui.js @@ -17,7 +17,7 @@ * under the License. */ import { relative } from 'path'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { createAssignmentProxy } from './assignment_proxy'; import { wrapFunction } from './wrap_function'; import { wrapRunnableArgs } from './wrap_runnable_args'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js b/packages/osd-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js b/packages/osd-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/filter_suites_by_tags.test.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/index.ts b/packages/osd-test/src/functional_test_runner/lib/mocha/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/index.ts rename to packages/osd-test/src/functional_test_runner/lib/mocha/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/load_test_files.js b/packages/osd-test/src/functional_test_runner/lib/mocha/load_test_files.js similarity index 96% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/load_test_files.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/load_test_files.js index 5c23be636186..f629613ab38e 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/mocha/load_test_files.js +++ b/packages/osd-test/src/functional_test_runner/lib/mocha/load_test_files.js @@ -41,7 +41,7 @@ export const loadTestFiles = ({ mocha, log, lifecycle, providers, paths, updateB log.verbose('Loading test file %s', path); const testModule = require(path); // eslint-disable-line import/no-dynamic-require - const testProvider = testModule.__esModule ? testModule.default : testModule; + const testProvider = testModule.__opensearchModule ? testModule.default : testModule; runTestProvider(testProvider, path); // eslint-disable-line }); diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/colors.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/colors.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/colors.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/colors.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/index.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/index.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/index.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/index.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ms.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/ms.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/ms.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/ms.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/reporter.js similarity index 99% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/reporter.js index 9f89efddf49b..6d4c10b984e0 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/reporter.js +++ b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/reporter.js @@ -20,7 +20,7 @@ import { format } from 'util'; import Mocha from 'mocha'; -import { ToolingLogTextWriter } from '@kbn/dev-utils'; +import { ToolingLogTextWriter } from '@osd/dev-utils'; import moment from 'moment'; import { setupJUnitReportGeneration } from '../../../../../../../src/dev'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/symbols.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/symbols.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/symbols.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/symbols.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/write_epilogue.js b/packages/osd-test/src/functional_test_runner/lib/mocha/reporter/write_epilogue.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/reporter/write_epilogue.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/reporter/write_epilogue.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/run_tests.ts b/packages/osd-test/src/functional_test_runner/lib/mocha/run_tests.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/run_tests.ts rename to packages/osd-test/src/functional_test_runner/lib/mocha/run_tests.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js b/packages/osd-test/src/functional_test_runner/lib/mocha/setup_mocha.js similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/setup_mocha.js index 39eb69a15191..66195ac2e223 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js +++ b/packages/osd-test/src/functional_test_runner/lib/mocha/setup_mocha.js @@ -19,7 +19,7 @@ import Mocha from 'mocha'; import { relative } from 'path'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { loadTestFiles } from './load_test_files'; import { filterSuitesByTags } from './filter_suites_by_tags'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_function.js b/packages/osd-test/src/functional_test_runner/lib/mocha/wrap_function.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_function.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/wrap_function.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js b/packages/osd-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js rename to packages/osd-test/src/functional_test_runner/lib/mocha/wrap_runnable_args.js diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/async_instance.ts b/packages/osd-test/src/functional_test_runner/lib/providers/async_instance.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/providers/async_instance.ts rename to packages/osd-test/src/functional_test_runner/lib/providers/async_instance.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/index.ts b/packages/osd-test/src/functional_test_runner/lib/providers/index.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/providers/index.ts rename to packages/osd-test/src/functional_test_runner/lib/providers/index.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts b/packages/osd-test/src/functional_test_runner/lib/providers/provider_collection.ts similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts rename to packages/osd-test/src/functional_test_runner/lib/providers/provider_collection.ts index c58747e07dcf..70b34b296a11 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/providers/provider_collection.ts +++ b/packages/osd-test/src/functional_test_runner/lib/providers/provider_collection.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; import { loadTracer } from '../load_tracer'; import { createAsyncInstance, isAsyncInstance } from './async_instance'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/read_provider_spec.ts b/packages/osd-test/src/functional_test_runner/lib/providers/read_provider_spec.ts similarity index 100% rename from packages/kbn-test/src/functional_test_runner/lib/providers/read_provider_spec.ts rename to packages/osd-test/src/functional_test_runner/lib/providers/read_provider_spec.ts diff --git a/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts b/packages/osd-test/src/functional_test_runner/lib/providers/verbose_instance.ts similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts rename to packages/osd-test/src/functional_test_runner/lib/providers/verbose_instance.ts index 1967e98306d4..8207c75e941b 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/providers/verbose_instance.ts +++ b/packages/osd-test/src/functional_test_runner/lib/providers/verbose_instance.ts @@ -19,7 +19,7 @@ import { inspect } from 'util'; -import { ToolingLog } from '@kbn/dev-utils'; +import { ToolingLog } from '@osd/dev-utils'; function printArgs(args: any[]): string { return args diff --git a/packages/kbn-test/src/functional_test_runner/lib/suite_tracker.test.ts b/packages/osd-test/src/functional_test_runner/lib/suite_tracker.test.ts similarity index 98% rename from packages/kbn-test/src/functional_test_runner/lib/suite_tracker.test.ts rename to packages/osd-test/src/functional_test_runner/lib/suite_tracker.test.ts index 5350b2709843..3554df658a1e 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/suite_tracker.test.ts +++ b/packages/osd-test/src/functional_test_runner/lib/suite_tracker.test.ts @@ -21,11 +21,11 @@ import fs from 'fs'; import { join, resolve } from 'path'; jest.mock('fs'); -jest.mock('@kbn/utils', () => { +jest.mock('@osd/utils', () => { return { REPO_ROOT: '/dev/null/root' }; }); -import { REPO_ROOT } from '@kbn/dev-utils'; +import { REPO_ROOT } from '@osd/dev-utils'; import { Lifecycle } from './lifecycle'; import { SuiteTracker } from './suite_tracker'; diff --git a/packages/kbn-test/src/functional_test_runner/lib/suite_tracker.ts b/packages/osd-test/src/functional_test_runner/lib/suite_tracker.ts similarity index 99% rename from packages/kbn-test/src/functional_test_runner/lib/suite_tracker.ts rename to packages/osd-test/src/functional_test_runner/lib/suite_tracker.ts index 6cbd74467106..e6f9dc166f43 100644 --- a/packages/kbn-test/src/functional_test_runner/lib/suite_tracker.ts +++ b/packages/osd-test/src/functional_test_runner/lib/suite_tracker.ts @@ -19,7 +19,7 @@ import fs from 'fs'; import { dirname, relative, resolve } from 'path'; -import { REPO_ROOT } from '@kbn/utils'; +import { REPO_ROOT } from '@osd/utils'; import { Lifecycle } from './lifecycle'; From dc9e16808b5d47b565552d38e71989f0f8da47e4 Mon Sep 17 00:00:00 2001 From: Mihir Soni Date: Thu, 4 Mar 2021 20:53:11 +0000 Subject: [PATCH 2/2] [Rename] in-corporate review comments Signed-off-by: Mihir Soni --- .../osd-test/src/functional_test_runner/lib/config/schema.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/osd-test/src/functional_test_runner/lib/config/schema.ts b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts index 9c093ef6b475..64922dc5c258 100644 --- a/packages/osd-test/src/functional_test_runner/lib/config/schema.ts +++ b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts @@ -178,7 +178,7 @@ export const schema = Joi.object() }) .default(), - esTestCluster: Joi.object() + opensearchTestCluster: Joi.object() .keys({ license: Joi.string().default('oss'), from: Joi.string().default('snapshot'),