Remove previous FTR --exclude arg in favor of new tag-based include/e…

…xclude args

packages/kbn-test/src/functional_test_runner/cli.ts

@@ -49,15 +49,14 @@ export function runFtrCli() {
             installDir: parseInstallDir(flags),
           },
           suiteFiles: {
-            include: toArray(flags['include-file'] as string | string[]).map(makeAbsolutePath),
-            exclude: toArray(flags['exclude-file'] as string | string[]).map(makeAbsolutePath),
+            include: toArray(flags.include as string | string[]).map(makeAbsolutePath),
+            exclude: toArray(flags.exclude as string | string[]).map(makeAbsolutePath),
           },
           suiteTags: {
             include: toArray(flags['include-tag'] as string | string[]),
             exclude: toArray(flags['exclude-tag'] as string | string[]),
           },
           updateBaselines: flags.updateBaselines,
-          excludeTestFiles: flags.exclude || undefined,
         }
       );
 
@@ -111,9 +110,8 @@ export function runFtrCli() {
         string: [
           'config',
           'grep',
+          'include',
           'exclude',
-          'include-file',
-          'exclude-file',
           'include-tag',
           'exclude-tag',
           'kibana-install-dir',
@@ -128,9 +126,8 @@ export function runFtrCli() {
         --bail             stop tests after the first failure
         --grep <pattern>   pattern used to select which tests to run
         --invert           invert grep to exclude tests
-        --exclude=file     path to a test file that should not be loaded
-        --include-file=file  a test file to be included, pass multiple times for multiple files
-        --exclude-file=file  a test file to be excluded, pass multiple times for multiple files
+        --include=file     a test file to be included, pass multiple times for multiple files
+        --exclude=file     a test file to be excluded, pass multiple times for multiple files
         --include-tag=tag  a tag to be included, pass multiple times for multiple tags
         --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

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

@@ -64,10 +64,6 @@ export const schema = Joi.object()
     testFiles: Joi.array().items(Joi.string()),
     testRunner: Joi.func(),
 
-    excludeTestFiles: Joi.array()
-      .items(Joi.string())
-      .default([]),
-
     suiteFiles: Joi.object()
       .keys({
         include: Joi.array()

packages/kbn-test/src/functional_test_runner/lib/mocha/load_test_files.js

@@ -31,28 +31,12 @@ import { decorateMochaUi } from './decorate_mocha_ui';
  *  @param  {String} path
  *  @return {undefined} - mutates mocha, no return value
  */
-export const loadTestFiles = ({
-  mocha,
-  log,
-  lifecycle,
-  providers,
-  paths,
-  excludePaths,
-  updateBaselines,
-}) => {
-  const pendingExcludes = new Set(excludePaths.slice(0));
-
+export const loadTestFiles = ({ mocha, log, lifecycle, providers, paths, updateBaselines }) => {
   const innerLoadTestFile = path => {
     if (typeof path !== 'string' || !isAbsolute(path)) {
       throw new TypeError('loadTestFile() only accepts absolute paths');
     }
 
-    if (pendingExcludes.has(path)) {
-      pendingExcludes.delete(path);
-      log.warning('Skipping test file %s', path);
-      return;
-    }
-
     loadTracer(path, `testFile[${path}]`, () => {
       log.verbose('Loading test file %s', path);
 
@@ -94,13 +78,4 @@ export const loadTestFiles = ({
   };
 
   paths.forEach(innerLoadTestFile);
-
-  if (pendingExcludes.size) {
-    throw new Error(
-      `After loading all test files some exclude paths were not consumed:${[
-        '',
-        ...pendingExcludes,
-      ].join('\n  -')}`
-    );
-  }
 };

packages/kbn-test/src/functional_test_runner/lib/mocha/setup_mocha.js

@@ -52,7 +52,6 @@ export async function setupMocha(lifecycle, log, config, providers) {
     lifecycle,
     providers,
     paths: config.get('testFiles'),
-    excludePaths: config.get('excludeTestFiles'),
     updateBaselines: config.get('updateBaselines'),
   });
 

packages/kbn-test/src/functional_tests/cli/run_tests/args.js

@@ -46,11 +46,11 @@ const options = {
   updateBaselines: {
     desc: 'Replace baseline screenshots with whatever is generated from the test.',
   },
-  'include-file': {
+  include: {
     arg: '<file>',
     desc: 'Files that must included to be run, can be included multiple times.',
   },
-  'exclude-file': {
+  exclude: {
     arg: '<file>',
     desc: 'Files that must NOT be included to be run, can be included multiple times.',
   },
@@ -124,11 +124,11 @@ export function processOptions(userOptions, defaultConfigPaths) {
   }
 
   userOptions.suiteFiles = {
-    include: [].concat(userOptions['include-file'] || []),
-    exclude: [].concat(userOptions['exclude-file'] || []),
+    include: [].concat(userOptions.include || []),
+    exclude: [].concat(userOptions.exclude || []),
   };
-  delete userOptions['include-file'];
-  delete userOptions['exclude-file'];
+  delete userOptions.include;
+  delete userOptions.exclude;
 
   userOptions.suiteTags = {
     include: [].concat(userOptions['include-tag'] || []),