Skip to content

Commit 8f7f736

Browse files
committed
allow api integration test + comment functional test
1 parent 1c21b76 commit 8f7f736

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

x-pack/scripts/functional_tests.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66

77
const alwaysImportedTests = [
88
require.resolve('../test/functional/config.js'),
9-
require.resolve('../test/functional_endpoint_ingest_failure/config.ts'),
10-
require.resolve('../test/functional_endpoint/config.ts'),
119
require.resolve('../test/functional_with_es_ssl/config.ts'),
1210
require.resolve('../test/functional/config_security_basic.ts'),
1311
require.resolve('../test/functional/config_security_trial.ts'),
14-
require.resolve('../test/plugin_functional/config.ts'),
1512
];
1613
const onlyNotInCoverageTests = [
1714
require.resolve('../test/reporting/configs/chromium_api.js'),

x-pack/test/api_integration/config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ export async function getApiIntegrationConfig({ readConfigFile }) {
2626
...xPackFunctionalTestsConfig.get('kbnTestServer.serverArgs'),
2727
'--xpack.security.session.idleTimeout=3600000', // 1 hour
2828
'--optimize.enabled=false',
29-
'--xpack.endpoint.enabled=true',
3029
'--telemetry.optIn=true',
31-
'--xpack.endpoint.enabled=true',
3230
'--xpack.ingestManager.enabled=true',
33-
'--xpack.endpoint.alertResultListDefaultDateRange.from=2018-01-10T00:00:00.000Z',
31+
'--xpack.siem.alertResultListDefaultDateRange.from=2018-01-10T00:00:00.000Z',
3432
],
3533
},
3634
esTestCluster: {

x-pack/test/functional_endpoint/apps/endpoint/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ export default function({ loadTestFile }: FtrProviderContext) {
99
describe('endpoint', function() {
1010
this.tags('ciGroup7');
1111

12-
// loadTestFile(require.resolve('./feature_controls'));
13-
// loadTestFile(require.resolve('./landing_page'));
14-
// loadTestFile(require.resolve('./header_nav'));
15-
// loadTestFile(require.resolve('./host_list'));
16-
// loadTestFile(require.resolve('./policy_list'));
17-
// loadTestFile(require.resolve('./alerts'));
18-
// loadTestFile(require.resolve('./resolver'));
12+
loadTestFile(require.resolve('./feature_controls'));
13+
loadTestFile(require.resolve('./landing_page'));
14+
loadTestFile(require.resolve('./header_nav'));
15+
loadTestFile(require.resolve('./host_list'));
16+
loadTestFile(require.resolve('./policy_list'));
17+
loadTestFile(require.resolve('./alerts'));
18+
loadTestFile(require.resolve('./resolver'));
1919
});
2020
}

x-pack/test/functional_endpoint/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
3030
...xpackFunctionalConfig.get('kbnTestServer'),
3131
serverArgs: [
3232
...xpackFunctionalConfig.get('kbnTestServer.serverArgs'),
33-
'--xpack.endpoint.enabled=true',
3433
'--xpack.ingestManager.enabled=true',
3534
],
3635
},

x-pack/test/plugin_functional/config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
4242
...plugins.map(pluginDir => `--plugin-path=${resolve(__dirname, 'plugins', pluginDir)}`),
4343
// Required to load new platform plugins via `--plugin-path` flag.
4444
'--env.name=development',
45-
'--xpack.endpoint.enabled=true',
4645
],
4746
},
4847
uiSettings: xpackFunctionalConfig.get('uiSettings'),

0 commit comments

Comments
 (0)