Skip to content

Commit 31cb622

Browse files
authored
[7.x] Re-enable session lifespan, idle timeout api integration tests and use unique names for the security test reports. (#77859)
1 parent 5bcc433 commit 31cb622

File tree

10 files changed

+12
-18
lines changed

10 files changed

+12
-18
lines changed

x-pack/test/api_integration/config_security_basic.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default async function (context: FtrConfigProviderContext) {
1919
'xpack.security.authc.api_key.enabled=true',
2020
];
2121
config.testFiles = [require.resolve('./apis/security/security_basic')];
22+
config.junit.reportName = 'X-Pack API Integration Tests (Security Basic)';
2223
return config;
2324
});
2425
}

x-pack/test/api_integration/config_security_trial.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { default as createTestConfig } from './config';
1212
export default async function (context: FtrConfigProviderContext) {
1313
return createTestConfig(context).then((config) => {
1414
config.testFiles = [require.resolve('./apis/security/security_trial')];
15+
config.junit.reportName = 'X-Pack API Integration Tests (Security Trial)';
1516
return config;
1617
});
1718
}

x-pack/test/functional/config_security_basic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
7070
},
7171

7272
junit: {
73-
reportName: 'Chrome X-Pack UI Functional Tests',
73+
reportName: 'Chrome X-Pack UI Functional Tests (Security Basic)',
7474
},
7575
};
7676
}

x-pack/test/security_api_integration/session_idle.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
3636
},
3737

3838
junit: {
39-
reportName: 'X-Pack Security API Integration Tests',
39+
reportName: 'X-Pack Security API Integration Tests (Session Idle Timeout)',
4040
},
4141
};
4242
}

x-pack/test/security_api_integration/session_lifespan.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
3636
},
3737

3838
junit: {
39-
reportName: 'X-Pack Security API Integration Tests',
39+
reportName: 'X-Pack Security API Integration Tests (Session Lifespan)',
4040
},
4141
};
4242
}

x-pack/test/security_api_integration/tests/session_idle/cleanup.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@ export default function ({ getService }: FtrProviderContext) {
3333
return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
3434
}
3535

36-
// FLAKY: https://github.com/elastic/kibana/issues/76239
37-
describe.skip('Session Idle cleanup', () => {
36+
describe('Session Idle cleanup', () => {
3837
beforeEach(async () => {
3938
await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
40-
await es.deleteByQuery({
39+
await es.indices.delete({
4140
index: '.kibana_security_session*',
42-
q: '*',
43-
waitForCompletion: true,
44-
refresh: true,
4541
ignore: [404],
4642
});
4743
});

x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,11 @@ export default function ({ getService }: FtrProviderContext) {
3030
return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
3131
}
3232

33-
// FLAKY: https://github.com/elastic/kibana/issues/76223
34-
describe.skip('Session Lifespan cleanup', () => {
33+
describe('Session Lifespan cleanup', () => {
3534
beforeEach(async () => {
3635
await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
37-
await es.deleteByQuery({
36+
await es.indices.delete({
3837
index: '.kibana_security_session*',
39-
q: '*',
40-
waitForCompletion: true,
41-
refresh: true,
4238
ignore: [404],
4339
});
4440
});

x-pack/test/security_functional/login_selector.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
7676
screenshots: { directory: resolve(__dirname, 'screenshots') },
7777

7878
junit: {
79-
reportName: 'Chrome X-Pack Security Functional Tests',
79+
reportName: 'Chrome X-Pack Security Functional Tests (Login Selector)',
8080
},
8181
};
8282
}

x-pack/test/security_functional/oidc.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
7676
screenshots: { directory: resolve(__dirname, 'screenshots') },
7777

7878
junit: {
79-
reportName: 'Chrome X-Pack Security Functional Tests',
79+
reportName: 'Chrome X-Pack Security Functional Tests (OpenID Connect)',
8080
},
8181
};
8282
}

x-pack/test/security_functional/saml.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
7070
screenshots: { directory: resolve(__dirname, 'screenshots') },
7171

7272
junit: {
73-
reportName: 'Chrome X-Pack Security Functional Tests',
73+
reportName: 'Chrome X-Pack Security Functional Tests (SAML)',
7474
},
7575
};
7676
}

0 commit comments

Comments
 (0)