Skip to content

Commit 2377d12

Browse files
authored
[SECURITY_SOLUTION] unskip tests after fixing Kibana and package (#78954)
1 parent 27039e5 commit 2377d12

File tree

8 files changed

+16
-22
lines changed

8 files changed

+16
-22
lines changed

x-pack/test/functional/es_archives/endpoint/metadata/destination_index/data.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": "doc",
33
"value": {
44
"id": "M92ScEJT9M9QusfIi3hpEb0AAAAAAAAA",
5-
"index": "metrics-endpoint.metadata_current-default",
5+
"index": "metrics-endpoint.metadata_current_default",
66
"source": {
77
"HostDetails": {
88
"@timestamp": 1579881969541,
@@ -75,7 +75,7 @@
7575
"type": "doc",
7676
"value": {
7777
"id": "OU3RgCJaNnR90byeDEHutp8AAAAAAAAA",
78-
"index": "metrics-endpoint.metadata_current-default",
78+
"index": "metrics-endpoint.metadata_current_default",
7979
"source": {
8080
"HostDetails": {
8181
"@timestamp": 1579881969541,
@@ -151,7 +151,7 @@
151151
"type": "doc",
152152
"value": {
153153
"id": "YjqDCEuI6JmLeLOSyZx_NhMAAAAAAAAA",
154-
"index": "metrics-endpoint.metadata_current-default",
154+
"index": "metrics-endpoint.metadata_current_default",
155155
"source": {
156156
"HostDetails": {
157157
"@timestamp": 1579881969541,

x-pack/test/ingest_manager_api_integration/apis/epm/install_remove_assets.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ export default function (providerContext: FtrProviderContext) {
2929
.send({ force: true });
3030
};
3131

32-
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/72102
33-
describe.skip('installs and uninstalls all assets', async () => {
32+
describe('installs and uninstalls all assets', async () => {
3433
describe('installs all assets when installing a package for the first time', async () => {
3534
skipIfNoDockerRegistry(providerContext);
3635
before(async () => {
@@ -88,7 +87,7 @@ export default function (providerContext: FtrProviderContext) {
8887
it('should have installed the transform components', async function () {
8988
const res = await es.transport.request({
9089
method: 'GET',
91-
path: `/_transform/${pkgName}-test-default-${pkgVersion}`,
90+
path: `/_transform/${pkgName}.test-default-${pkgVersion}`,
9291
});
9392
expect(res.statusCode).equal(200);
9493
});
@@ -170,7 +169,7 @@ export default function (providerContext: FtrProviderContext) {
170169
type: 'index_template',
171170
},
172171
{
173-
id: 'logs-all_assets.test_logs-default-0.1.0',
172+
id: 'all_assets.test-default-0.1.0',
174173
type: 'transform',
175174
},
176175
],

x-pack/test/ingest_manager_api_integration/apis/epm/update_assets.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ export default function (providerContext: FtrProviderContext) {
3232
.send({ force: true });
3333
};
3434

35-
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/72102
36-
describe.skip('updates all assets when updating a package to a different version', async () => {
35+
describe('updates all assets when updating a package to a different version', async () => {
3736
skipIfNoDockerRegistry(providerContext);
3837
before(async () => {
3938
await installPackage(pkgKey);

x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/elasticsearch/transform/test/default.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"index": "logs-all_assets.test_log-default*"
44
},
55
"dest": {
6-
"index": "logs-all_assets.test_log_current-default"
6+
"index": "logs-all_assets.test_log_current_default"
77
},
88
"pivot": {
99
"group_by": {

x-pack/test/ingest_manager_api_integration/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { defineDockerServersConfig } from '@kbn/test';
1212
// Docker image to use for Ingest Manager API integration tests.
1313
// This hash comes from the commit hash here: https://github.com/elastic/package-storage/commit
1414
export const dockerImage =
15-
'docker.elastic.co/package-registry/distribution:5e0e12ce1bc2cb0c2f67f2e07d11b9a6043bcf25';
15+
'docker.elastic.co/package-registry/distribution:518a65a993ab7e9c77b1d8d20cd6f847921d04ec';
1616

1717
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
1818
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));

x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
6464
],
6565
];
6666

67-
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/72102
68-
describe.skip('endpoint list', function () {
67+
describe('endpoint list', function () {
6968
this.tags('ciGroup7');
7069
const sleep = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms));
7170

@@ -85,17 +84,16 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
8584
});
8685

8786
it('finds data after load and polling', async () => {
88-
await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
89-
await pageObjects.endpoint.waitForTableToHaveData('endpointListTable', 100000);
87+
await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
88+
await pageObjects.endpoint.waitForTableToHaveData('endpointListTable', 1100);
9089
const tableData = await pageObjects.endpointPageUtils.tableData('endpointListTable');
9190
expect(tableData).to.eql(expectedData);
9291
});
9392
});
9493

9594
describe('when there is data,', () => {
9695
before(async () => {
97-
await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
98-
await sleep(100000);
96+
await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
9997
await pageObjects.endpoint.navigateToEndpointList();
10098
});
10199
after(async () => {
@@ -212,7 +210,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
212210

213211
describe('displays the correct table data for the kql queries', () => {
214212
before(async () => {
215-
await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
213+
await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
216214
await pageObjects.endpoint.navigateToEndpointList();
217215
});
218216
after(async () => {

x-pack/test/security_solution_endpoint_api_int/apis/artifacts/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ export default function (providerContext: FtrProviderContext) {
1818
const supertestWithoutAuth = getSupertestWithoutAuth(providerContext);
1919
let agentAccessAPIKey: string;
2020

21-
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/72102
22-
describe.skip('artifact download', () => {
21+
describe('artifact download', () => {
2322
before(async () => {
2423
await esArchiver.load('endpoint/artifacts/api_feature', { useCreate: true });
2524

x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
2222
const esArchiver = getService('esArchiver');
2323
const supertest = getService('supertest');
2424

25-
// FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/72102
26-
describe.skip('test metadata api', () => {
25+
describe('test metadata api', () => {
2726
describe(`POST ${METADATA_REQUEST_ROUTE} when index is empty`, () => {
2827
it('metadata api should return empty result when index is empty', async () => {
2928
await deleteMetadataStream(getService);

0 commit comments

Comments
 (0)