elastic · spalger · Nov 17, 2018 · Nov 16, 2018
diff --git a/packages/kbn-dev-utils/index.d.ts b/packages/kbn-dev-utils/index.d.ts
@@ -18,3 +18,4 @@
  */
 
 export * from './src/tooling_log';
+export * from './src/serializers';
diff --git a/packages/kbn-dev-utils/src/index.js b/packages/kbn-dev-utils/src/index.js
@@ -19,3 +19,4 @@
 
 export { withProcRunner } from './proc_runner';
 export { ToolingLog, ToolingLogTextWriter, pickLevelFromFlags } from './tooling_log';
+export { createAbsolutePathSerializer } from './serializers';
diff --git a/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.d.ts b/packages/kbn-dev-utils/src/serializers/absolute_path_serializer.d.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function createAbsolutePathSerializer(
+  rootPath: string
+): { print(...args: any[]): string; test(value: any): boolean };
diff --git a/...-test/src/functional_tests/lib/run_ftr.js → ...c/serializers/absolute_path_serializer.js b/...-test/src/functional_tests/lib/run_ftr.js → ...c/serializers/absolute_path_serializer.js
@@ -17,30 +17,9 @@
  * under the License.
  */
 
-import { createFunctionalTestRunner } from '../../../../../src/functional_test_runner';
-import { CliError } from './run_cli';
-
-export async function runFtr({
-  configPath,
-  options: { log, bail, grep, updateBaselines, suiteTags },
-}) {
-  const ftr = createFunctionalTestRunner({
-    log,
-    configFile: configPath,
-    configOverrides: {
-      mochaOpts: {
-        bail: !!bail,
-        grep,
-      },
-      updateBaselines,
-      suiteTags,
-    },
-  });
-
-  const failureCount = await ftr.run();
-  if (failureCount > 0) {
-    throw new CliError(
-      `${failureCount} functional test ${failureCount === 1 ? 'failure' : 'failures'}`
-    );
-  }
+export function createAbsolutePathSerializer(rootPath) {
+  return {
+    print: value => value.replace(rootPath, '<absolute path>').replace(/\\/g, '/'),
+    test: value => typeof value === 'string' && value.startsWith(rootPath),
+  };
 }
diff --git a/packages/kbn-dev-utils/src/serializers/index.d.ts b/packages/kbn-dev-utils/src/serializers/index.d.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { createAbsolutePathSerializer } from './absolute_path_serializer';
diff --git a/packages/kbn-dev-utils/src/serializers/index.js b/packages/kbn-dev-utils/src/serializers/index.js
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { createAbsolutePathSerializer } from './absolute_path_serializer';
diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap
@@ -18,6 +18,7 @@ Options:
   --updateBaselines              Replace baseline screenshots with whatever is generated from the test. 
   --include-tag <tag>            Tags that suites must include to be run, can be included multiple times. 
   --exclude-tag <tag>            Tags that suites must NOT include to be run, can be included multiple times. 
+  --assert-none-excluded         Exit with 1/0 based on if any test is excluded with the current set of tags. 
   --verbose                      Log everything. 
   --debug                        Run in debug mode. 
   --quiet                        Only log errors. 
@@ -26,8 +27,9 @@ Options:
 
 exports[`process options for run tests CLI accepts boolean value for updateBaselines 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -41,8 +43,9 @@ Object {
 
 exports[`process options for run tests CLI accepts debug option 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "debug": true,
@@ -56,9 +59,10 @@ Object {
 
 exports[`process options for run tests CLI accepts empty config value if default passed 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "config": "",
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -74,8 +78,9 @@ Object {
   "_": Object {
     "server.foo": "bar",
   },
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": Object {
@@ -90,8 +95,9 @@ Object {
 
 exports[`process options for run tests CLI accepts quiet option 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -105,8 +111,9 @@ Object {
 
 exports[`process options for run tests CLI accepts silent option 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -120,8 +127,9 @@ Object {
 
 exports[`process options for run tests CLI accepts source value for esFrom 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "esFrom": "source",
@@ -135,8 +143,9 @@ Object {
 
 exports[`process options for run tests CLI accepts string value for kibana-install-dir 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -150,8 +159,9 @@ Object {
 
 exports[`process options for run tests CLI accepts value for grep 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,
@@ -165,8 +175,9 @@ Object {
 
 exports[`process options for run tests CLI accepts verbose option 1`] = `
 Object {
+  "assertNoneExcluded": false,
   "configs": Array [
-    "foo",
+    <absolute path>/foo,
   ],
   "createLogger": [Function],
   "extraKbnOpts": undefined,

diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap
@@ -18,6 +18,7 @@ Options:
   --updateBaselines              Replace baseline screenshots with whatever is generated from the test. 
   --include-tag <tag>            Tags that suites must include to be run, can be included multiple times. 
   --exclude-tag <tag>            Tags that suites must NOT include to be run, can be included multiple times. 
+  --assert-none-excluded         Exit with 1/0 based on if any test is excluded with the current set of tags. 
   --verbose                      Log everything. 
   --debug                        Run in debug mode. 
   --quiet                        Only log errors. 

diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { resolve } from 'path';
+
 import dedent from 'dedent';
 import { ToolingLog, pickLevelFromFlags } from '@kbn/dev-utils';
 
@@ -52,6 +54,9 @@ const options = {
     arg: '<tag>',
     desc: 'Tags that suites must NOT include to be run, can be included multiple times.',
   },
+  'assert-none-excluded': {
+    desc: 'Exit with 1/0 based on if any test is excluded with the current set of tags.',
+  },
   verbose: { desc: 'Log everything.' },
   debug: { desc: 'Run in debug mode.' },
   quiet: { desc: 'Only log errors.' },
@@ -113,6 +118,9 @@ export function processOptions(userOptions, defaultConfigPaths) {
   delete userOptions['include-tag'];
   delete userOptions['exclude-tag'];
 
+  userOptions.assertNoneExcluded = !!userOptions['assert-none-excluded'];
+  delete userOptions['assert-none-excluded'];
+
   function createLogger() {
     return new ToolingLog({
       level: pickLevelFromFlags(userOptions),
@@ -122,7 +130,7 @@ export function processOptions(userOptions, defaultConfigPaths) {
 
   return {
     ...userOptions,
-    configs,
+    configs: configs.map(c => resolve(c)),
     createLogger,
     extraKbnOpts: userOptions._,
   };

diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.test.js
@@ -18,6 +18,9 @@
  */
 
 import { displayHelp, processOptions } from './args';
+import { createAbsolutePathSerializer } from '@kbn/dev-utils';
+
+expect.addSnapshotSerializer(createAbsolutePathSerializer(process.cwd()));
 
 describe('display help for run tests CLI', () => {
   it('displays as expected', () => {

diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/cli.test.js b/packages/kbn-test/src/functional_tests/cli/run_tests/cli.test.js
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { Writable } from 'stream';
+
 import { runTestsCli } from './cli';
 import { checkMockConsoleLogSnapshot } from '../../test_helpers';
 
@@ -36,7 +38,7 @@ describe('run tests CLI', () => {
     const processMock = {
       exit: exitMock,
       argv: argvMock,
-      stdout: { on: jest.fn(), once: jest.fn(), emit: jest.fn() },
+      stdout: new Writable(),
       cwd: jest.fn(),
     };
 

diff --git a/packages/kbn-test/src/functional_tests/cli/start_servers/__snapshots__/args.test.js.snap b/packages/kbn-test/src/functional_tests/cli/start_servers/__snapshots__/args.test.js.snap
@@ -21,9 +21,7 @@ Options:
 
 exports[`process options for start servers CLI accepts debug option 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "debug": true,
   "esFrom": "snapshot",
@@ -33,9 +31,7 @@ Object {
 
 exports[`process options for start servers CLI accepts empty config value if default passed 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": undefined,
@@ -47,9 +43,7 @@ Object {
   "_": Object {
     "server.foo": "bar",
   },
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": Object {
@@ -60,9 +54,7 @@ Object {
 
 exports[`process options for start servers CLI accepts quiet option 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": undefined,
@@ -72,9 +64,7 @@ Object {
 
 exports[`process options for start servers CLI accepts silent option 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": undefined,
@@ -84,9 +74,7 @@ Object {
 
 exports[`process options for start servers CLI accepts source value for esFrom 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "source",
   "extraKbnOpts": undefined,
@@ -95,9 +83,7 @@ Object {
 
 exports[`process options for start servers CLI accepts string value for kibana-install-dir 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": undefined,
@@ -107,9 +93,7 @@ Object {
 
 exports[`process options for start servers CLI accepts verbose option 1`] = `
 Object {
-  "config": Array [
-    "foo",
-  ],
+  "config": <absolute path>/foo,
   "createLogger": [Function],
   "esFrom": "snapshot",
   "extraKbnOpts": undefined,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@
		*/

		export * from './src/tooling_log';
		export * from './src/serializers';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@

		export { withProcRunner } from './proc_runner';
		export { ToolingLog, ToolingLogTextWriter, pickLevelFromFlags } from './tooling_log';
		export { createAbsolutePathSerializer } from './serializers';