Skip to content

Commit 866b8dc

Browse files
kibanamachinejuliaElastic
kibanamachine
and
juliaElastic
authored
[9.1] [Fleet] enable skipped test (elastic#240759) (elastic#240936)
# Backport This will backport the following commits from `main` to `9.1`: - [[Fleet] enable skipped test (elastic#240759)](elastic#240759) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Julia Bardi","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-10-28T07:40:27Z","message":"[Fleet] enable skipped test (elastic#240759)\n\n## Summary\n\nCloses https://github.com/elastic/kibana/issues/238960\nCloses https://github.com/elastic/kibana/issues/214862","sha":"40d53ff1d99615edb34eec012b05924a20b8551b","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","backport:version","v9.3.0","v9.1.7","v9.2.1"],"title":"[Fleet] enable skipped test","number":240759,"url":"https://github.com/elastic/kibana/pull/240759","mergeCommit":{"message":"[Fleet] enable skipped test (elastic#240759)\n\n## Summary\n\nCloses https://github.com/elastic/kibana/issues/238960\nCloses https://github.com/elastic/kibana/issues/214862","sha":"40d53ff1d99615edb34eec012b05924a20b8551b"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","9.2"],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/240759","number":240759,"mergeCommit":{"message":"[Fleet] enable skipped test (elastic#240759)\n\n## Summary\n\nCloses https://github.com/elastic/kibana/issues/238960\nCloses https://github.com/elastic/kibana/issues/214862","sha":"40d53ff1d99615edb34eec012b05924a20b8551b"}},{"branch":"9.1","label":"v9.1.7","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.2","label":"v9.2.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: Julia Bardi <[email protected]>
1 parent f02cf85 commit 866b8dc

File tree

1 file changed

+1
-74
lines changed
  • x-pack/platform/test/fleet_api_integration/apis/package_policy

1 file changed

+1
-74
lines changed

‎x-pack/platform/test/fleet_api_integration/apis/package_policy/upgrade.ts‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,6 @@ export default function (providerContext: FtrProviderContext) {
120120
});
121121

122122
afterEach(async function () {
123-
await supertest
124-
.post(`/api/fleet/package_policies/delete`)
125-
.set('kbn-xsrf', 'xxxx')
126-
.send({ packagePolicyIds: [packagePolicyId] })
127-
.expect(200);
128-
129123
await supertest
130124
.post('/api/fleet/agent_policies/delete')
131125
.set('kbn-xsrf', 'xxxx')
@@ -157,8 +151,7 @@ export default function (providerContext: FtrProviderContext) {
157151
});
158152
});
159153

160-
// FLAKY: https://github.com/elastic/kibana/issues/214862
161-
describe.skip('upgrade', function () {
154+
describe('upgrade', function () {
162155
withTestPackage('package_policy_upgrade', '0.2.0-add-non-required-test-var');
163156
it('should respond with an error', async function () {
164157
// upgrade policy to 0.2.0
@@ -247,12 +240,6 @@ export default function (providerContext: FtrProviderContext) {
247240
});
248241

249242
afterEach(async function () {
250-
await supertest
251-
.post(`/api/fleet/package_policies/delete`)
252-
.set('kbn-xsrf', 'xxxx')
253-
.send({ packagePolicyIds: [packagePolicyId] })
254-
.expect(200);
255-
256243
await supertest
257244
.post('/api/fleet/agent_policies/delete')
258245
.set('kbn-xsrf', 'xxxx')
@@ -356,12 +343,6 @@ export default function (providerContext: FtrProviderContext) {
356343
});
357344

358345
afterEach(async function () {
359-
await supertest
360-
.post(`/api/fleet/package_policies/delete`)
361-
.set('kbn-xsrf', 'xxxx')
362-
.send({ packagePolicyIds: [packagePolicyId] })
363-
.expect(200);
364-
365346
await supertest
366347
.post('/api/fleet/agent_policies/delete')
367348
.set('kbn-xsrf', 'xxxx')
@@ -464,12 +445,6 @@ export default function (providerContext: FtrProviderContext) {
464445
});
465446

466447
afterEach(async function () {
467-
await supertest
468-
.post(`/api/fleet/package_policies/delete`)
469-
.set('kbn-xsrf', 'xxxx')
470-
.send({ packagePolicyIds: [packagePolicyId] })
471-
.expect(200);
472-
473448
await supertest
474449
.post('/api/fleet/agent_policies/delete')
475450
.set('kbn-xsrf', 'xxxx')
@@ -563,12 +538,6 @@ export default function (providerContext: FtrProviderContext) {
563538
});
564539

565540
afterEach(async function () {
566-
await supertest
567-
.post(`/api/fleet/package_policies/delete`)
568-
.set('kbn-xsrf', 'xxxx')
569-
.send({ packagePolicyIds: [packagePolicyId] })
570-
.expect(200);
571-
572541
await supertest
573542
.post('/api/fleet/agent_policies/delete')
574543
.set('kbn-xsrf', 'xxxx')
@@ -660,12 +629,6 @@ export default function (providerContext: FtrProviderContext) {
660629
});
661630

662631
afterEach(async function () {
663-
await supertest
664-
.post(`/api/fleet/package_policies/delete`)
665-
.set('kbn-xsrf', 'xxxx')
666-
.send({ packagePolicyIds: [packagePolicyId] })
667-
.expect(200);
668-
669632
await supertest
670633
.post('/api/fleet/agent_policies/delete')
671634
.set('kbn-xsrf', 'xxxx')
@@ -757,12 +720,6 @@ export default function (providerContext: FtrProviderContext) {
757720
});
758721

759722
afterEach(async function () {
760-
await supertest
761-
.post(`/api/fleet/package_policies/delete`)
762-
.set('kbn-xsrf', 'xxxx')
763-
.send({ packagePolicyIds: [packagePolicyId] })
764-
.expect(200);
765-
766723
await supertest
767724
.post('/api/fleet/agent_policies/delete')
768725
.set('kbn-xsrf', 'xxxx')
@@ -888,12 +845,6 @@ export default function (providerContext: FtrProviderContext) {
888845
});
889846

890847
afterEach(async function () {
891-
await supertest
892-
.post(`/api/fleet/package_policies/delete`)
893-
.set('kbn-xsrf', 'xxxx')
894-
.send({ packagePolicyIds: [packagePolicyId] })
895-
.expect(200);
896-
897848
await supertest
898849
.post('/api/fleet/agent_policies/delete')
899850
.set('kbn-xsrf', 'xxxx')
@@ -982,12 +933,6 @@ export default function (providerContext: FtrProviderContext) {
982933
});
983934

984935
afterEach(async function () {
985-
await supertest
986-
.post(`/api/fleet/package_policies/delete`)
987-
.set('kbn-xsrf', 'xxxx')
988-
.send({ packagePolicyIds: [packagePolicyId] })
989-
.expect(200);
990-
991936
await supertest
992937
.post('/api/fleet/agent_policies/delete')
993938
.set('kbn-xsrf', 'xxxx')
@@ -1122,12 +1067,6 @@ export default function (providerContext: FtrProviderContext) {
11221067
});
11231068

11241069
afterEach(async function () {
1125-
await supertest
1126-
.post(`/api/fleet/package_policies/delete`)
1127-
.set('kbn-xsrf', 'xxxx')
1128-
.send({ packagePolicyIds: [packagePolicyId] })
1129-
.expect(200);
1130-
11311070
await supertest
11321071
.post('/api/fleet/agent_policies/delete')
11331072
.set('kbn-xsrf', 'xxxx')
@@ -1209,12 +1148,6 @@ export default function (providerContext: FtrProviderContext) {
12091148
});
12101149

12111150
afterEach(async function () {
1212-
await supertest
1213-
.post(`/api/fleet/package_policies/delete`)
1214-
.set('kbn-xsrf', 'xxxx')
1215-
.send({ packagePolicyIds: [packagePolicyId] })
1216-
.expect(200);
1217-
12181151
await supertest
12191152
.post('/api/fleet/agent_policies/delete')
12201153
.set('kbn-xsrf', 'xxxx')
@@ -1320,12 +1253,6 @@ export default function (providerContext: FtrProviderContext) {
13201253
});
13211254

13221255
afterEach(async function () {
1323-
await supertest
1324-
.post(`/api/fleet/package_policies/delete`)
1325-
.set('kbn-xsrf', 'xxxx')
1326-
.send({ packagePolicyIds })
1327-
.expect(200);
1328-
13291256
await supertest
13301257
.post('/api/fleet/agent_policies/delete')
13311258
.set('kbn-xsrf', 'xxxx')

0 commit comments

Comments
 (0)