Skip to content

Commit 7120827

Browse files
authored
[Ingest Manager] add skipIfNoDockerRegistry to package_install_complete test (#80779) (#80817)
* fix missing skipIfNoDockerRegistry * skip afterEach if server doesn't exist
1 parent 0288a85 commit 7120827

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export default function (providerContext: FtrProviderContext) {
1212
const { getService } = providerContext;
1313
const supertest = getService('supertest');
1414
const es = getService('es');
15+
const dockerServers = getService('dockerServers');
16+
const server = dockerServers.get('registry');
1517
const pkgName = 'datastreams';
1618
const pkgVersion = '0.1.0';
1719
const pkgUpdateVersion = '0.2.0';
@@ -63,6 +65,7 @@ export default function (providerContext: FtrProviderContext) {
6365
});
6466
});
6567
afterEach(async () => {
68+
if (!server) return;
6669
await es.transport.request({
6770
method: 'DELETE',
6871
path: `/_data_stream/${logsTemplateName}-default`,

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

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
PACKAGES_SAVED_OBJECT_TYPE,
1010
MAX_TIME_COMPLETE_INSTALL,
1111
} from '../../../../plugins/ingest_manager/common';
12+
import { skipIfNoDockerRegistry } from '../../helpers';
1213
import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
1314

1415
export default function (providerContext: FtrProviderContext) {
@@ -19,20 +20,22 @@ export default function (providerContext: FtrProviderContext) {
1920
const pkgVersion = '0.1.0';
2021
const pkgUpdateVersion = '0.2.0';
2122
describe('setup checks packages completed install', async () => {
23+
skipIfNoDockerRegistry(providerContext);
2224
describe('package install', async () => {
2325
before(async () => {
2426
await supertest
2527
.post(`/api/fleet/epm/packages/${pkgName}-0.1.0`)
2628
.set('kbn-xsrf', 'xxxx')
27-
.send({ force: true });
29+
.send({ force: true })
30+
.expect(200);
2831
});
2932
it('should have not reinstalled if package install completed', async function () {
3033
const packageBeforeSetup = await kibanaServer.savedObjects.get({
3134
type: 'epm-packages',
3235
id: pkgName,
3336
});
3437
const installStartedAtBeforeSetup = packageBeforeSetup.attributes.install_started_at;
35-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
38+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
3639
const packageAfterSetup = await kibanaServer.savedObjects.get({
3740
type: PACKAGES_SAVED_OBJECT_TYPE,
3841
id: pkgName,
@@ -51,7 +54,7 @@ export default function (providerContext: FtrProviderContext) {
5154
install_started_at: previousInstallDate,
5255
},
5356
});
54-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
57+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
5558
const packageAfterSetup = await kibanaServer.savedObjects.get({
5659
type: PACKAGES_SAVED_OBJECT_TYPE,
5760
id: pkgName,
@@ -71,7 +74,7 @@ export default function (providerContext: FtrProviderContext) {
7174
install_started_at: previousInstallDate,
7275
},
7376
});
74-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
77+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
7578
const packageAfterSetup = await kibanaServer.savedObjects.get({
7679
type: PACKAGES_SAVED_OBJECT_TYPE,
7780
id: pkgName,
@@ -83,27 +86,30 @@ export default function (providerContext: FtrProviderContext) {
8386
after(async () => {
8487
await supertest
8588
.delete(`/api/fleet/epm/packages/multiple_versions-0.1.0`)
86-
.set('kbn-xsrf', 'xxxx');
89+
.set('kbn-xsrf', 'xxxx')
90+
.expect(200);
8791
});
8892
});
8993
describe('package update', async () => {
9094
before(async () => {
9195
await supertest
9296
.post(`/api/fleet/epm/packages/${pkgName}-0.1.0`)
9397
.set('kbn-xsrf', 'xxxx')
94-
.send({ force: true });
98+
.send({ force: true })
99+
.expect(200);
95100
await supertest
96101
.post(`/api/fleet/epm/packages/${pkgName}-0.2.0`)
97102
.set('kbn-xsrf', 'xxxx')
98-
.send({ force: true });
103+
.send({ force: true })
104+
.expect(200);
99105
});
100106
it('should have not reinstalled if package update completed', async function () {
101107
const packageBeforeSetup = await kibanaServer.savedObjects.get({
102108
type: 'epm-packages',
103109
id: pkgName,
104110
});
105111
const installStartedAtBeforeSetup = packageBeforeSetup.attributes.install_started_at;
106-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
112+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
107113
const packageAfterSetup = await kibanaServer.savedObjects.get({
108114
type: PACKAGES_SAVED_OBJECT_TYPE,
109115
id: pkgName,
@@ -124,7 +130,7 @@ export default function (providerContext: FtrProviderContext) {
124130
install_version: pkgUpdateVersion, // set version back
125131
},
126132
});
127-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
133+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
128134
const packageAfterSetup = await kibanaServer.savedObjects.get({
129135
type: PACKAGES_SAVED_OBJECT_TYPE,
130136
id: pkgName,
@@ -147,7 +153,7 @@ export default function (providerContext: FtrProviderContext) {
147153
version: pkgVersion, // set version back
148154
},
149155
});
150-
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
156+
await supertest.post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').expect(200);
151157
const packageAfterSetup = await kibanaServer.savedObjects.get({
152158
type: PACKAGES_SAVED_OBJECT_TYPE,
153159
id: pkgName,
@@ -160,7 +166,8 @@ export default function (providerContext: FtrProviderContext) {
160166
after(async () => {
161167
await supertest
162168
.delete(`/api/fleet/epm/packages/multiple_versions-0.1.0`)
163-
.set('kbn-xsrf', 'xxxx');
169+
.set('kbn-xsrf', 'xxxx')
170+
.expect(200);
164171
});
165172
});
166173
});

0 commit comments

Comments
 (0)