Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable session lifespan, idle timeout api integration tests and use unique names for the security test reports. #77746

Merged
merged 4 commits into from
Sep 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/test/api_integration/config_security_basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default async function (context: FtrConfigProviderContext) {
'xpack.security.authc.api_key.enabled=true',
];
config.testFiles = [require.resolve('./apis/security/security_basic')];
config.junit.reportName = 'X-Pack API Integration Tests (Security Basic)';
return config;
});
}
1 change: 1 addition & 0 deletions x-pack/test/api_integration/config_security_trial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { default as createTestConfig } from './config';
export default async function (context: FtrConfigProviderContext) {
return createTestConfig(context).then((config) => {
config.testFiles = [require.resolve('./apis/security/security_trial')];
config.junit.reportName = 'X-Pack API Integration Tests (Security Trial)';
return config;
});
}
2 changes: 1 addition & 1 deletion x-pack/test/functional/config_security_basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
},

junit: {
reportName: 'Chrome X-Pack UI Functional Tests',
reportName: 'Chrome X-Pack UI Functional Tests (Security Basic)',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
},

junit: {
reportName: 'X-Pack Security API Integration Tests',
reportName: 'X-Pack Security API Integration Tests (Session Idle Timeout)',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
},

junit: {
reportName: 'X-Pack Security API Integration Tests',
reportName: 'X-Pack Security API Integration Tests (Session Lifespan)',
},
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,11 @@ export default function ({ getService }: FtrProviderContext) {
return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
}

// FLAKY: https://github.com/elastic/kibana/issues/76239
describe.skip('Session Idle cleanup', () => {
describe('Session Idle cleanup', () => {
beforeEach(async () => {
await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
await es.deleteByQuery({
await es.indices.delete({
index: '.kibana_security_session*',
q: '*',
waitForCompletion: true,
refresh: true,
ignore: [404],
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,11 @@ export default function ({ getService }: FtrProviderContext) {
return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
}

// FLAKY: https://github.com/elastic/kibana/issues/76223
describe.skip('Session Lifespan cleanup', () => {
describe('Session Lifespan cleanup', () => {
beforeEach(async () => {
await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
await es.deleteByQuery({
await es.indices.delete({
index: '.kibana_security_session*',
q: '*',
waitForCompletion: true,
refresh: true,
ignore: [404],
});
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/security_functional/login_selector.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
screenshots: { directory: resolve(__dirname, 'screenshots') },

junit: {
reportName: 'Chrome X-Pack Security Functional Tests',
reportName: 'Chrome X-Pack Security Functional Tests (Login Selector)',
},
};
}
2 changes: 1 addition & 1 deletion x-pack/test/security_functional/oidc.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
screenshots: { directory: resolve(__dirname, 'screenshots') },

junit: {
reportName: 'Chrome X-Pack Security Functional Tests',
reportName: 'Chrome X-Pack Security Functional Tests (OpenID Connect)',
},
};
}
2 changes: 1 addition & 1 deletion x-pack/test/security_functional/saml.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
screenshots: { directory: resolve(__dirname, 'screenshots') },

junit: {
reportName: 'Chrome X-Pack Security Functional Tests',
reportName: 'Chrome X-Pack Security Functional Tests (SAML)',
},
};
}