-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move status test to separate FTR config
- Loading branch information
Showing
18 changed files
with
99 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 2 additions & 4 deletions
6
...tform/plugins/core_plugin_a/tsconfig.json → ...res__/plugins/core_plugin_a/tsconfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,16 @@ | ||
{ | ||
"extends": "../../../../../../tsconfig.base.json", | ||
"extends": "../../../../../tsconfig.base.json", | ||
"compilerOptions": { | ||
"outDir": "./target", | ||
"skipLibCheck": true | ||
}, | ||
"include": [ | ||
"index.ts", | ||
"public/**/*.ts", | ||
"public/**/*.tsx", | ||
"server/**/*.ts", | ||
"../../../../../../typings/**/*", | ||
], | ||
"exclude": [], | ||
"references": [ | ||
{ "path": "../../../../../../src/core/tsconfig.json" } | ||
{ "path": "../../../../../src/core/tsconfig.json" } | ||
] | ||
} |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
test/server_integration/__fixtures__/plugins/core_plugin_b/tsconfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"extends": "../../../../../tsconfig.base.json", | ||
"compilerOptions": { | ||
"outDir": "./target", | ||
"skipLibCheck": true | ||
}, | ||
"include": [ | ||
"index.ts", | ||
"server/**/*.ts", | ||
"../../../../../typings/**/*", | ||
], | ||
"exclude": [], | ||
"references": [ | ||
{ "path": "../../../../../src/core/tsconfig.json" } | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
import fs from 'fs'; | ||
import path from 'path'; | ||
import { FtrConfigProviderContext } from '@kbn/test'; | ||
|
||
/* | ||
* These tests exist in a separate configuration because: | ||
* 1) It must run as the first test after Kibana launches to clear the unavailable status. A separate config makes this | ||
* easier to manage and prevent from breaking. | ||
* 2) The other server_integration tests run against a built distributable, however the FTR does not support building | ||
* and installing plugins against built Kibana. This test must be run against source only in order to build the | ||
* fixture plugins | ||
*/ | ||
// eslint-disable-next-line import/no-default-export | ||
export default async function ({ readConfigFile }: FtrConfigProviderContext) { | ||
const httpConfig = await readConfigFile(require.resolve('../../config')); | ||
|
||
// Find all folders in __fixtures__/plugins since we treat all them as plugin folder | ||
const allFiles = fs.readdirSync(path.resolve(__dirname, '../../__fixtures__/plugins')); | ||
const plugins = allFiles.filter((file) => | ||
fs.statSync(path.resolve(__dirname, 'plugins', file)).isDirectory() | ||
); | ||
|
||
return { | ||
testFiles: [ | ||
// Status test should be first to resolve manually created "unavailable" plugin | ||
require.resolve('./status'), | ||
], | ||
services: httpConfig.get('services'), | ||
servers: httpConfig.get('servers'), | ||
junit: { | ||
reportName: 'Kibana Platform Status Integration Tests', | ||
}, | ||
esTestCluster: httpConfig.get('esTestCluster'), | ||
kbnTestServer: { | ||
...httpConfig.get('kbnTestServer'), | ||
serverArgs: [ | ||
...httpConfig.get('kbnTestServer.serverArgs'), | ||
...plugins.map( | ||
(pluginDir) => `--plugin-path=${path.resolve(__dirname, 'plugins', pluginDir)}` | ||
), | ||
], | ||
runOptions: { | ||
...httpConfig.get('kbnTestServer.runOptions'), | ||
// Don't wait for Kibana to be completely ready so that we can test the status timeouts | ||
wait: /\[Kibana\]\[http\] http server running/, | ||
}, | ||
}, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
test/server_integration/http/platform/plugins/core_plugin_b/tsconfig.json
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters